diff --git a/client/src/org/compiere/apps/wf/WFActivity.java b/client/src/org/compiere/apps/wf/WFActivity.java
index 08fdbdc31d..2a2e2ab7b4 100644
--- a/client/src/org/compiere/apps/wf/WFActivity.java
+++ b/client/src/org/compiere/apps/wf/WFActivity.java
@@ -16,19 +16,50 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
-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.compiere.wf.*;
+import java.awt.BorderLayout;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+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.util.ArrayList;
+import java.util.logging.Level;
+
+import javax.swing.DefaultComboBoxModel;
+
+import org.compiere.apps.ADialog;
+import org.compiere.apps.AEnv;
+import org.compiere.apps.AMenu;
+import org.compiere.apps.AWindow;
+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.VLookup;
+import org.compiere.model.MColumn;
+import org.compiere.model.MQuery;
+import org.compiere.model.MRefList;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CComboBox;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CPanel;
+import org.compiere.swing.CTextArea;
+import org.compiere.swing.CTextField;
+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.Msg;
+import org.compiere.util.Trx;
+import org.compiere.util.ValueNamePair;
+import org.compiere.wf.MWFActivity;
+import org.compiere.wf.MWFNode;
 
 /**
  *	WorkFlow Activities Panel
diff --git a/client/src/org/compiere/apps/wf/WFContentPanel.java b/client/src/org/compiere/apps/wf/WFContentPanel.java
index 2a658b7597..a4a0a59a47 100644
--- a/client/src/org/compiere/apps/wf/WFContentPanel.java
+++ b/client/src/org/compiere/apps/wf/WFContentPanel.java
@@ -16,15 +16,35 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.font.*;
-import java.util.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.font.TextLayout;
+import java.util.ArrayList;
 
-import org.compiere.swing.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
+import org.compiere.swing.CMenuItem;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+import org.compiere.wf.MWFNode;
+import org.compiere.wf.MWFNodeNext;
+import org.compiere.wf.MWorkflow;
 
 /**
  *	Workflow Content Panel.
diff --git a/client/src/org/compiere/apps/wf/WFIcon.java b/client/src/org/compiere/apps/wf/WFIcon.java
index 145327bbbd..e9c00140ed 100644
--- a/client/src/org/compiere/apps/wf/WFIcon.java
+++ b/client/src/org/compiere/apps/wf/WFIcon.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 
-import org.compiere.model.*;
+import javax.swing.Icon;
+
+import org.compiere.model.MTreeNode;
 
 
 /**
diff --git a/client/src/org/compiere/apps/wf/WFLayoutManager.java b/client/src/org/compiere/apps/wf/WFLayoutManager.java
index f45ba08947..3e85f64f0e 100644
--- a/client/src/org/compiere/apps/wf/WFLayoutManager.java
+++ b/client/src/org/compiere/apps/wf/WFLayoutManager.java
@@ -16,8 +16,14 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import org.compiere.util.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Point;
+
+import org.compiere.util.CLogger;
 
 /**
  *	WorkFlow Layout Manager
diff --git a/client/src/org/compiere/apps/wf/WFLine.java b/client/src/org/compiere/apps/wf/WFLine.java
index 33a3cad092..5b1be764f5 100644
--- a/client/src/org/compiere/apps/wf/WFLine.java
+++ b/client/src/org/compiere/apps/wf/WFLine.java
@@ -16,11 +16,20 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import java.awt.font.*;
-import javax.swing.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.font.TextLayout;
+
+import javax.swing.SwingConstants;
+
+import org.compiere.util.CLogger;
+import org.compiere.wf.MWFNodeNext;
 
 
 /**
diff --git a/client/src/org/compiere/apps/wf/WFNode.java b/client/src/org/compiere/apps/wf/WFNode.java
index 6b6003c23c..5cc1bafa5c 100644
--- a/client/src/org/compiere/apps/wf/WFNode.java
+++ b/client/src/org/compiere/apps/wf/WFNode.java
@@ -16,13 +16,26 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import java.awt.font.*;
-import java.text.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.wf.MWFNode;
 
 /**
  *	Graphical Work Flow Node.
diff --git a/client/src/org/compiere/apps/wf/WFPanel.java b/client/src/org/compiere/apps/wf/WFPanel.java
index 4243746f3f..268c9053b3 100644
--- a/client/src/org/compiere/apps/wf/WFPanel.java
+++ b/client/src/org/compiere/apps/wf/WFPanel.java
@@ -16,22 +16,49 @@
  *****************************************************************************/
 package org.compiere.apps.wf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextPane;
 
 import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.apps.*;
-import org.compiere.apps.form.*;
-import org.compiere.model.*;
-import org.compiere.plaf.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
-import org.compiere.wf.*;
+import org.compiere.apps.AEnv;
+import org.compiere.apps.AMenu;
+import org.compiere.apps.AMenuStartItem;
+import org.compiere.apps.AWindow;
+import org.compiere.apps.form.FormFrame;
+import org.compiere.apps.form.FormPanel;
+import org.compiere.model.MQuery;
+import org.compiere.model.MRole;
+import org.compiere.model.MTable;
+import org.compiere.plaf.CompiereColor;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CComboBox;
+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;
+import org.compiere.util.Util;
+import org.compiere.wf.MWFNode;
+import org.compiere.wf.MWFNodeNext;
+import org.compiere.wf.MWorkflow;
 
 /**
  *	WorkFlow Panel