Refactoring GUI classes to subpackages.

pom.xml

@@ -42,6 +42,12 @@
       <artifactId>commons-cli</artifactId>
       <version>1.2</version>
     </dependency>
+      <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+          <version>2.2.4</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
   
   

src/eva2/client/ClassPreloader.java

@@ -1,6 +1,6 @@
 package eva2.client;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 
 /**
  * This Runnable just requests a number of classes as does the

src/eva2/gui/GOEPanel.java

@@ -1,5 +1,6 @@
 package eva2.gui;
 
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.tools.FileTools;
 import eva2.tools.BasicResourceLoader;
 import eva2.tools.EVAHELP;

src/eva2/gui/JExtDesktopPane.java

@@ -5,6 +5,8 @@ package eva2.gui;
  * $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $ $Author: streiche $
  */
 
+import eva2.gui.editor.ComponentFilter;
+
 import java.awt.Component;
 import java.awt.Event;
 import java.awt.event.ActionEvent;

src/eva2/gui/JParaPanel.java

@@ -8,6 +8,7 @@ package eva2.gui;
  * @author Holger Ulmer, Felix Streichert, Hannes Planatscher
  */
 
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.stat.EvAJobList;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;

src/eva2/gui/PropertyEditorProvider.java

@@ -1,5 +1,6 @@
 package eva2.gui;
 
+import eva2.gui.editor.*;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.individuals.codings.gp.GPArea;
 import eva2.tools.SelectedTag;
@@ -122,7 +123,7 @@ public class PropertyEditorProvider {
         PropertyEditorManager.registerEditor(PropertyFilePath.class, GenericFilePathEditor.class);
         PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class, GenericOptimizationObjectivesEditor.class);
         PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class, GenericOptimizationObjectivesWithParamEditor.class);
-        PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, eva2.gui.MultiLineStringEditor.class);
+        PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, MultiLineStringEditor.class);
         PropertyEditorManager.registerEditor(PropertySelectableList.class, GenericArrayEditor.class);
     }
 }

src/eva2/gui/PropertySheetPanel.java

@@ -9,6 +9,7 @@ package eva2.gui;
  *            $Date: 2007-12-05 11:29:32 +0100 (Wed, 05 Dec 2007) $
  *            $Author: mkron $
  */
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.tools.EVAHELP;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -20,7 +21,6 @@ import java.util.EventObject;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.*;
-import javax.swing.event.CellEditorListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;

src/eva2/gui/editor/AbstractListSelectionEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 
 
 import java.awt.BorderLayout;

src/eva2/gui/editor/BigStringEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 /*
  * Title:        EvA2
  * Description:
@@ -12,6 +12,8 @@ package eva2.gui;
 /*==========================================================================*
  * IMPORTS
  *==========================================================================*/
+import eva2.gui.PropertyDialog;
+
 import  java.awt.*;
 import java.awt.event.*;
 import java.beans.*;

src/eva2/gui/editor/ComponentFilter.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 /*
  * Title:        EvA2
  * Description:

src/eva2/gui/editor/EnumEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyValueSelector;
 
 import java.awt.BorderLayout;
 import java.awt.event.WindowAdapter;

src/eva2/gui/editor/GenericAreaEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 
 import eva2.optimization.individuals.codings.gp.AbstractGPNode;
 import eva2.optimization.individuals.codings.gp.GPArea;

src/eva2/gui/editor/GenericArrayEditor.java

@@ -1,5 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
 
+import eva2.gui.*;
 import eva2.tools.EVAHELP;
 import eva2.tools.SerializedObject;
 import java.awt.*;

src/eva2/gui/editor/GenericDoubleArrayEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyDoubleArray;
 
 import java.awt.BorderLayout;
 import java.awt.Component;

src/eva2/gui/editor/GenericEpsilonConstraintEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyEpsilonConstraint;
 
 import java.awt.*;
 import java.awt.event.*;

src/eva2/gui/editor/GenericEpsilonThresholdEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyEpsilonThreshold;
 
 import java.awt.*;
 import java.awt.event.*;

src/eva2/gui/editor/GenericFilePathEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyFilePath;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;

src/eva2/gui/editor/GenericIntArrayEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyIntArray;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;

src/eva2/gui/editor/GenericObjectEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 /*
  * Title: EvA2 Description: Copyright: Copyright (c) 2012 Company: University of Tuebingen, Computer
  * Architecture @author Holger Ulmer, Felix Streichert, Hannes Planatscher, Fabian Becker @version:
@@ -6,6 +6,7 @@ package eva2.gui;
  */
 
 import eva2.EvAInfo;
