From a59edd12e25ca739ecacf35f97dedaf69c7e99f8 Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Mon, 22 Dec 2008 00:52:41 +0000 Subject: [PATCH] organize imports --- .../org/eevolution/form/CAbstractBOMTree.java | 63 +++++++-------- .../org/eevolution/form/VInOutInvoiceGen.java | 73 +++++++++++++----- .../form/VOrderDistributionReceipt.java | 73 +++++++++++++----- .../eevolution/form/VOrderReceiptIssue.java | 1 - .../form/VProductConfigurationBOM.java | 77 ++++++++++++++----- .../eevolution/form/action/PopupAction.java | 4 +- .../form/action/ProcessPopupAction.java | 2 - .../form/action/ZoomMenuAction.java | 2 - .../org/eevolution/form/bom/BOMMessenger.java | 5 +- .../form/bom/BOMTreeCellRenderer.java | 1 - .../eevolution/form/bom/BOMTreeFactory.java | 7 +- .../form/bom/action/ChangeASIAction.java | 8 +- .../form/bom/action/CreateRfQAction.java | 11 +-- .../form/bom/action/MergeBOMAction.java | 8 +- .../eevolution/form/bom/nodeUserObject.java | 6 +- 15 files changed, 210 insertions(+), 131 deletions(-) diff --git a/client/src/org/eevolution/form/CAbstractBOMTree.java b/client/src/org/eevolution/form/CAbstractBOMTree.java index f6745f8e96..774e6c9cd3 100644 --- a/client/src/org/eevolution/form/CAbstractBOMTree.java +++ b/client/src/org/eevolution/form/CAbstractBOMTree.java @@ -17,49 +17,16 @@ package org.eevolution.form; -import org.compiere.apps.form.FormFrame; -import org.compiere.grid.ed.VLookup; -import org.eevolution.form.action.PopupAction; -import org.eevolution.form.action.ZoomMenuAction; -import org.eevolution.form.bom.BOMTreeFactory; -import org.eevolution.form.bom.BOMTreeModel; -import org.eevolution.form.bom.action.ChangeASIAction; -import org.eevolution.form.bom.action.CreateRfQAction; -import org.eevolution.form.bom.action.DeleteBOMAction; -import org.eevolution.form.bom.action.MergeBOMAction; -import org.compiere.model.MLookup; -import org.compiere.model.MLookupFactory; -import org.compiere.model.MProduct; -import org.compiere.model.PO; -import org.compiere.model.MColumn; -import org.eevolution.model.reasoner.StorageReasoner; -import org.eevolution.model.wrapper.BOMLineWrapper; -import org.eevolution.model.wrapper.BOMWrapper; - - -import org.compiere.swing.CLabel; -import org.compiere.swing.CPanel; - -import org.compiere.util.DisplayType; -import org.compiere.util.Env; -import org.compiere.util.Msg; - - -import org.eevolution.tools.worker.SingleWorker; -import org.eevolution.tools.swing.SwingTool; - -import org.eevolution.model.MPPOrder; - import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; - import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import javax.swing.JEditorPane; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JSplitPane; @@ -69,7 +36,33 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import javax.swing.JEditorPane; + +import org.compiere.apps.form.FormFrame; +import org.compiere.grid.ed.VLookup; +import org.compiere.model.MColumn; +import org.compiere.model.MLookup; +import org.compiere.model.MLookupFactory; +import org.compiere.model.MProduct; +import org.compiere.model.PO; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.Msg; +import org.eevolution.form.action.PopupAction; +import org.eevolution.form.action.ZoomMenuAction; +import org.eevolution.form.bom.BOMTreeFactory; +import org.eevolution.form.bom.BOMTreeModel; +import org.eevolution.form.bom.action.ChangeASIAction; +import org.eevolution.form.bom.action.CreateRfQAction; +import org.eevolution.form.bom.action.DeleteBOMAction; +import org.eevolution.form.bom.action.MergeBOMAction; +import org.eevolution.model.MPPOrder; +import org.eevolution.model.reasoner.StorageReasoner; +import org.eevolution.model.wrapper.BOMLineWrapper; +import org.eevolution.model.wrapper.BOMWrapper; +import org.eevolution.tools.swing.SwingTool; +import org.eevolution.tools.worker.SingleWorker; /** * @author Gunther Hoppe, tranSIT GmbH Ilmenau/Germany diff --git a/client/src/org/eevolution/form/VInOutInvoiceGen.java b/client/src/org/eevolution/form/VInOutInvoiceGen.java index 8cdb151cc6..a503374f9b 100644 --- a/client/src/org/eevolution/form/VInOutInvoiceGen.java +++ b/client/src/org/eevolution/form/VInOutInvoiceGen.java @@ -15,31 +15,64 @@ *****************************************************************************/ package org.eevolution.form; -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.math.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.awt.BorderLayout; +import java.awt.Cursor; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.PropertyChangeEvent; +import java.beans.VetoableChangeListener; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.logging.Level; -import javax.swing.*; -import javax.swing.event.*; +import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import org.adempiere.plaf.AdempierePLAF; -import org.compiere.apps.*; -import org.compiere.grid.ed.*; -import org.compiere.minigrid.*; -import org.compiere.model.*; -import org.compiere.plaf.*; -import org.compiere.print.*; -import org.compiere.process.*; -import org.compiere.swing.*; -import org.compiere.util.*; -import org.compiere.plaf.CompiereColor; +import org.compiere.apps.ADialog; +import org.compiere.apps.ADialogDialog; +import org.compiere.apps.ConfirmPanel; +import org.compiere.apps.ProcessCtl; +import org.compiere.apps.StatusBar; import org.compiere.apps.form.FormFrame; import org.compiere.apps.form.FormPanel; -import org.compiere.grid.ed.VDate; +import org.compiere.grid.ed.VComboBox; +import org.compiere.grid.ed.VLookup; +import org.compiere.minigrid.IDColumn; +import org.compiere.minigrid.MiniTable; +import org.compiere.model.MLookup; +import org.compiere.model.MLookupFactory; +import org.compiere.model.MOrder; +import org.compiere.model.MPInstance; +import org.compiere.model.MPInstancePara; +import org.compiere.model.MPrivateAccess; +import org.compiere.model.MRMA; +import org.compiere.plaf.CompiereColor; +import org.compiere.print.ReportCtl; +import org.compiere.print.ReportEngine; +import org.compiere.process.ProcessInfo; +import org.compiere.process.ProcessInfoUtil; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CTabbedPane; +import org.compiere.swing.CTextPane; +import org.compiere.util.ASyncProcess; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.KeyNamePair; +import org.compiere.util.Msg; +import org.compiere.util.Trx; /** * Manual Shipment Selection diff --git a/client/src/org/eevolution/form/VOrderDistributionReceipt.java b/client/src/org/eevolution/form/VOrderDistributionReceipt.java index e6d35cc92c..faaa1f44d6 100644 --- a/client/src/org/eevolution/form/VOrderDistributionReceipt.java +++ b/client/src/org/eevolution/form/VOrderDistributionReceipt.java @@ -15,28 +15,63 @@ *****************************************************************************/ package org.eevolution.form; -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.math.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; -import javax.swing.event.*; +import java.awt.BorderLayout; +import java.awt.Cursor; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.PropertyChangeEvent; +import java.beans.VetoableChangeListener; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; + +import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import org.adempiere.exceptions.AdempiereException; import org.adempiere.plaf.AdempierePLAF; -import org.compiere.apps.*; -import org.compiere.apps.form.*; -import org.compiere.grid.ed.*; -import org.compiere.minigrid.*; -import org.compiere.model.*; -import org.compiere.plaf.*; -import org.compiere.print.*; - -import org.compiere.swing.*; -import org.compiere.util.*; +import org.compiere.apps.ADialog; +import org.compiere.apps.ADialogDialog; +import org.compiere.apps.ConfirmPanel; +import org.compiere.apps.StatusBar; +import org.compiere.apps.form.FormFrame; +import org.compiere.apps.form.FormPanel; +import org.compiere.grid.ed.VDate; +import org.compiere.grid.ed.VLookup; +import org.compiere.minigrid.IDColumn; +import org.compiere.minigrid.MiniTable; +import org.compiere.model.MColumn; +import org.compiere.model.MLookup; +import org.compiere.model.MLookupFactory; +import org.compiere.model.MMovement; +import org.compiere.model.MMovementLine; +import org.compiere.model.MQuery; +import org.compiere.model.PrintInfo; +import org.compiere.plaf.CompiereColor; +import org.compiere.print.MPrintFormat; +import org.compiere.print.ReportEngine; +import org.compiere.print.Viewer; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CTabbedPane; +import org.compiere.swing.CTextPane; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.Language; +import org.compiere.util.Msg; +import org.compiere.util.Trx; import org.eevolution.model.MDDOrder; import org.eevolution.model.MDDOrderLine; diff --git a/client/src/org/eevolution/form/VOrderReceiptIssue.java b/client/src/org/eevolution/form/VOrderReceiptIssue.java index 175a97b881..6dc6a8b800 100644 --- a/client/src/org/eevolution/form/VOrderReceiptIssue.java +++ b/client/src/org/eevolution/form/VOrderReceiptIssue.java @@ -76,7 +76,6 @@ import org.compiere.model.MProduct; import org.compiere.model.MStorage; import org.compiere.model.MTab; import org.compiere.model.MWindow; -import org.compiere.model.X_C_DocType; import org.compiere.plaf.CompiereColor; import org.compiere.swing.CButton; import org.compiere.swing.CLabel; diff --git a/client/src/org/eevolution/form/VProductConfigurationBOM.java b/client/src/org/eevolution/form/VProductConfigurationBOM.java index a99ac797d2..ce5eac1f08 100644 --- a/client/src/org/eevolution/form/VProductConfigurationBOM.java +++ b/client/src/org/eevolution/form/VProductConfigurationBOM.java @@ -16,24 +16,65 @@ *****************************************************************************/ package org.eevolution.form; -import org.eevolution.form.bom.*; -import java.awt.*; -import java.awt.event.*; -import java.math.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; -import javax.swing.border.*; -import org.compiere.apps.*; -import org.compiere.apps.form.*; -import org.compiere.grid.ed.*; -import org.compiere.model.*; -import org.compiere.swing.*; -import org.compiere.util.*; -import org.eevolution.model.*; -import java.sql.*; -import javax.swing.tree.DefaultMutableTreeNode; -import it.cnr.imaa.essi.lablib.gui.checkboxtree.*; +import it.cnr.imaa.essi.lablib.gui.checkboxtree.CheckboxTree; + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; + +import javax.swing.ButtonGroup; +import javax.swing.JCheckBox; +import javax.swing.JOptionPane; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JToggleButton; +import javax.swing.border.TitledBorder; +import javax.swing.tree.DefaultMutableTreeNode; + +import org.compiere.apps.ALayout; +import org.compiere.apps.ALayoutConstraint; +import org.compiere.apps.ConfirmPanel; +import org.compiere.apps.form.FormFrame; +import org.compiere.apps.form.FormPanel; +import org.compiere.apps.form.VBOMDrop; +import org.compiere.grid.ed.VNumber; +import org.compiere.model.MInvoice; +import org.compiere.model.MInvoiceLine; +import org.compiere.model.MOrder; +import org.compiere.model.MOrderLine; +import org.compiere.model.MProduct; +import org.compiere.model.MProductBOM; +import org.compiere.model.MProject; +import org.compiere.model.MProjectLine; +import org.compiere.model.MRole; +import org.compiere.swing.CComboBox; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CScrollPane; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.KeyNamePair; +import org.compiere.util.Msg; +import org.eevolution.form.bom.RadioButtonTreeCellRenderer; +import org.eevolution.form.bom.nodeUserObject; +import org.eevolution.model.MPPProductBOM; +import org.eevolution.model.MPPProductBOMLine; /** * Drop BOM diff --git a/client/src/org/eevolution/form/action/PopupAction.java b/client/src/org/eevolution/form/action/PopupAction.java index 439c01e2de..98820fd538 100644 --- a/client/src/org/eevolution/form/action/PopupAction.java +++ b/client/src/org/eevolution/form/action/PopupAction.java @@ -26,10 +26,8 @@ import java.util.ResourceBundle; import javax.swing.JMenuItem; import org.compiere.model.PO; - -import org.eevolution.tools.PLoader; -import org.eevolution.tools.worker.SingleWorker; import org.eevolution.tools.swing.SwingTool; +import org.eevolution.tools.worker.SingleWorker; /** * @author Gunther Hoppe, tranSIT GmbH Ilmenau/Germany diff --git a/client/src/org/eevolution/form/action/ProcessPopupAction.java b/client/src/org/eevolution/form/action/ProcessPopupAction.java index fb07228d8a..904891fb99 100644 --- a/client/src/org/eevolution/form/action/ProcessPopupAction.java +++ b/client/src/org/eevolution/form/action/ProcessPopupAction.java @@ -24,10 +24,8 @@ import javax.swing.JFrame; import org.compiere.apps.ADialog; import org.compiere.apps.ProcessParameter; -import org.eevolution.form.action.PopupAction; import org.compiere.util.Env; import org.compiere.util.Msg; - import org.eevolution.process.ProcessInfoHandler; import org.eevolution.tools.swing.SwingTool; diff --git a/client/src/org/eevolution/form/action/ZoomMenuAction.java b/client/src/org/eevolution/form/action/ZoomMenuAction.java index 917789199a..be05bec2ba 100644 --- a/client/src/org/eevolution/form/action/ZoomMenuAction.java +++ b/client/src/org/eevolution/form/action/ZoomMenuAction.java @@ -24,10 +24,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.compiere.apps.AEnv; import org.compiere.apps.AWindow; import org.compiere.model.MQuery; -import org.compiere.model.MTable; import org.compiere.model.PO; import org.eevolution.model.wrapper.AbstractPOWrapper; -import org.compiere.util.Env; /** diff --git a/client/src/org/eevolution/form/bom/BOMMessenger.java b/client/src/org/eevolution/form/bom/BOMMessenger.java index a98412ad84..f08502e1a8 100644 --- a/client/src/org/eevolution/form/bom/BOMMessenger.java +++ b/client/src/org/eevolution/form/bom/BOMMessenger.java @@ -21,15 +21,12 @@ import java.util.HashMap; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreePath; import org.compiere.model.MProduct; +import org.eevolution.model.MPPOrder; import org.eevolution.model.wrapper.BOMLineWrapper; import org.eevolution.model.wrapper.BOMWrapper; - - -import org.eevolution.model.MPPOrder; import org.eevolution.msg.HTMLMessenger; /** diff --git a/client/src/org/eevolution/form/bom/BOMTreeCellRenderer.java b/client/src/org/eevolution/form/bom/BOMTreeCellRenderer.java index c62bf3865f..986f95a356 100644 --- a/client/src/org/eevolution/form/bom/BOMTreeCellRenderer.java +++ b/client/src/org/eevolution/form/bom/BOMTreeCellRenderer.java @@ -22,7 +22,6 @@ import javax.swing.ImageIcon; import javax.swing.tree.DefaultMutableTreeNode; import org.compiere.util.Env; - import org.eevolution.form.tree.MapTreeCellRenderer; /** diff --git a/client/src/org/eevolution/form/bom/BOMTreeFactory.java b/client/src/org/eevolution/form/bom/BOMTreeFactory.java index fd6f8ae67c..a873509844 100644 --- a/client/src/org/eevolution/form/bom/BOMTreeFactory.java +++ b/client/src/org/eevolution/form/bom/BOMTreeFactory.java @@ -26,14 +26,11 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.compiere.model.MProduct; import org.compiere.model.MResource; import org.compiere.model.PO; +import org.compiere.util.Env; +import org.eevolution.model.MPPOrder; import org.eevolution.model.reasoner.StorageReasoner; import org.eevolution.model.wrapper.BOMLineWrapper; import org.eevolution.model.wrapper.BOMWrapper; -import org.compiere.util.Env; - - - -import org.eevolution.model.MPPOrder; /** * @author Gunther Hoppe, tranSIT GmbH Ilmenau/Germany diff --git a/client/src/org/eevolution/form/bom/action/ChangeASIAction.java b/client/src/org/eevolution/form/bom/action/ChangeASIAction.java index 74cb873880..4b362109b6 100644 --- a/client/src/org/eevolution/form/bom/action/ChangeASIAction.java +++ b/client/src/org/eevolution/form/bom/action/ChangeASIAction.java @@ -16,21 +16,17 @@ package org.eevolution.form.bom.action; -import java.awt.Container; -import java.awt.event.ActionEvent; - import javax.swing.JFrame; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; import org.compiere.apps.search.PAttributeInstance; -import org.eevolution.form.action.ProcessPopupAction; -import org.eevolution.form.bom.BOMMessenger; import org.compiere.model.MAttributeSetInstance; import org.compiere.model.MProduct; -import org.eevolution.model.wrapper.BOMLineWrapper; import org.compiere.util.Env; import org.compiere.util.Msg; +import org.eevolution.form.action.ProcessPopupAction; +import org.eevolution.model.wrapper.BOMLineWrapper; /** diff --git a/client/src/org/eevolution/form/bom/action/CreateRfQAction.java b/client/src/org/eevolution/form/bom/action/CreateRfQAction.java index eddec87952..97db2600f0 100644 --- a/client/src/org/eevolution/form/bom/action/CreateRfQAction.java +++ b/client/src/org/eevolution/form/bom/action/CreateRfQAction.java @@ -23,20 +23,17 @@ import javax.swing.JFrame; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; -import org.eevolution.form.action.ProcessPopupAction; import org.compiere.model.MResource; import org.compiere.model.MRfQ; import org.compiere.model.MRfQLine; import org.compiere.model.MRfQLineQty; +import org.compiere.util.Env; +import org.compiere.util.Msg; +import org.eevolution.form.action.ProcessPopupAction; +import org.eevolution.model.MPPOrder; import org.eevolution.model.reasoner.StorageReasoner; import org.eevolution.model.wrapper.BOMLineWrapper; import org.eevolution.model.wrapper.BOMWrapper; -import org.compiere.util.Env; -import org.compiere.util.Msg; - - - -import org.eevolution.model.MPPOrder; /** * @author Victor Perez, e-Evolution, S.C. * @author Victor Perez, e-Evolution, S.C. diff --git a/client/src/org/eevolution/form/bom/action/MergeBOMAction.java b/client/src/org/eevolution/form/bom/action/MergeBOMAction.java index 5239f2739f..32cc34eafe 100644 --- a/client/src/org/eevolution/form/bom/action/MergeBOMAction.java +++ b/client/src/org/eevolution/form/bom/action/MergeBOMAction.java @@ -21,14 +21,12 @@ import java.awt.event.ActionEvent; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; -import org.eevolution.form.action.PopupAction; -import org.eevolution.model.wrapper.BOMLineWrapper; -import org.eevolution.model.wrapper.BOMWrapper; import org.compiere.util.Env; - - +import org.eevolution.form.action.PopupAction; import org.eevolution.model.MPPProductBOM; import org.eevolution.model.MPPProductBOMLine; +import org.eevolution.model.wrapper.BOMLineWrapper; +import org.eevolution.model.wrapper.BOMWrapper; /** * @author Victor Perez, e-Evolution, S.C. diff --git a/client/src/org/eevolution/form/bom/nodeUserObject.java b/client/src/org/eevolution/form/bom/nodeUserObject.java index f43aa4fd1a..08a1312746 100644 --- a/client/src/org/eevolution/form/bom/nodeUserObject.java +++ b/client/src/org/eevolution/form/bom/nodeUserObject.java @@ -1,8 +1,8 @@ package org.eevolution.form.bom; -import org.eevolution.model.X_PP_Product_BOM; -import org.eevolution.model.X_PP_Product_BOMLine; -import org.compiere.model.X_M_Product; +import org.compiere.model.X_M_Product; +import org.eevolution.model.X_PP_Product_BOM; +import org.eevolution.model.X_PP_Product_BOMLine; public class nodeUserObject { public X_M_Product M_Product = null;