diff --git a/base/src/org/compiere/swing/CCheckBoxMenuItem.java b/base/src/org/compiere/swing/CCheckBoxMenuItem.java
index 4b2e8f0d2f..0c6299cf13 100644
--- a/base/src/org/compiere/swing/CCheckBoxMenuItem.java
+++ b/base/src/org/compiere/swing/CCheckBoxMenuItem.java
@@ -16,7 +16,9 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
 
 /**
  * 	Adempiere Check Box Menu Item
diff --git a/base/src/org/compiere/swing/CColumnControlButton.java b/base/src/org/compiere/swing/CColumnControlButton.java
index d02949bfcf..ade26a1afb 100644
--- a/base/src/org/compiere/swing/CColumnControlButton.java
+++ b/base/src/org/compiere/swing/CColumnControlButton.java
@@ -13,19 +13,10 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import org.jdesktop.swingx.VerticalLayout;
-import org.jdesktop.swingx.action.AbstractActionExt;
-import org.jdesktop.swingx.action.ActionContainerFactory;
-import org.jdesktop.swingx.table.ColumnControlPopup;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.TableColumnModelEvent;
-import javax.swing.event.TableColumnModelListener;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.ComponentOrientation;
+import java.awt.Dimension;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.beans.PropertyChangeEvent;
@@ -35,6 +26,35 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.TableColumnModelEvent;
+import javax.swing.event.TableColumnModelListener;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+
+import org.jdesktop.swingx.VerticalLayout;
+import org.jdesktop.swingx.action.AbstractActionExt;
+import org.jdesktop.swingx.action.ActionContainerFactory;
+import org.jdesktop.swingx.table.ColumnControlPopup;
+
 /**
  * Code and description adapted from SwingX ColumnControlButton class.
  * 
diff --git a/base/src/org/compiere/swing/CComboBox.java b/base/src/org/compiere/swing/CComboBox.java
index 53629ee448..f54a1d731e 100644
--- a/base/src/org/compiere/swing/CComboBox.java
+++ b/base/src/org/compiere/swing/CComboBox.java
@@ -16,15 +16,22 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
+import java.awt.Color;
+import java.awt.event.MouseListener;
+import java.util.Vector;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComboBoxUI;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
-import org.compiere.util.*;
+import org.compiere.plaf.CompiereComboBoxUI;
+import org.compiere.util.NamePair;
+import org.compiere.util.Trace;
 
 /**
  *  Adempiere Colored Combo Box.
diff --git a/base/src/org/compiere/swing/CDialog.java b/base/src/org/compiere/swing/CDialog.java
index 8728223d38..9835571028 100644
--- a/base/src/org/compiere/swing/CDialog.java
+++ b/base/src/org/compiere/swing/CDialog.java
@@ -16,9 +16,23 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.HeadlessException;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.AbstractAction;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 
 /**
  *	Conveniance Dialog Class.
diff --git a/base/src/org/compiere/swing/CFrame.java b/base/src/org/compiere/swing/CFrame.java
index 0ddcfeffd8..5cb9241347 100644
--- a/base/src/org/compiere/swing/CFrame.java
+++ b/base/src/org/compiere/swing/CFrame.java
@@ -16,8 +16,12 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Container;
+import java.awt.GraphicsConfiguration;
+import java.awt.HeadlessException;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 /**
  * 	Adempiere Frame
diff --git a/base/src/org/compiere/swing/CLabel.java b/base/src/org/compiere/swing/CLabel.java
index 667bfd4cd8..5e6f6b4a3c 100644
--- a/base/src/org/compiere/swing/CLabel.java
+++ b/base/src/org/compiere/swing/CLabel.java
@@ -16,9 +16,12 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JLabel;
 import javax.swing.text.JTextComponent;
 
 /**
diff --git a/base/src/org/compiere/swing/CMenuItem.java b/base/src/org/compiere/swing/CMenuItem.java
index 07f3a31ea9..fc6e636745 100644
--- a/base/src/org/compiere/swing/CMenuItem.java
+++ b/base/src/org/compiere/swing/CMenuItem.java
@@ -16,7 +16,9 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
 
 /**
  * 	Adempiere Menu Item
diff --git a/base/src/org/compiere/swing/CPanel.java b/base/src/org/compiere/swing/CPanel.java
index 91f37e0187..44fcb460e1 100644
--- a/base/src/org/compiere/swing/CPanel.java
+++ b/base/src/org/compiere/swing/CPanel.java
@@ -16,12 +16,15 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.LayoutManager;
+
+import javax.swing.JPanel;
 
 import org.adempiere.plaf.AdempiereLookAndFeel;
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
+import org.compiere.plaf.CompiereColor;
+import org.compiere.plaf.CompiereLookAndFeel;
 
 /**
  *  Adempiere Panel supporting colored Backgrounds
diff --git a/base/src/org/compiere/swing/CScrollPane.java b/base/src/org/compiere/swing/CScrollPane.java
index 0f1f6df1c4..03a8feb4a4 100644
--- a/base/src/org/compiere/swing/CScrollPane.java
+++ b/base/src/org/compiere/swing/CScrollPane.java
@@ -16,12 +16,13 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
+import java.awt.Component;
 
-import javax.swing.*;
+import javax.swing.JScrollPane;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
+import org.compiere.plaf.CompiereColor;
+import org.compiere.plaf.CompiereLookAndFeel;
 
 /**
  *	Adempiere Srcoll Pane.
diff --git a/base/src/org/compiere/swing/CTabbedPane.java b/base/src/org/compiere/swing/CTabbedPane.java
index eba8ea0957..cc38f06c2c 100644
--- a/base/src/org/compiere/swing/CTabbedPane.java
+++ b/base/src/org/compiere/swing/CTabbedPane.java
@@ -16,16 +16,23 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Event;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.KeyStroke;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.CompiereColor;
 import org.compiere.plaf.CompiereLookAndFeel;
-import sun.swing.*;
+
+import sun.swing.UIAction;
 
 /**
  *  Adempiere Color Tabbed Pane
diff --git a/base/src/org/compiere/swing/CTable.java b/base/src/org/compiere/swing/CTable.java
index a2d2f94b35..eaebc0132d 100644
--- a/base/src/org/compiere/swing/CTable.java
+++ b/base/src/org/compiere/swing/CTable.java
@@ -16,16 +16,39 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Font;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
-import java.util.logging.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
+import java.util.Map;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-import org.compiere.util.*;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JViewport;
+import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.TableModelEvent;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+import org.compiere.util.MSort;
 import org.jdesktop.swingx.icon.ColumnControlIcon;
 
 /**
diff --git a/base/src/org/compiere/swing/CTextArea.java b/base/src/org/compiere/swing/CTextArea.java
index a7805384c1..c157881387 100644
--- a/base/src/org/compiere/swing/CTextArea.java
+++ b/base/src/org/compiere/swing/CTextArea.java
@@ -16,12 +16,18 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.im.*;
+import java.awt.Color;
+import java.awt.Insets;
+import java.awt.event.FocusListener;
+import java.awt.event.InputMethodListener;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
+import java.awt.im.InputMethodRequests;
 
-import javax.swing.*;
-import javax.swing.text.*;
+import javax.swing.InputVerifier;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.text.Document;
 
 import org.adempiere.plaf.AdempierePLAF;
 
diff --git a/base/src/org/compiere/swing/CTextField.java b/base/src/org/compiere/swing/CTextField.java
index 6749460e1b..0fe3413c5b 100644
--- a/base/src/org/compiere/swing/CTextField.java
+++ b/base/src/org/compiere/swing/CTextField.java
@@ -16,11 +16,12 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Color;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 
-import javax.swing.*;
-import javax.swing.text.*;
+import javax.swing.JTextField;
+import javax.swing.text.Document;
 
 import org.adempiere.plaf.AdempierePLAF;
 
diff --git a/base/src/org/compiere/swing/CTextPane.java b/base/src/org/compiere/swing/CTextPane.java
index b4336ffad6..0275b12bc8 100644
--- a/base/src/org/compiere/swing/CTextPane.java
+++ b/base/src/org/compiere/swing/CTextPane.java
@@ -16,12 +16,18 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.im.*;
+import java.awt.Color;
+import java.awt.Insets;
+import java.awt.event.FocusListener;
+import java.awt.event.InputMethodListener;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
+import java.awt.im.InputMethodRequests;
 
-import javax.swing.*;
-import javax.swing.text.*;
+import javax.swing.InputVerifier;
+import javax.swing.JScrollPane;
+import javax.swing.JTextPane;
+import javax.swing.text.StyledDocument;
 
 import org.adempiere.plaf.AdempierePLAF;
 
diff --git a/base/src/org/compiere/swing/CollapsiblePanel.java b/base/src/org/compiere/swing/CollapsiblePanel.java
index 7ad30d16a6..ea99c8bd47 100644
--- a/base/src/org/compiere/swing/CollapsiblePanel.java
+++ b/base/src/org/compiere/swing/CollapsiblePanel.java
@@ -15,7 +15,6 @@ package org.compiere.swing;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Insets;
 
diff --git a/base/src/org/compiere/swing/ColorBlind.java b/base/src/org/compiere/swing/ColorBlind.java
index 21dea3a5d6..21b219c920 100644
--- a/base/src/org/compiere/swing/ColorBlind.java
+++ b/base/src/org/compiere/swing/ColorBlind.java
@@ -17,7 +17,7 @@
 package org.compiere.swing;
 
 import java.awt.Color;
-import java.util.logging.*;
+import java.util.logging.Logger;
 
 import javax.swing.plaf.ColorUIResource;
 
diff --git a/base/src/org/compiere/swing/ColorEditor.java b/base/src/org/compiere/swing/ColorEditor.java
index 16e65bb472..686375a262 100644
--- a/base/src/org/compiere/swing/ColorEditor.java
+++ b/base/src/org/compiere/swing/ColorEditor.java
@@ -16,15 +16,30 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.util.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+import java.util.ResourceBundle;
+
+import javax.swing.BorderFactory;
+import javax.swing.JColorChooser;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.CompiereColor;
-import org.compiere.util.*;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.ValueNamePair;
 
 /**
  *  Adempiere Color Editor
diff --git a/base/src/org/compiere/swing/FontChooser.java b/base/src/org/compiere/swing/FontChooser.java
index 942f58f322..ac45301668 100644
--- a/base/src/org/compiere/swing/FontChooser.java
+++ b/base/src/org/compiere/swing/FontChooser.java
@@ -16,10 +16,22 @@
  *****************************************************************************/
 package org.compiere.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.ResourceBundle;
+
+import javax.swing.BorderFactory;
+import javax.swing.JTextArea;
 
 import org.adempiere.plaf.AdempierePLAF;