+import eva2.gui.GOEPanel;
 import eva2.tools.ReflectPackage;
 import java.awt.Component;
 import java.awt.FontMetrics;
@@ -21,7 +22,6 @@ import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 import java.util.Vector;

src/eva2/gui/editor/GenericObjectListSelectionEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertySelectableList;
 
 /**
  * An editor for a selectable List.

src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java

@@ -1,6 +1,8 @@
-package eva2.gui;
+package eva2.gui.editor;
 
 
+import eva2.gui.PropertyEditorProvider;
+import eva2.gui.PropertyOptimizationObjectives;
 import eva2.optimization.problems.InterfaceOptimizationObjective;
 import eva2.optimization.problems.InterfaceOptimizationTarget;
 import eva2.optimization.tools.AbstractObjectEditor;

src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java

@@ -1,6 +1,8 @@
-package eva2.gui;
+package eva2.gui.editor;
 
 
+import eva2.gui.PropertyEditorProvider;
+import eva2.gui.PropertyOptimizationObjectivesWithParam;
 import eva2.optimization.problems.InterfaceOptimizationObjective;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralGOEProperty;

src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.PropertyWeightedLPTchebycheff;
 
 import java.awt.*;
 import java.awt.event.*;

src/eva2/gui/editor/MultiLineStringEditor.java

@@ -1,4 +1,6 @@
-package eva2.gui;
+package eva2.gui.editor;
+
+import eva2.gui.MultiLineString;
 
 import java.awt.*;
 import java.awt.event.*;

src/eva2/gui/editor/StatisticsEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 /*
  * Title:        EvA2
  * Description:
@@ -9,6 +9,7 @@ package eva2.gui;
  *            $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $
  *            $Author: mkron $
  */
+import eva2.gui.PropertySheetPanelStat;
 import eva2.optimization.stat.GenericStatistics;
 import java.awt.*;
 import java.beans.*;

src/eva2/gui/editor/StringSelectionEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 
 import eva2.tools.StringSelection;
 

src/eva2/gui/editor/TagEditor.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.editor;
 /*
  * Title:        EvA2
  * Description:
@@ -11,6 +11,7 @@ package eva2.gui;
  */
 
 import eva2.EvAInfo;
+import eva2.gui.PropertyValueSelector;
 import eva2.tools.BasicResourceLoader;
 import eva2.tools.SelectedTag;
 import eva2.tools.Tag;

src/eva2/gui/plot/DPointSetMultiIcon.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 
 

src/eva2/gui/plot/DataViewer.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 /*
  * Title:        EvA2
  * Description:

src/eva2/gui/plot/DataViewerInterface.java

@@ -1,4 +1,7 @@
-package eva2.gui;
+package eva2.gui.plot;
+
+import eva2.gui.plot.Graph;
+
 /*
  * Title:        EvA2
  * Description:

src/eva2/gui/plot/FunctionArea.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 /*
  * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of
@@ -11,6 +11,7 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================
  */
+import eva2.gui.*;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
 import eva2.tools.ToolBoxGui;

src/eva2/gui/plot/Graph.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 import java.io.Serializable;
 

src/eva2/gui/plot/GraphPointSet.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 /*
  * Title:        EvA2

src/eva2/gui/plot/GraphPointSetLegend.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 import eva2.tools.Pair;
 import eva2.tools.StringTools;

src/eva2/gui/plot/GraphWindow.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 /*
  * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of Tuebingen, Computer
  * Architecture @author Holger Ulmer, Felix Streichert, Hannes Planatscher @version: $Revision: 320

src/eva2/gui/plot/InterfaceDPointWithContent.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.problems.InterfaceOptimizationProblem;

src/eva2/gui/plot/Plot.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 
 /*
  * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of
@@ -7,6 +7,7 @@ package eva2.gui;
  * +0100 (Tue, 11 Dec 2007) $ $Author: mkron $
  */
 import eva2.EvAInfo;
