From 08d24abafbadd1e1fc6a963bac05c6b8456277fa Mon Sep 17 00:00:00 2001 From: David McMackins II Date: Mon, 3 Oct 2016 12:19:05 -0500 Subject: Add ability to create and edit items --- src/com/delwink/icebox/Inventory.java | 38 +++-- src/com/delwink/icebox/InventoryItem.java | 2 +- src/com/delwink/icebox/lang/en_US.lang | 5 + .../delwink/icebox/swing/InventoryItemEditor.java | 162 +++++++++++++++++++++ src/com/delwink/icebox/swing/MainWindow.java | 3 +- .../icebox/table/InventoryItemTableModel.java | 112 ++++++++++++++ .../delwink/icebox/table/MainWindowTableModel.java | 2 +- 7 files changed, 309 insertions(+), 15 deletions(-) create mode 100644 src/com/delwink/icebox/swing/InventoryItemEditor.java create mode 100644 src/com/delwink/icebox/table/InventoryItemTableModel.java diff --git a/src/com/delwink/icebox/Inventory.java b/src/com/delwink/icebox/Inventory.java index f4472c9..bd6a574 100644 --- a/src/com/delwink/icebox/Inventory.java +++ b/src/com/delwink/icebox/Inventory.java @@ -22,10 +22,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.TreeSet; +import java.util.TreeMap; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -41,7 +43,7 @@ import org.xml.sax.SAXException; public class Inventory { protected final List ORDERS; protected final List UPDATES; - protected final Set ITEMS; + protected final Map ITEMS; /** * Creates a new empty inventory. @@ -49,7 +51,7 @@ public class Inventory { public Inventory() { ORDERS = new ArrayList<>(); UPDATES = new ArrayList<>(); - ITEMS = new TreeSet<>(); + ITEMS = new TreeMap<>(); } /** @@ -138,8 +140,8 @@ public class Inventory { writer.println(""); writer.println(""); - for (InventoryItem item : ITEMS) - writer.println(" " + item); + for (Integer id : ITEMS.keySet()) + writer.println(" " + ITEMS.get(id)); writer.println(); @@ -196,18 +198,30 @@ public class Inventory { } public final void addNewItem(InventoryItem item) { - ITEMS.add(item); + ITEMS.put(item.getID(), item); } - public Set getItems() { - return ITEMS; + public Collection getItems() { + return ITEMS.values(); } public InventoryItem getItemByID(int id) { - for (InventoryItem item : ITEMS) - if (item.getID() == id) - return item; + return ITEMS.get(id); + } + + public int getNextID() { + Set keys = ITEMS.keySet(); + for (int i = 0; i <= keys.size(); ++i) + if (!ITEMS.containsKey(i)) + return i; + + if (ITEMS.isEmpty()) + return 0; + +// for (Integer id : ITEMS.keySet()) +// if (!ITEMS.containsKey(id + 1)) +// return id + 1; - return null; + throw new IllegalStateException("Could not find next item ID"); } } diff --git a/src/com/delwink/icebox/InventoryItem.java b/src/com/delwink/icebox/InventoryItem.java index 066ad8e..4e0b0c0 100644 --- a/src/com/delwink/icebox/InventoryItem.java +++ b/src/com/delwink/icebox/InventoryItem.java @@ -93,6 +93,6 @@ public class InventoryItem implements Comparable { @Override public String toString() { return ""; + + "unit=\"" + getUnit() + "\" reorder=\"" + getReorderAt() + "\"/>"; } } diff --git a/src/com/delwink/icebox/lang/en_US.lang b/src/com/delwink/icebox/lang/en_US.lang index 5f740fe..73b1cab 100644 --- a/src/com/delwink/icebox/lang/en_US.lang +++ b/src/com/delwink/icebox/lang/en_US.lang @@ -4,6 +4,11 @@ ok=OK save=Save cancel=Cancel +InventoryItemEditor.column0=Item +InventoryItemEditor.column1=Unit +InventoryItemEditor.column2=Reorder At +InventoryItemEditor.title=Edit Items + MainWindow.column0=Item MainWindow.column1=# in Stock MainWindow.help=Help diff --git a/src/com/delwink/icebox/swing/InventoryItemEditor.java b/src/com/delwink/icebox/swing/InventoryItemEditor.java new file mode 100644 index 0000000..777f448 --- /dev/null +++ b/src/com/delwink/icebox/swing/InventoryItemEditor.java @@ -0,0 +1,162 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.delwink.icebox.swing; + +import com.delwink.icebox.DataDir; +import com.delwink.icebox.Inventory; +import com.delwink.icebox.InventoryItem; +import com.delwink.icebox.lang.Lang; +import com.delwink.icebox.table.InventoryItemTableModel; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; + +public class InventoryItemEditor extends JDialog { + private final List CHANGES; + private final Inventory INVENTORY; + private final List ADDED; + private final JButton ADD_BUTTON, CANCEL_BUTTON, SAVE_BUTTON; + private final JTable TABLE; + + public InventoryItemEditor(Frame parent, Inventory inventory) { + super(parent, Lang.get("InventoryItemEditor.title")); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + setModal(true); + + INVENTORY = inventory; + CHANGES = new ArrayList<>(); + ADDED = new ArrayList<>(); + + TABLE = new JTable(new InventoryItemTableModel(INVENTORY)); + JScrollPane tablePane = new JScrollPane(TABLE); + + ADD_BUTTON = new JButton("+"); + ADD_BUTTON.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + InventoryItem item = new InventoryItem(INVENTORY.getNextID()); + ADDED.add(item); + INVENTORY.addNewItem(item); + } + }); + + CANCEL_BUTTON = new JButton(Lang.get("cancel")); + CANCEL_BUTTON.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + + SAVE_BUTTON = new JButton(Lang.get("save")); + SAVE_BUTTON.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + for (InventoryItem item : ADDED) { + INVENTORY.addNewItem(item); + } + + for (Change change : CHANGES) { + InventoryItem item = change.getItem(); + + switch (change.getType()) { + case NAME: + item.setName((String) change.getData()); + break; + + case UNIT: + item.setUnit((String) change.getData()); + break; + + case REORDER: + item.setReorderAt((Integer) change.getData()); + break; + } + } + + try (OutputStream stream = new FileOutputStream(DataDir.INVENTORY_FILE)) { + INVENTORY.saveXml(stream); + } catch (IOException ex) { + Logger.getLogger(InventoryItemEditor.class.getName()).log(Level.SEVERE, null, ex); + } + + dispose(); + } + }); + + JPanel buttonBox = new JPanel(new BorderLayout()); + JPanel leftButtonBox = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel rightButtonBox = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + + leftButtonBox.add(ADD_BUTTON); + buttonBox.add(leftButtonBox, BorderLayout.WEST); + + rightButtonBox.add(CANCEL_BUTTON); + rightButtonBox.add(SAVE_BUTTON); + buttonBox.add(rightButtonBox); + + setLayout(new BorderLayout()); + add(tablePane, BorderLayout.CENTER); + add(buttonBox, BorderLayout.SOUTH); + pack(); + centorOnParent(); + } + + private static class Change { + private final InventoryItem ITEM; + private final Object DATA; + private final Type TYPE; + + protected Change(InventoryItem item, Type type, Object data) { + ITEM = item; + TYPE = type; + DATA = data; + } + + public InventoryItem getItem() { + return ITEM; + } + + public Type getType() { + return TYPE; + } + + public Object getData() { + return DATA; + } + + protected enum Type { + NAME, + UNIT, + REORDER + } + } +} diff --git a/src/com/delwink/icebox/swing/MainWindow.java b/src/com/delwink/icebox/swing/MainWindow.java index a844082..3ca98b5 100644 --- a/src/com/delwink/icebox/swing/MainWindow.java +++ b/src/com/delwink/icebox/swing/MainWindow.java @@ -127,7 +127,8 @@ public class MainWindow extends JFrame { ITEMS_BUTTON.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { - throw new UnsupportedOperationException("Not supported yet."); + InventoryItemEditor editor = new InventoryItemEditor(MainWindow.this, INVENTORY); + editor.setVisible(true); } }); diff --git a/src/com/delwink/icebox/table/InventoryItemTableModel.java b/src/com/delwink/icebox/table/InventoryItemTableModel.java new file mode 100644 index 0000000..ac97958 --- /dev/null +++ b/src/com/delwink/icebox/table/InventoryItemTableModel.java @@ -0,0 +1,112 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.delwink.icebox.table; + +import com.delwink.icebox.Inventory; +import com.delwink.icebox.InventoryItem; +import com.delwink.icebox.lang.Lang; +import java.util.ArrayList; +import javax.swing.table.AbstractTableModel; + +/** + * Table model for the inventory item editor. + * @author David McMackins II + */ +public class InventoryItemTableModel extends AbstractTableModel { + private final Inventory INVENTORY; + + public InventoryItemTableModel(Inventory inventory) { + INVENTORY = inventory; + } + + @Override + public int getRowCount() { + return INVENTORY.getItems().size(); + } + + @Override + public int getColumnCount() { + return 3; + } + + @Override + public String getColumnName(int columnIndex) { + return Lang.get("InventoryItemEditor.column" + columnIndex); + } + + @Override + public Class getColumnClass(int columnIndex) { + switch (columnIndex) { + case 0: + case 1: + return String.class; + + case 2: + return Integer.class; + + default: + throw new IndexOutOfBoundsException(); + } + } + + @Override + public boolean isCellEditable(int arg0, int arg1) { + return true; + } + + @Override + public Object getValueAt(int row, int column) { + InventoryItem item = new ArrayList<>(INVENTORY.getItems()).get(row); + + switch (column) { + case 0: + return item.getName(); + + case 1: + return item.getUnit(); + + case 2: + return item.getReorderAt(); + + default: + throw new IndexOutOfBoundsException(); + } + } + + @Override + public void setValueAt(Object o, int row, int column) { + InventoryItem item = new ArrayList<>(INVENTORY.getItems()).get(row); + + switch (column) { + case 0: + item.setName((String) o); + break; + + case 1: + item.setUnit((String) o); + break; + + case 2: + item.setReorderAt((Integer) o); + break; + + default: + throw new IndexOutOfBoundsException(); + } + } +} diff --git a/src/com/delwink/icebox/table/MainWindowTableModel.java b/src/com/delwink/icebox/table/MainWindowTableModel.java index b02644a..66a904e 100644 --- a/src/com/delwink/icebox/table/MainWindowTableModel.java +++ b/src/com/delwink/icebox/table/MainWindowTableModel.java @@ -27,7 +27,7 @@ import javax.swing.table.AbstractTableModel; * @author David McMackins II */ public class MainWindowTableModel extends AbstractTableModel { - protected final Inventory INVENTORY; + private final Inventory INVENTORY; public MainWindowTableModel(Inventory inventory) { INVENTORY = inventory; -- cgit v1.2.3