diff --git a/client/src/org/compiere/minigrid/CheckRenderer.java b/client/src/org/compiere/minigrid/CheckRenderer.java
index 3071d815ab..77311a8555 100644
--- a/client/src/org/compiere/minigrid/CheckRenderer.java
+++ b/client/src/org/compiere/minigrid/CheckRenderer.java
@@ -16,9 +16,14 @@
  *****************************************************************************/
 package org.compiere.minigrid;
 
-import javax.swing.*;
-import javax.swing.table.*;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Insets;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
 
 import org.adempiere.plaf.AdempierePLAF;
 
diff --git a/client/src/org/compiere/minigrid/IDColumnEditor.java b/client/src/org/compiere/minigrid/IDColumnEditor.java
index d106c890a4..e870993d8c 100644
--- a/client/src/org/compiere/minigrid/IDColumnEditor.java
+++ b/client/src/org/compiere/minigrid/IDColumnEditor.java
@@ -16,13 +16,20 @@
  *****************************************************************************/
 package org.compiere.minigrid;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import org.compiere.swing.*;
+import java.awt.Component;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.EventObject;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.event.ChangeEvent;
+import javax.swing.table.TableCellEditor;
+
+import org.compiere.swing.CCheckBox;
 
 /**
  *  ID Column Editor (with Select Box).
diff --git a/client/src/org/compiere/minigrid/IDColumnRenderer.java b/client/src/org/compiere/minigrid/IDColumnRenderer.java
index a994f12e37..5ecfedf451 100644
--- a/client/src/org/compiere/minigrid/IDColumnRenderer.java
+++ b/client/src/org/compiere/minigrid/IDColumnRenderer.java
@@ -16,9 +16,15 @@
  *****************************************************************************/
 package org.compiere.minigrid;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.table.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Insets;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
 
 /**
  *  ID Column Renderer
diff --git a/client/src/org/compiere/minigrid/MiniCellEditor.java b/client/src/org/compiere/minigrid/MiniCellEditor.java
index 7018903abd..ab43b342a8 100644
--- a/client/src/org/compiere/minigrid/MiniCellEditor.java
+++ b/client/src/org/compiere/minigrid/MiniCellEditor.java
@@ -16,13 +16,19 @@
  *****************************************************************************/
 package org.compiere.minigrid;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import javax.swing.*;
-import javax.swing.table.*;
-import org.compiere.grid.ed.*;
-import org.compiere.util.*;
+import java.awt.Component;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JTable;
+import javax.swing.table.TableCellEditor;
+
+import org.compiere.grid.ed.VDate;
+import org.compiere.grid.ed.VEditor;
+import org.compiere.grid.ed.VNumber;
+import org.compiere.grid.ed.VString;
+import org.compiere.util.DisplayType;
 
 /**
  *  MiniTable Cell Editor based on class - Timestamp, BigDecimal
diff --git a/client/src/org/compiere/minigrid/ROCellEditor.java b/client/src/org/compiere/minigrid/ROCellEditor.java
index c9cafd1b20..08ff4928a6 100644
--- a/client/src/org/compiere/minigrid/ROCellEditor.java
+++ b/client/src/org/compiere/minigrid/ROCellEditor.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.minigrid;
 
-import javax.swing.*;
-import java.util.*;
+import java.util.EventObject;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JTextField;
 
 /**
  *  Read Only Cell Renderer