diff --git a/client/src/org/compiere/apps/search/FindCellEditor.java b/client/src/org/compiere/apps/search/FindCellEditor.java
index 0765d9b916..c4685442c8 100644
--- a/client/src/org/compiere/apps/search/FindCellEditor.java
+++ b/client/src/org/compiere/apps/search/FindCellEditor.java
@@ -16,15 +16,22 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.table.*;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.EventObject;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import javax.swing.UIManager;
+import javax.swing.table.TableCellEditor;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.swing.CEditor;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
 
 /**
  *  Cell Editor.
diff --git a/client/src/org/compiere/apps/search/FindValueEditor.java b/client/src/org/compiere/apps/search/FindValueEditor.java
index 495a6a1903..df06650a24 100644
--- a/client/src/org/compiere/apps/search/FindValueEditor.java
+++ b/client/src/org/compiere/apps/search/FindValueEditor.java
@@ -16,13 +16,22 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.table.*;
-import org.compiere.grid.ed.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.awt.Component;
+import java.util.EventObject;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JTable;
+import javax.swing.table.TableCellEditor;
+
+import org.compiere.grid.ed.VEditor;
+import org.compiere.grid.ed.VEditorFactory;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.grid.ed.VString;
+import org.compiere.model.GridField;
+import org.compiere.model.MQuery;
+import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
+import org.compiere.util.ValueNamePair;
 
 /**
  *	Cell editor for Find Value field.
diff --git a/client/src/org/compiere/apps/search/FindValueRenderer.java b/client/src/org/compiere/apps/search/FindValueRenderer.java
index 4322288604..78f0b2d9ae 100644
--- a/client/src/org/compiere/apps/search/FindValueRenderer.java
+++ b/client/src/org/compiere/apps/search/FindValueRenderer.java
@@ -16,15 +16,23 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.sql.*;
-import javax.swing.*;
-import javax.swing.table.*;
+import java.awt.Component;
+import java.awt.Insets;
+import java.sql.Date;
+import java.util.logging.Level;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.GridField;
+import org.compiere.model.Lookup;
+import org.compiere.model.MQuery;
+import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
+import org.compiere.util.ValueNamePair;
 
 /**
  *	Renderer for Find 'Value' Column.
diff --git a/client/src/org/compiere/apps/search/InfoAsset.java b/client/src/org/compiere/apps/search/InfoAsset.java
index 5eca0f3a4a..4c0cc7519f 100644
--- a/client/src/org/compiere/apps/search/InfoAsset.java
+++ b/client/src/org/compiere/apps/search/InfoAsset.java
@@ -16,16 +16,24 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.sql.*;
+import java.awt.Frame;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Asset Information
diff --git a/client/src/org/compiere/apps/search/InfoAssignment.java b/client/src/org/compiere/apps/search/InfoAssignment.java
index 82a2a891d6..450362420e 100644
--- a/client/src/org/compiere/apps/search/InfoAssignment.java
+++ b/client/src/org/compiere/apps/search/InfoAssignment.java
@@ -16,16 +16,27 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.sql.*;
-import java.util.logging.*;
-import org.compiere.apps.*;
-import org.compiere.grid.ed.*;
-import org.compiere.minigrid.*;
-import org.compiere.model.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.Lookup;
+import org.compiere.model.MLookupFactory;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CLabel;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/client/src/org/compiere/apps/search/InfoBPartner.java b/client/src/org/compiere/apps/search/InfoBPartner.java
index ca1f4b839a..1d1c8bf965 100644
--- a/client/src/org/compiere/apps/search/InfoBPartner.java
+++ b/client/src/org/compiere/apps/search/InfoBPartner.java
@@ -16,18 +16,24 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.awt.Frame;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VCheckBox;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
 
 /**
  *	Search Business Partner and return selection
diff --git a/client/src/org/compiere/apps/search/InfoGeneral.java b/client/src/org/compiere/apps/search/InfoGeneral.java
index c4d997d14e..0b1b5eac12 100644
--- a/client/src/org/compiere/apps/search/InfoGeneral.java
+++ b/client/src/org/compiere/apps/search/InfoGeneral.java
@@ -16,18 +16,28 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
+import java.awt.Frame;
+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.JLabel;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.apps.*;
-import org.compiere.minigrid.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.ADialog;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Generic Table Search
diff --git a/client/src/org/compiere/apps/search/InfoInOut.java b/client/src/org/compiere/apps/search/InfoInOut.java
index 08fd8fbd72..269e40b266 100644
--- a/client/src/org/compiere/apps/search/InfoInOut.java
+++ b/client/src/org/compiere/apps/search/InfoInOut.java
@@ -16,17 +16,27 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.sql.*;
-import java.util.*;
+import java.awt.Frame;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VCheckBox;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
 
 
 /**
diff --git a/client/src/org/compiere/apps/search/InfoInvoice.java b/client/src/org/compiere/apps/search/InfoInvoice.java
index 186b257ef5..bde50d1519 100644
--- a/client/src/org/compiere/apps/search/InfoInvoice.java
+++ b/client/src/org/compiere/apps/search/InfoInvoice.java
@@ -16,18 +16,30 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.awt.Frame;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VCheckBox;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
 
 /**
  *  Info Invoice
diff --git a/client/src/org/compiere/apps/search/InfoOrder.java b/client/src/org/compiere/apps/search/InfoOrder.java
index bd56124e1f..88ac1ecc72 100644
--- a/client/src/org/compiere/apps/search/InfoOrder.java
+++ b/client/src/org/compiere/apps/search/InfoOrder.java
@@ -16,18 +16,29 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.awt.Frame;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VCheckBox;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
 
 /**
  *  Info Order
diff --git a/client/src/org/compiere/apps/search/InfoPAttribute.java b/client/src/org/compiere/apps/search/InfoPAttribute.java
index 43b17f9771..f20910aeb4 100644
--- a/client/src/org/compiere/apps/search/InfoPAttribute.java
+++ b/client/src/org/compiere/apps/search/InfoPAttribute.java
@@ -16,19 +16,40 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
-import java.math.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.apps.*;
-import org.compiere.grid.ed.*;
-import org.compiere.model.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import javax.swing.Box;
+import javax.swing.JDialog;
+
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.apps.ConfirmPanel;
+import org.compiere.grid.ed.VComboBox;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLine;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.grid.ed.VString;
+import org.compiere.model.MAttribute;
+import org.compiere.model.MRole;
+import org.compiere.swing.CDialog;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CPanel;
+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;
 
 /**
  *	Search by Product Attribute.
diff --git a/client/src/org/compiere/apps/search/InfoPayment.java b/client/src/org/compiere/apps/search/InfoPayment.java
index 19ef30b1ca..b02335d21b 100644
--- a/client/src/org/compiere/apps/search/InfoPayment.java
+++ b/client/src/org/compiere/apps/search/InfoPayment.java
@@ -16,18 +16,29 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.awt.Frame;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
 
 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.swing.*;
-import org.compiere.util.*;
+import org.compiere.apps.ALayout;
+import org.compiere.apps.ALayoutConstraint;
+import org.compiere.grid.ed.VCheckBox;
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VLookup;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.MLookupFactory;
+import org.compiere.model.MQuery;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CTextField;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
 
 /**
  *  Info Payment
diff --git a/client/src/org/compiere/apps/search/InfoSchedule.java b/client/src/org/compiere/apps/search/InfoSchedule.java
index e2a38b5db1..723cbeecb6 100644
--- a/client/src/org/compiere/apps/search/InfoSchedule.java
+++ b/client/src/org/compiere/apps/search/InfoSchedule.java
@@ -16,19 +16,43 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-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.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.GregorianCalendar;
+import java.util.logging.Level;
 
-import org.compiere.apps.*;
-import org.compiere.grid.ed.*;
-import org.compiere.model.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ConfirmPanel;
+import org.compiere.apps.StatusBar;
+import org.compiere.grid.ed.VDate;
+import org.compiere.model.MResourceAssignment;
+import org.compiere.model.MRole;
+import org.compiere.swing.CDialog;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/client/src/org/compiere/apps/search/InvoiceHistory.java b/client/src/org/compiere/apps/search/InvoiceHistory.java
index b30e6860fa..a57b094de7 100644
--- a/client/src/org/compiere/apps/search/InvoiceHistory.java
+++ b/client/src/org/compiere/apps/search/InvoiceHistory.java
@@ -16,21 +16,41 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import java.util.logging.*;
+import java.awt.BorderLayout;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Vector;
+import java.util.logging.Level;
 
-import org.compiere.apps.*;
-import org.compiere.minigrid.*;
-import org.compiere.swing.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.WindowConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.table.DefaultTableModel;
+
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ConfirmPanel;
+import org.compiere.minigrid.MiniTable;
+import org.compiere.model.MDocType;
+import org.compiere.model.MPriceList;
+import org.compiere.swing.CDialog;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Price History for BPartner/Product
diff --git a/client/src/org/compiere/apps/search/PAttributeInstance.java b/client/src/org/compiere/apps/search/PAttributeInstance.java
index c4e04bdb5c..7e28f127a2 100644
--- a/client/src/org/compiere/apps/search/PAttributeInstance.java
+++ b/client/src/org/compiere/apps/search/PAttributeInstance.java
@@ -16,16 +16,33 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.sql.*;
-import java.util.logging.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import org.compiere.apps.*;
-import org.compiere.minigrid.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.compiere.apps.AEnv;
+import org.compiere.apps.ConfirmPanel;
+import org.compiere.minigrid.ColumnInfo;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.minigrid.MiniTable;
+import org.compiere.swing.CCheckBox;
+import org.compiere.swing.CDialog;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/client/src/org/compiere/apps/search/VSchedule.java b/client/src/org/compiere/apps/search/VSchedule.java
index 093705ed7d..324ce73d7d 100644
--- a/client/src/org/compiere/apps/search/VSchedule.java
+++ b/client/src/org/compiere/apps/search/VSchedule.java
@@ -16,15 +16,20 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
-import org.compiere.swing.*;
+import javax.swing.JScrollPane;
+
+import org.compiere.model.MAssignmentSlot;
+import org.compiere.model.ScheduleUtil;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
 
 /**
  *	Visual and Control Part of Schedule.
diff --git a/client/src/org/compiere/apps/search/VSchedulePanel.java b/client/src/org/compiere/apps/search/VSchedulePanel.java
index 9c78879f04..10fac71898 100644
--- a/client/src/org/compiere/apps/search/VSchedulePanel.java
+++ b/client/src/org/compiere/apps/search/VSchedulePanel.java
@@ -16,18 +16,35 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.font.*;
-import java.math.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import javax.swing.*;
-import org.compiere.grid.ed.*;
-import org.compiere.model.*;
-import org.compiere.plaf.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.GregorianCalendar;
+
+import javax.swing.JComponent;
+
+import org.compiere.grid.ed.VAssignmentDialog;
+import org.compiere.model.MAssignmentSlot;
+import org.compiere.model.MResourceAssignment;
+import org.compiere.plaf.CompiereUtils;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
+import org.compiere.util.TimeUtil;
 
 /**
  *	Schedule Panel
diff --git a/client/src/org/compiere/apps/search/VScheduleTimePanel.java b/client/src/org/compiere/apps/search/VScheduleTimePanel.java
index c03dd8db58..76bddf2b32 100644
--- a/client/src/org/compiere/apps/search/VScheduleTimePanel.java
+++ b/client/src/org/compiere/apps/search/VScheduleTimePanel.java
@@ -16,14 +16,25 @@
  *****************************************************************************/
 package org.compiere.apps.search;
 
-import java.awt.*;
-import java.awt.font.*;
-import java.sql.*;
-import javax.swing.*;
-import org.compiere.model.*;
-import org.compiere.plaf.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Stroke;
+import java.awt.font.TextLayout;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import javax.swing.JComponent;
+
+import org.compiere.model.MAssignmentSlot;
+import org.compiere.plaf.CompiereUtils;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
 
 /**
  *	Schedule Time Panel.