+import eva2.gui.JEFrame;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.tools.BasicResourceLoader;

src/eva2/gui/plot/PlotInterface.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 /*
  * Title:        EvA2
  * Description:

src/eva2/gui/plot/TopoPlot.java

@@ -1,4 +1,4 @@
-package eva2.gui;
+package eva2.gui.plot;
 /*
  * Title:        EvA2
  * Description:

src/eva2/optimization/go/GOStandaloneVersion.java

@@ -2,6 +2,7 @@ package eva2.optimization.go;
 
 import eva2.gui.BeanInspector;
 import eva2.gui.JParaPanel;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.GAIndividualDoubleData;
@@ -72,7 +73,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu
     transient private Population m_Backup;
     transient private boolean m_ContinueFlag;
     // Plot Panel stuff
-    transient private eva2.gui.Plot m_Plot;
+    transient private Plot m_Plot;
     transient private ArrayList m_PerformedRuns = new ArrayList();
     transient private ArrayList m_TmpData;
     transient private BufferedWriter m_OutputFile;
@@ -186,7 +187,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu
         double[] tmpD = new double[2];
         tmpD[0] = 1;
         tmpD[1] = 1;
-        this.m_Plot = new eva2.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true);
+        this.m_Plot = new Plot("EA Lecture Plot", "Function calls", "Fitness", true);
         // validate and show
         this.m_Frame.validate();
         this.m_Frame.setVisible(true);

src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java

@@ -2,7 +2,7 @@ package eva2.optimization.individuals.codings.gp;
 
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.problems.GPFunctionProblem;
 import eva2.optimization.problems.InterfaceProgramProblem;
 import eva2.tools.Pair;

src/eva2/optimization/mocco/MOCCOParameterizeGDF.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyDoubleArray;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;

src/eva2/optimization/mocco/MOCCOParameterizeMO.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;

src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;

src/eva2/optimization/mocco/MOCCOParameterizeSO.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;

src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyDoubleArray;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;

src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java

@@ -1,7 +1,7 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;

src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java

@@ -1,9 +1,9 @@
 package eva2.optimization.mocco.paretofrontviewer;
 
 
-import eva2.gui.FunctionArea;
+import eva2.gui.plot.FunctionArea;
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.InterfaceDPointWithContent;
+import eva2.gui.plot.InterfaceDPointWithContent;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;

src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java

@@ -1,7 +1,9 @@
 package eva2.optimization.mocco.paretofrontviewer;
 
 
-import eva2.gui.*;
+import eva2.gui.plot.FunctionArea;
+import eva2.gui.plot.GraphPointSet;
+import eva2.gui.plot.InterfaceDPointWithContent;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;

src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java

@@ -1,7 +1,9 @@
 package eva2.optimization.mocco.paretofrontviewer;
 
 
-import eva2.gui.*;
+import eva2.gui.plot.FunctionArea;
+import eva2.gui.plot.GraphPointSet;
+import eva2.gui.plot.InterfaceDPointWithContent;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;

src/eva2/optimization/modules/GenericModuleAdapter.java

@@ -3,7 +3,7 @@ package eva2.optimization.modules;
 
 import eva2.gui.EvAModuleButtonPanelMaker;
 import eva2.gui.EvATabbedFrameMaker;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.JParaPanel;
 import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.stat.AbstractStatistics;

src/eva2/optimization/modules/PSOParameters.java

@@ -1,7 +1,7 @@
 package eva2.optimization.modules;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.enums.PSOTopologyEnum;
 import eva2.optimization.operator.terminators.EvaluationTerminator;

src/eva2/optimization/operator/archiving/AbstractArchiving.java

@@ -1,6 +1,7 @@
 package eva2.optimization.operator.archiving;
 
-import eva2.gui.*;
+import eva2.gui.plot.GraphPointSet;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.tools.chart2d.Chart2DDPointIconCross;
@@ -17,7 +18,7 @@ import eva2.tools.chart2d.DPointIcon;
  * To change this template use Options | File Templates.
  */
 public abstract class AbstractArchiving implements InterfaceArchiving, java.io.Serializable {
-    transient protected eva2.gui.Plot    m_Plot = null;
+    transient protected Plot m_Plot = null;
     protected int                           p = 0;
     public boolean obeyDebsConstViolationPrinciple = true;
 

src/eva2/optimization/operator/archiving/ArchivingPESAII.java

@@ -1,14 +1,9 @@
 package eva2.optimization.operator.archiving;
 
-import eva2.gui.GraphPointSet;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
-import eva2.tools.chart2d.Chart2DDPointIconCircle;
-import eva2.tools.chart2d.Chart2DDPointIconText;
-import eva2.tools.chart2d.DLine;
-import eva2.tools.chart2d.DPoint;
 import eva2.tools.math.RNG;
-import java.awt.Color;
+
 import java.util.ArrayList;
 
 /** The Pareto envelope sorting algorithm using a hybergrid and

src/eva2/optimization/operator/archiving/ArchivingSPEAII.java

@@ -1,7 +1,8 @@
 package eva2.optimization.operator.archiving;
 
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;
 import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric;
@@ -9,7 +10,6 @@ import eva2.optimization.population.Population;
 import eva2.tools.chart2d.Chart2DDPointIconCircle;
 import eva2.tools.chart2d.Chart2DDPointIconText;
 import eva2.tools.chart2d.DPoint;
-import java.awt.Color;
 
 /** The strength Pareto EA in it's second version, which is based on
  * dominance counts.
@@ -196,7 +196,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial
             for (int i = 0; i < result.length; i++) {
                 System.out.println("Result "+i+": "+result[i]);
             }
-            this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2", true);
+            this.m_Plot = new Plot("Debug SPEAII", "Y1", "Y2", true);
             this.m_Plot.setUnconnectedPoint(0, 0, 11);
             this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11);
             GraphPointSet   mySet = new GraphPointSet(10, this.m_Plot.getFunctionArea());

src/eva2/optimization/operator/cluster/ClusteringKMeans.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.cluster;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
@@ -152,7 +152,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab
                 double[]    tmpD = new double[2];
                 tmpD[0] = 0;
                 tmpD[1] = 0;
-                plot = new eva2.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD);
+                plot = new Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD);
 
                 for (int i = 0; i < pop.size(); i++) {
                     double[] x = ((InterfaceDataTypeDouble)pop.get(i)).getDoubleData();
@@ -183,7 +183,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab
                 double[]    tmpD = new double[2];
                 tmpD[0] = 0;
                 tmpD[1] = 0;
-                plot = new eva2.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD);
+                plot = new Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD);
                 GraphPointSet           mySet;
                 DPoint                  myPoint;
                 Chart2DDPointIconText   tmp;
@@ -221,7 +221,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab
             double[]    tmpD = new double[2];
             tmpD[0] = 0;
             tmpD[1] = 0;
-            plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
+            plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
             GraphPointSet           mySet;
             DPoint                  myPoint;
             Chart2DDPointIconText   tmp;

src/eva2/optimization/operator/cluster/ClusteringNearestBetter.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.cluster;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.AbstractEAIndividualComparator;
 import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric;

src/eva2/optimization/operator/cluster/ClusteringXMeans.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.cluster;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
@@ -85,7 +85,7 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab
                 double[]    tmpD = new double[2], x;
                 tmpD[0] = 0;
                 tmpD[1] = 0;
-                plot = new eva2.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD);
+                plot = new Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD);
                 GraphPointSet           mySet;
                 DPoint                  myPoint;
                 Chart2DDPointIconText   tmp;

src/eva2/optimization/operator/constraint/AbstractConstraint.java

@@ -5,7 +5,7 @@ import eva2.optimization.operator.paramcontrol.ParamAdaption;
 import eva2.optimization.operator.paramcontrol.ParameterControlManager;
 import eva2.optimization.operator.paramcontrol.GenericParamAdaption;
 import eva2.optimization.operator.paramcontrol.NoParamAdaption;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.problems.AbstractProblemDouble;
 import eva2.tools.EVAERROR;

src/eva2/optimization/operator/constraint/DummyConstraint.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.constraint;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 
 /**
  * This constraint is always satisfied.

src/eva2/optimization/operator/constraint/IntervalConstraint.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.constraint;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.tools.EVAERROR;
 import eva2.tools.math.Mathematics;
 import java.io.Serializable;

src/eva2/optimization/operator/crossover/CrossoverEAMixer.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.crossover;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceOptimizationProblem;

src/eva2/optimization/operator/crossover/CrossoverESPCX.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.crossover;
 
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceESIndividual;
@@ -79,7 +79,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable
 
                 subSpace = this.getCoordinates(g, i, parents);
 
-//                Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true);
+//                Plot plot = new eva2.gui.plot.Plot("SBX Test", "x", "y", true);
 //                plot.setUnconnectedPoint(-2, -2, 0);
 //                plot.setUnconnectedPoint(2, 2, 0);
 //                for (int z = 0; z < parents.length; z++) {
@@ -262,7 +262,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable
         tmpD[0] = 1;
         tmpD[1] = 1;
         if (plotFlag) {
-            plot = new eva2.gui.Plot("SBX Test", "x", "y", true);
+            plot = new Plot("SBX Test", "x", "y", true);
             tmpD = indy1.getDoubleData();
             plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0);
             tmpD = indy2.getDoubleData();

src/eva2/optimization/operator/crossover/CrossoverESSBX.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.crossover;
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceESIndividual;
@@ -162,7 +162,7 @@ public class CrossoverESSBX implements InterfaceCrossover, java.io.Serializable
         pop.add(indy3);
         tmpD[0] = 1;
         tmpD[1] = 1;
-        Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true);
+        Plot plot = new Plot("SBX Test", "x", "y", true);
         tmpD = indy1.getDoubleData();
         plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0);
         tmpD = indy2.getDoubleData();

src/eva2/optimization/operator/crossover/CrossoverESSPX.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.crossover;
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceESIndividual;
@@ -181,7 +181,7 @@ public class CrossoverESSPX implements InterfaceCrossover, java.io.Serializable
         tmpD[0] = 1;
         tmpD[1] = 1;
         if (plotFlag) {
-            plot = new eva2.gui.Plot("SBX Test", "x", "y", true);
+            plot = new Plot("SBX Test", "x", "y", true);
             tmpD = indy1.getDoubleData();
             plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0);
             tmpD = indy2.getDoubleData();

src/eva2/optimization/operator/crossover/CrossoverESUNDX.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.crossover;
 
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceESIndividual;
@@ -265,7 +265,7 @@ public class CrossoverESUNDX implements InterfaceCrossover, java.io.Serializable
         tmpD[0] = 1;
         tmpD[1] = 1;
         if (plotFlag) {
-            plot = new eva2.gui.Plot("SBX Test", "x", "y", true);
+            plot = new Plot("SBX Test", "x", "y", true);
             tmpD = indy1.getDoubleData();
             plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0);
             tmpD = indy2.getDoubleData();

src/eva2/optimization/operator/crossover/PropertyCrossoverMixerEditor.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.crossover;
 
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralGEOFaker;

src/eva2/optimization/operator/crossover/TestESCrossover.java

@@ -2,7 +2,7 @@ package eva2.optimization.operator.crossover;
 
 
 import eva2.gui.JParaPanel;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
@@ -85,7 +85,7 @@ public class TestESCrossover implements java.io.Serializable {
         double[] tmpD = new double[2];
         tmpD[0] = 0;
         tmpD[1] = 0;
-        this.m_Plot = new eva2.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD);
+        this.m_Plot = new Plot("ES Crossover Testert", "x", "y", tmpD, tmpD);
         // validate and show
         this.m_Frame.validate();
         this.m_Frame.setVisible(true);

src/eva2/optimization/operator/migration/MOClusteringSeparation.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.migration;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.archiving.ArchivingNSGAII;
 import eva2.optimization.operator.cluster.ClusteringKMeans;
@@ -107,7 +107,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria
 //            double[]    tmpD = new double[2];
 //            tmpD[0] = 0;
 //            tmpD[1] = 0;
-//            plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
+//            plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
 //            GraphPointSet           mySet;
 //            DPoint                  myPoint;
 //            Chart2DDPointIconText   tmp;
@@ -146,7 +146,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria
             double[]    tmpD = new double[2];
             tmpD[0] = 0;
             tmpD[1] = 0;
-            plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
+            plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
             GraphPointSet           mySet;
             DPoint                  myPoint;
             Chart2DDPointIconText   tmp;

src/eva2/optimization/operator/migration/MOConeSeparation.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.migration;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.archiving.ArchivingAllDominating;
 import eva2.optimization.operator.archiving.InterfaceArchiving;
@@ -138,7 +138,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl
 //            double[]    tmpD = new double[2];
 //            tmpD[0] = 0;
 //            tmpD[1] = 0;
-//            plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD);
+//            plot = new eva2.gui.plot.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD);
 //            GraphPointSet           mySet;
 //            DPoint                  myPoint;
 //            Chart2DDPointIconText   tmp;
@@ -211,7 +211,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl
             double[]    tmpD = new double[2];
             tmpD[0] = 0;
             tmpD[1] = 0;
-            plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD);
+            plot = new Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD);
             GraphPointSet           mySet;
             DPoint                  myPoint;
             Chart2DDPointIconText   tmp;

src/eva2/optimization/operator/migration/MOXMeansSeparation.java

@@ -1,8 +1,8 @@
 package eva2.optimization.operator.migration;
 
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.archiving.ArchivingNSGAII;
 import eva2.optimization.operator.cluster.ClusteringXMeans;
@@ -103,7 +103,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa
 //            double[]    tmpD = new double[2];
 //            tmpD[0] = 0;
 //            tmpD[1] = 0;
-//            plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
+//            plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
 //            GraphPointSet           mySet;
 //            DPoint                  myPoint;
 //            Chart2DDPointIconText   tmp;
@@ -146,7 +146,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa
             double[]    tmpD = new double[2];
             tmpD[0] = 0;
             tmpD[1] = 0;
-            plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
+            plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD);
             GraphPointSet           mySet;
             DPoint                  myPoint;
             Chart2DDPointIconText   tmp;

src/eva2/optimization/operator/moso/MOSOMaxiMin.java

@@ -1,5 +1,6 @@
 package eva2.optimization.operator.moso;
 
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.tools.math.RNG;
@@ -14,7 +15,7 @@ import eva2.tools.math.RNG;
 public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable {
 
     private int             m_OutputDimension   = 2;
-    transient protected     eva2.gui.Plot    m_Plot = null;
+    transient protected Plot m_Plot = null;
 
     public MOSOMaxiMin() {
     }
@@ -71,7 +72,7 @@ public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable
         }
         ////////////////////////////////////////////////////////////////////////////////////
 //        if (false) {
-//            this.m_Plot = new eva2.gui.Plot("Debug MaxiMin", "Y1", "Y2");
+//            this.m_Plot = new eva2.gui.plot.Plot("Debug MaxiMin", "Y1", "Y2");
 //            this.m_Plot.setUnconnectedPoint(0, 0, 11);
 //            this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11);
 //            double[][] trueFitness, moFitness;

src/eva2/optimization/operator/mutation/MutateEAMixer.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.mutation;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceOptimizationProblem;

src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.mutation;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.enums.ESMutationInitialSigma;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.AbstractEAIndividualComparator;

src/eva2/optimization/operator/mutation/MutateGAUniform.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.mutation;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.InterfaceGAIndividual;
 import eva2.optimization.population.Population;

src/eva2/optimization/operator/mutation/PropertyMutationMixerEditor.java

@@ -1,6 +1,7 @@
 package eva2.optimization.operator.mutation;
 
 import eva2.gui.*;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralGEOFaker;
 import eva2.optimization.tools.GeneralGOEProperty;

src/eva2/optimization/operator/paramcontrol/PSOInertnessAdaption.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.paramcontrol;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import java.io.Serializable;
 
 /**

src/eva2/optimization/operator/postprocess/PostProcess.java

@@ -10,8 +10,8 @@ import eva2.optimization.problems.FM0Problem;
 import eva2.OptimizerFactory;
 import eva2.OptimizerRunnable;
 import eva2.gui.BeanInspector;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
-import eva2.gui.TopoPlot;
+import eva2.gui.plot.TopoPlot;
 import eva2.optimization.go.IndividualInterface;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.enums.ESMutationInitialSigma;

src/eva2/optimization/operator/postprocess/PostProcessParams.java

@@ -1,6 +1,6 @@
 package eva2.optimization.operator.postprocess;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.enums.PostProcessMethod;
 import java.io.Serializable;
 

src/eva2/optimization/operator/selection/SelectMOSPEAII.java

@@ -1,7 +1,7 @@
 package eva2.optimization.operator.selection;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.archiving.ArchivingSPEAII;
 import eva2.optimization.population.Population;
@@ -81,7 +81,7 @@ public class SelectMOSPEAII implements InterfaceSelection, java.io.Serializable
             double[] tmpD = new double[2];
             tmpD[0] = 0;
             tmpD[1] = 0;
-            Plot plot = new eva2.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD);
+            Plot plot = new Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD);
             plot.setUnconnectedPoint(0, 0, 11);
             plot.setUnconnectedPoint(1.2, 10, 11);
             GraphPointSet   mySet = new GraphPointSet(10, plot.getFunctionArea());

src/eva2/optimization/population/Population.java

@@ -5,7 +5,7 @@ import eva2.optimization.individuals.AbstractEAIndividualComparator;
 import eva2.optimization.individuals.InterfaceESIndividual;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.InterfaceGAIndividual;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.IndividualInterface;
 import eva2.optimization.go.InterfacePopulationChangedEventListener;
 import eva2.optimization.operator.distancemetric.EuclideanMetric;

src/eva2/optimization/problems/AbstractDynTransProblem.java

@@ -1,5 +1,6 @@
 package eva2.optimization.problems;
 
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
 import eva2.optimization.population.Population;
@@ -70,7 +71,7 @@ public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimiz
 				tmpD[0] = 0;
 				tmpD[1] = 0;
 				// im not really certain about what tmpD is required for
-				this.myplot = new eva2.gui.Plot("population measures", "x1", "x2", tmpD, tmpD);
+				this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD);
 			}			
 			myplot.setConnectedPoint(population.getFunctionCalls(), delta, 0);
 			//myplot.setUnconnectedPoint(population.getFunctionCalls(), population.getPopulationMeasures()[2], 2);

src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java

@@ -1,6 +1,6 @@
 package eva2.optimization.problems;
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 
@@ -344,7 +344,7 @@ public abstract class AbstractDynamicOptimizationProblem extends AbstractOptimiz
         tmpD[0] = 0;
         tmpD[1] = 0;
         // im not really certain about what tmpD is required for
-        this.myplot = new eva2.gui.Plot("population measures", "x1", "x2", tmpD, tmpD);
+        this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD);
 	}
 	
     /** This method allows the CommonJavaObjectEditorPanel to read the

src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java

@@ -1,7 +1,7 @@
 package eva2.optimization.problems;
 
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
@@ -370,7 +370,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract
         Population              tmpPop = null;
 
         if (p.getGeneration() > 2) {
-//            m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2");
+//            m_Plot = new eva2.gui.plot.Plot("Multiobjective Optimization", "Y1", "Y2");
             // i want to plot the pareto front for MOEA and other strategies
             // but i have to differentiate between the case where
             // there is a true MOEA at work and where the

src/eva2/optimization/problems/AbstractProblemDouble.java

@@ -1,7 +1,7 @@
 package eva2.optimization.problems;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
-import eva2.gui.TopoPlot;
+import eva2.gui.plot.TopoPlot;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.enums.PostProcessMethod;
 import eva2.optimization.individuals.AbstractEAIndividual;

src/eva2/optimization/problems/ConstrPressureVessel.java

@@ -1,6 +1,6 @@
 package eva2.optimization.problems;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.operator.constraint.AbstractConstraint;
 import eva2.optimization.operator.constraint.ConstraintCollection;

src/eva2/optimization/problems/F13Problem.java

@@ -1,6 +1,6 @@
 package eva2.optimization.problems;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.operator.postprocess.SolutionHistogram;
 

src/eva2/optimization/problems/PSymbolicRegression.java

@@ -1,6 +1,6 @@
 package eva2.optimization.problems;
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.GAPIndividualProgramData;

src/eva2/optimization/problems/SimpleProblemWrapper.java

@@ -1,8 +1,8 @@
 package eva2.optimization.problems;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.ESIndividualDoubleData;
 import eva2.optimization.individuals.GAIndividualBinaryData;

src/eva2/optimization/problems/TF1Problem.java

@@ -1,6 +1,6 @@
 package eva2.optimization.problems;
 
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.gui.PropertyFilePath;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;

src/eva2/optimization/stat/EvAJobList.java

@@ -1,6 +1,6 @@
 package eva2.optimization.stat;
 
-import eva2.gui.GenericArrayEditor;
+import eva2.gui.editor.GenericArrayEditor;
 import eva2.gui.JParaPanel;
 import eva2.gui.PropertySelectableList;
 import eva2.optimization.go.InterfaceOptimizationParameters;

src/eva2/optimization/stat/GenericStatistics.java

@@ -9,9 +9,9 @@ package eva2.optimization.stat;
  *            $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $
  *            $Author: mkron $
  */
-import eva2.gui.DataViewer;
+import eva2.gui.plot.DataViewer;
-import eva2.gui.DataViewerInterface;
+import eva2.gui.plot.DataViewerInterface;
-import eva2.gui.Graph;
+import eva2.gui.plot.Graph;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.logging.Logger;

src/eva2/optimization/stat/StatisticsParameter.java

@@ -1,7 +1,7 @@
 package eva2.optimization.stat;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceNotifyOnInformers;
 import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
 import eva2.tools.EVAERROR;

src/eva2/optimization/stat/StatisticsWithGUI.java

@@ -11,12 +11,12 @@ package eva2.optimization.stat;
  *            $Author: mkron $
  */
 import eva2.gui.BeanInspector;
-import eva2.gui.Graph;
+import eva2.gui.plot.Graph;
-import eva2.gui.GraphWindow;
+import eva2.gui.plot.GraphWindow;
 import eva2.gui.JTextoutputFrame;
 import eva2.gui.JTextoutputFrameInterface;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
-import eva2.gui.PlotInterface;
+import eva2.gui.plot.PlotInterface;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
 import eva2.tools.EVAERROR;

src/eva2/optimization/strategies/ANPSO.java

@@ -1,7 +1,7 @@
 package eva2.optimization.strategies;
 
 import eva2.OptimizerFactory;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.enums.PSOTopologyEnum;

src/eva2/optimization/strategies/ClusterBasedNichingEA.java

@@ -1,10 +1,10 @@
 package eva2.optimization.strategies;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
-import eva2.gui.GraphPointSet;
+import eva2.gui.plot.GraphPointSet;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
-import eva2.gui.TopoPlot;
+import eva2.gui.plot.TopoPlot;
 import eva2.optimization.go.InterfacePopulationChangedEventListener;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.population.PopulationInterface;

src/eva2/optimization/strategies/ClusteringHillClimbing.java

@@ -1,6 +1,6 @@
 package eva2.optimization.strategies;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfacePopulationChangedEventListener;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.enums.PostProcessMethod;

src/eva2/optimization/strategies/DifferentialEvolution.java

@@ -1,7 +1,7 @@
 package eva2.optimization.strategies;
 
 import eva2.gui.BeanInspector;
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfacePopulationChangedEventListener;
 import eva2.optimization.enums.DETypeEnum;
 import eva2.optimization.individuals.AbstractEAIndividual;

src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java

@@ -1,7 +1,7 @@
 package eva2.optimization.strategies;
 
-import eva2.gui.GenericObjectEditor;
+import eva2.gui.editor.GenericObjectEditor;
-import eva2.gui.Plot;
+import eva2.gui.plot.Plot;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
 import eva2.optimization.population.Population;