diff --git a/wisim/src/java/net/sourceforge/wisim/controller/IconGenerater.java b/wisim/src/java/net/sourceforge/wisim/controller/IconGenerater.java index b4ca6bc..4317a71 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/IconGenerater.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/IconGenerater.java @@ -28,9 +28,12 @@ */ package net.sourceforge.wisim.controller; -import java.awt.*; -import java.awt.image.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.image.BufferedImage; + +import javax.swing.ImageIcon; /** * Erzeugt eine neue Instanz IconGenerater diff --git a/wisim/src/java/net/sourceforge/wisim/controller/IconNode.java b/wisim/src/java/net/sourceforge/wisim/controller/IconNode.java index 7a1d0c0..d876a9c 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/IconNode.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/IconNode.java @@ -22,8 +22,8 @@ ** ******************************************************************** */ package net.sourceforge.wisim.controller; -import javax.swing.*; -import javax.swing.tree.*; +import javax.swing.Icon; +import javax.swing.tree.DefaultMutableTreeNode; /** * Ein IconNode ist ein Element im JTree. Das IconNode kann ein eigenes Icon diff --git a/wisim/src/java/net/sourceforge/wisim/controller/IconNodeRenderer.java b/wisim/src/java/net/sourceforge/wisim/controller/IconNodeRenderer.java index 0bbaebe..6c0fa4a 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/IconNodeRenderer.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/IconNodeRenderer.java @@ -23,10 +23,11 @@ package net.sourceforge.wisim.controller; -import java.awt.*; -import java.util.*; -import javax.swing.*; -import javax.swing.tree.*; +import java.awt.Component; +import java.util.HashMap; +import javax.swing.Icon; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; /** Der CellRenderer für einen JTree mit IconNodes. Erlaubt es jedem Node im JTree ein eigenes Icon * zuzuweisen. @@ -55,10 +56,10 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean Icon icon = ((IconNode) value).getIcon(); if (icon == null) { - Hashtable icons = (Hashtable) tree.getClientProperty("JTree.icons"); + HashMap icons = (HashMap) tree.getClientProperty("JTree.icons"); String name = ((IconNode) value).getIconName(); if ((icons != null) && (name != null)) { - icon = (Icon) icons.get(name); + icon = icons.get(name); if (icon != null) { setIcon(icon); } diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellEditor.java b/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellEditor.java index 7382966..82ba9e7 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellEditor.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellEditor.java @@ -24,13 +24,18 @@ package net.sourceforge.wisim.controller; import java.awt.Component; -import java.awt.event.*; -import javax.swing.table.*; -import javax.swing.event.*; -import java.util.EventObject; -import javax.swing.tree.*; +import java.awt.event.MouseEvent; import java.io.Serializable; -import javax.swing.*; +import java.util.EventObject; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; +import javax.swing.event.EventListenerList; +import javax.swing.table.TableCellEditor; +import javax.swing.tree.TreeCellEditor; /** * @author Zafir Anjum @@ -70,6 +75,7 @@ public boolean isCellEditable(EventObject anEvent) { * @param anEvent * @return boolean */ + @Override public boolean shouldSelectCell(EventObject anEvent) { if (editorComponent != null && anEvent instanceof MouseEvent && ((MouseEvent) anEvent).getID() == MouseEvent.MOUSE_PRESSED) { Component dispatchComponent = SwingUtilities.getDeepestComponentAt(editorComponent, 3, 3); diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellRenderer.java b/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellRenderer.java index c3d33a8..1d1a047 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellRenderer.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JComponentCellRenderer.java @@ -23,9 +23,11 @@ package net.sourceforge.wisim.controller; -import javax.swing.table.*; import java.awt.Component; -import javax.swing.*; + +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; /** * @author Zafir Anjum diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifyCustomer.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifyCustomer.java index 1136d0d..da36b38 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifyCustomer.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifyCustomer.java @@ -28,10 +28,23 @@ */ package net.sourceforge.wisim.controller; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; -import javax.swing.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.JOptionPane; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.dao.WiSimDAOWriteException; +import net.sourceforge.wisim.model.City; +import net.sourceforge.wisim.model.Customer; +import net.sourceforge.wisim.model.Memo; +import net.sourceforge.wisim.model.Validator; +import net.sourceforge.wisim.model.WiSimLogger; /** * Das Panel Customer Bearbeiten diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifySupplier.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifySupplier.java index 0e6a8a1..db47cad 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifySupplier.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelModifySupplier.java @@ -29,17 +29,28 @@ package net.sourceforge.wisim.controller; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; -import javax.swing.*; - import java.text.DecimalFormat; import java.text.ParseException; -import java.util.*; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; import java.util.logging.Level; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JOptionPane; import javax.swing.table.DefaultTableModel; +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.dao.WiSimDAOWriteException; +import net.sourceforge.wisim.model.City; +import net.sourceforge.wisim.model.Supplier; +import net.sourceforge.wisim.model.SupplyList; +import net.sourceforge.wisim.model.Validator; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; + /** * JPanelLieferantBearbeiten ermöglicht das bearbeiten eines Lieferanten. */ diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNetworkplan.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNetworkplan.java index 3ee4445..2419c44 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNetworkplan.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNetworkplan.java @@ -26,12 +26,14 @@ import java.awt.Dimension; import java.awt.Font; import java.util.ArrayList; + import javax.swing.JLabel; import javax.swing.JScrollPane; import javax.swing.JTextArea; + import net.sourceforge.wisim.dao.WiSimDAO; import net.sourceforge.wisim.dao.WiSimDAOException; -import net.sourceforge.wisim.model.*; +import net.sourceforge.wisim.model.WiSimLogger; import net.sourceforge.wisim.networkplan.JNetworkplan; import net.sourceforge.wisim.networkplan.NetworkplanElement; diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewOrder.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewOrder.java index dc7d21d..4e33706 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewOrder.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewOrder.java @@ -30,12 +30,28 @@ import java.text.DecimalFormat; import java.text.ParseException; -import java.util.*; +import java.util.Calendar; +import java.util.Collection; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.Vector; import java.util.logging.Level; -import javax.swing.*; + +import javax.swing.JOptionPane; +import javax.swing.SpinnerNumberModel; import javax.swing.table.DefaultTableModel; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.dao.WiSimDAOWriteException; +import net.sourceforge.wisim.model.ComponentContract; +import net.sourceforge.wisim.model.ComponentContractAccount; +import net.sourceforge.wisim.model.ComponentContractItem; +import net.sourceforge.wisim.model.Supplier; +import net.sourceforge.wisim.model.SupplyList; +import net.sourceforge.wisim.model.Validator; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; /** * Masken für die WiSimComponent-Bestellung diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewSupplier.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewSupplier.java index 4104873..e259bc9 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewSupplier.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelNewSupplier.java @@ -28,10 +28,24 @@ */ package net.sourceforge.wisim.controller; -import java.util.*; -import javax.swing.*; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.JOptionPane; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.dao.WiSimDAOWriteException; +import net.sourceforge.wisim.model.Supplier; +import net.sourceforge.wisim.model.SupplyList; +import net.sourceforge.wisim.model.Validator; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; /** * Das Panel Neuer Supplier diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewCustomers.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewCustomers.java index ce78218..ef3fb4b 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewCustomers.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewCustomers.java @@ -32,11 +32,16 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; -import javax.swing.*; + +import javax.swing.DefaultListModel; import javax.swing.table.DefaultTableModel; +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.model.Customer; +import net.sourceforge.wisim.model.Memo; +import net.sourceforge.wisim.model.WiSimLogger; + /** Auflistung der Kundendaten */ public class JPanelViewCustomers extends javax.swing.JPanel { diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewOrders.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewOrders.java index 746055a..ede6a17 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewOrders.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewOrders.java @@ -28,14 +28,31 @@ */ package net.sourceforge.wisim.controller; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.image.BufferedImage; import java.text.DecimalFormat; -import java.util.*; -import net.sourceforge.wisim.model.*; -import net.sourceforge.wisim.dao.*; -import javax.swing.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.Vector; + +import javax.swing.ImageIcon; import javax.swing.table.DefaultTableModel; -import java.awt.*; -import java.awt.image.*; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.model.ComponentContract; +import net.sourceforge.wisim.model.ComponentContractAccount; +import net.sourceforge.wisim.model.ComponentContractItem; +import net.sourceforge.wisim.model.Refreshable; +import net.sourceforge.wisim.model.Supplier; +import net.sourceforge.wisim.model.SupplyList; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; /** Gibt eine Übersicht aller Einzelteilaufträge aus. * @author benjamin.pasero diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewSuppliers.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewSuppliers.java index 29e255f..c9ee505 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewSuppliers.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelViewSuppliers.java @@ -29,14 +29,22 @@ package net.sourceforge.wisim.controller; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; - import java.awt.Dimension; import java.text.DecimalFormat; -import java.util.*; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; + import javax.swing.table.DefaultTableModel; +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.model.Supplier; +import net.sourceforge.wisim.model.SupplyList; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; + /** * JPanelLieferantenliste zeigt Liste aller Lieferanten. */ diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelWarehouse.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelWarehouse.java index 4b5db23..882ec2c 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelWarehouse.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelWarehouse.java @@ -28,15 +28,25 @@ */ package net.sourceforge.wisim.controller; -import net.sourceforge.wisim.model.*; -import net.sourceforge.wisim.dao.*; -import javax.swing.table.DefaultTableModel; -import java.awt.*; -import java.awt.image.*; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import javax.swing.*; + +import javax.swing.ImageIcon; +import javax.swing.table.DefaultTableModel; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.model.Article; +import net.sourceforge.wisim.model.ComponentWarehouseItem; +import net.sourceforge.wisim.model.Refreshable; +import net.sourceforge.wisim.model.WarehouseLocation; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; /** * Gibt eine �bersicht des Lager aus. Best�nde und Kapazit�ten werden diff --git a/wisim/src/java/net/sourceforge/wisim/controller/JPanelWorkPlaceStore.java b/wisim/src/java/net/sourceforge/wisim/controller/JPanelWorkPlaceStore.java index 5085f10..982964e 100644 --- a/wisim/src/java/net/sourceforge/wisim/controller/JPanelWorkPlaceStore.java +++ b/wisim/src/java/net/sourceforge/wisim/controller/JPanelWorkPlaceStore.java @@ -29,11 +29,28 @@ package net.sourceforge.wisim.controller; -import net.sourceforge.wisim.dao.*; -import net.sourceforge.wisim.model.*; -import java.util.*; -import javax.swing.table.*; -import javax.swing.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.Vector; + +import javax.swing.JComponent; +import javax.swing.JProgressBar; +import javax.swing.JTable; +import javax.swing.SpinnerNumberModel; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; + +import net.sourceforge.wisim.dao.WiSimDAO; +import net.sourceforge.wisim.dao.WiSimDAOException; +import net.sourceforge.wisim.dao.WiSimDAOWriteException; +import net.sourceforge.wisim.model.Refreshable; +import net.sourceforge.wisim.model.WiSimComponent; +import net.sourceforge.wisim.model.WiSimLogger; +import net.sourceforge.wisim.model.WorkPlace; +import net.sourceforge.wisim.model.WorkPlaceStore; /** * Gibt eine Tabellenübersicht aller Arbeitsplätze mit den Beständen der diff --git a/wisim/src/java/net/sourceforge/wisim/model/ComponentContract.java b/wisim/src/java/net/sourceforge/wisim/model/ComponentContract.java index 8c4c056..3d0ab5e 100644 --- a/wisim/src/java/net/sourceforge/wisim/model/ComponentContract.java +++ b/wisim/src/java/net/sourceforge/wisim/model/ComponentContract.java @@ -29,7 +29,7 @@ package net.sourceforge.wisim.model; import java.sql.Date; -import java.util.*; +import java.util.Collection; /** * ComponentContract für Einzelteile diff --git a/wisim/src/java/net/sourceforge/wisim/model/ComponentWarehouseItem.java b/wisim/src/java/net/sourceforge/wisim/model/ComponentWarehouseItem.java index 82acc0d..8b7401a 100644 --- a/wisim/src/java/net/sourceforge/wisim/model/ComponentWarehouseItem.java +++ b/wisim/src/java/net/sourceforge/wisim/model/ComponentWarehouseItem.java @@ -27,7 +27,7 @@ */ package net.sourceforge.wisim.model; -import java.util.*; +import java.util.Collection; /** * Die Summe der Einzelteile eines bestimmten Typs (Name, Einzelteile Nr, diff --git a/wisim/src/java/net/sourceforge/wisim/model/Memo.java b/wisim/src/java/net/sourceforge/wisim/model/Memo.java index a481f16..77b0f2e 100644 --- a/wisim/src/java/net/sourceforge/wisim/model/Memo.java +++ b/wisim/src/java/net/sourceforge/wisim/model/Memo.java @@ -29,6 +29,8 @@ package net.sourceforge.wisim.model; +import java.sql.Date; + /** Klasse Memo * @author Benjamin Pasero */ @@ -37,7 +39,7 @@ public class Memo { private int id; private int kundenNr; private String text; - private java.sql.Date date; + private Date date; /** Creates a new instance of Memo * @param id ID @@ -45,7 +47,7 @@ public class Memo { * @param text Text * @param date Datum */ - public Memo(int id, int kundenNr, String text, java.sql.Date date) { + public Memo(int id, int kundenNr, String text, Date date) { this.id = id; this.kundenNr = kundenNr; this.text = text; @@ -80,7 +82,7 @@ public void setText(String text) { /** Setzt das Datum * @param date Datum */ - public void setDate(java.sql.Date date) { + public void setDate(Date date) { this.date = date; } @@ -108,7 +110,7 @@ public String getText() { /** Liefert das Datum * @return java.sql.Date */ - public java.sql.Date getDate() { + public Date getDate() { return date; } } diff --git a/wisim/src/java/net/sourceforge/wisim/simulation/ActualTime.java b/wisim/src/java/net/sourceforge/wisim/simulation/ActualTime.java index 522ca3a..1504bc7 100644 --- a/wisim/src/java/net/sourceforge/wisim/simulation/ActualTime.java +++ b/wisim/src/java/net/sourceforge/wisim/simulation/ActualTime.java @@ -28,7 +28,8 @@ * * Created on 17. März 2003, 14:14 */ -import java.util.*; +import java.util.Date; +import java.util.GregorianCalendar; /** Speichert die aktuelle Zeit. * Der CoreThread greift auf dieses Objekt zu um die Zeit zu ändern. * @author benjamin.pasero diff --git a/wisim/src/java/net/sourceforge/wisim/simulation/UpdateSimulationAnalysis.java b/wisim/src/java/net/sourceforge/wisim/simulation/UpdateSimulationAnalysis.java index 8717872..3fffc3f 100644 --- a/wisim/src/java/net/sourceforge/wisim/simulation/UpdateSimulationAnalysis.java +++ b/wisim/src/java/net/sourceforge/wisim/simulation/UpdateSimulationAnalysis.java @@ -23,7 +23,7 @@ package net.sourceforge.wisim.simulation; -import java.util.*; +import java.util.GregorianCalendar; import net.sourceforge.wisim.controller.JPanelSimulationAnalysis; import net.sourceforge.wisim.controller.WiSimMainController; diff --git a/wisimlog.xml.lck b/wisimlog.xml.lck new file mode 100644 index 0000000..e69de29