Reformat code and optimize imports.

Language Level changed to 1.7

src/eva2/EvAInfo.java

@@ -1,12 +1,12 @@
 package eva2;
 
 import eva2.tools.BasicResourceLoader;
+
 import java.io.InputStream;
 import java.util.Properties;
 
 /**
  * @author mkron
- *
  */
 public class EvAInfo {
     /**
@@ -48,6 +48,7 @@ public class EvAInfo {
     ////////////// Property handling...
 
     private static Properties evaProperties;
+
     static {
         try {
             evaProperties = BasicResourceLoader.readProperties(EvAInfo.propertyFile);
@@ -65,6 +66,7 @@ public class EvAInfo {
     /**
      * An eloquent error message in case a resource was not found - which was
      * expected in the EvA2 resource directory.
+     *
      * @param resourceName
      * @return
      */

src/eva2/OptimizerFactory.java

@@ -1,41 +1,13 @@
 package eva2;
 
-import eva2.optimization.modules.OptimizationParameters;
-import eva2.optimization.operator.mutation.InterfaceMutation;
-import eva2.optimization.operator.mutation.NoMutation;
-import eva2.optimization.operator.mutation.MutateESFixedStepSize;
-import eva2.optimization.operator.mutation.MutateESCovarianceMatrixAdaption;
-import eva2.optimization.operator.mutation.MutateESGlobal;
-import eva2.optimization.operator.mutation.MutateESRankMuCMA;
-import eva2.optimization.strategies.ParticleSwarmOptimization;
-import eva2.optimization.strategies.EvolutionStrategyIPOP;
-import eva2.optimization.strategies.GradientDescentAlgorithm;
-import eva2.optimization.strategies.NelderMeadSimplex;
-import eva2.optimization.strategies.DifferentialEvolution;
-import eva2.optimization.strategies.EsDpiNiching;
-import eva2.optimization.strategies.HillClimbing;
-import eva2.optimization.strategies.EvolutionStrategies;
-import eva2.optimization.strategies.PopulationBasedIncrementalLearning;
-import eva2.optimization.strategies.EsDpiNichingCma;
-import eva2.optimization.strategies.MultiObjectiveEA;
-import eva2.optimization.strategies.GeneticAlgorithm;
-import eva2.optimization.strategies.InterfaceOptimizer;
-import eva2.optimization.strategies.Tribes;
-import eva2.optimization.strategies.SimulatedAnnealing;
-import eva2.optimization.strategies.ClusteringHillClimbing;
-import eva2.optimization.strategies.ClusterBasedNichingEA;
-import eva2.optimization.strategies.MonteCarloSearch;
-import eva2.optimization.individuals.IndividualInterface;
-import eva2.optimization.go.InterfacePopulationChangedEventListener;
-import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.enums.DETypeEnum;
 import eva2.optimization.enums.MutateESCrossoverTypeEnum;
 import eva2.optimization.enums.PSOTopologyEnum;
 import eva2.optimization.enums.PostProcessMethod;
-import eva2.optimization.individuals.AbstractEAIndividual;
-import eva2.optimization.individuals.InterfaceDataTypeBinary;
-import eva2.optimization.individuals.InterfaceDataTypeDouble;
-import eva2.optimization.individuals.InterfaceESIndividual;
+import eva2.optimization.go.InterfacePopulationChangedEventListener;
+import eva2.optimization.go.InterfaceTerminator;
+import eva2.optimization.individuals.*;
+import eva2.optimization.modules.OptimizationParameters;
 import eva2.optimization.operator.archiving.ArchivingNSGAII;
 import eva2.optimization.operator.archiving.InformationRetrievalInserting;
 import eva2.optimization.operator.archiving.InterfaceArchiving;
@@ -46,6 +18,7 @@ import eva2.optimization.operator.crossover.CrossoverESDefault;
 import eva2.optimization.operator.crossover.InterfaceCrossover;
 import eva2.optimization.operator.crossover.NoCrossover;
 import eva2.optimization.operator.distancemetric.IndividualDataMetric;
+import eva2.optimization.operator.mutation.*;
 import eva2.optimization.operator.postprocess.InterfacePostProcessParams;
 import eva2.optimization.operator.postprocess.PostProcessParams;
 import eva2.optimization.operator.selection.InterfaceSelection;
@@ -56,7 +29,9 @@ import eva2.optimization.population.PBILPopulation;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.AbstractOptimizationProblem;
 import eva2.optimization.stat.InterfaceStatistics;
+import eva2.optimization.strategies.*;
 import eva2.tools.math.RNG;
+
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
@@ -76,11 +51,11 @@ import java.util.List;
  * while (!terminator.isTerminated(optimizer.getPopulation())) optimizer.optimize();
  * </code> </p>
  *
- * @version 0.1
- * @since 2.0
  * @author mkron
  * @author Andreas Dr&auml;ger
+ * @version 0.1
  * @date 17.04.2007
+ * @since 2.0
  */
 public class OptimizerFactory {
 
@@ -434,9 +409,9 @@ public class OptimizerFactory {
      * @param speedLim
      * @param listener
      * @param topology
-     * @see ParticleSwarmOpimization
      * @return An optimization algorithm that performs particle swarm
      *         optimization.
+     * @see ParticleSwarmOpimization
      */
     public static ParticleSwarmOptimization createParticleSwarmOptimization(
             AbstractOptimizationProblem problem, int popsize, double phi1,
@@ -556,6 +531,7 @@ public class OptimizerFactory {
     }
 
     // /////////////////////////// constructing a default OptimizerRunnable
+
     /**
      * For an optimizer identifier, return the corresponding default parameter
      * set including initialization (thats why the problem is required).
@@ -672,16 +648,17 @@ public class OptimizerFactory {
     }
 
     // /////////////////////////// constructing a default OptimizerRunnable
+
     /**
      * Produce a runnable optimizer from a strategy identifier, a problem
      * instance and with the current static terminator in use. Output is written
      * to a file if the prefix String is given.
      *
-     * @see #getOptRunnable(int, AbstractOptimizationProblem, int, String)
      * @param optType
      * @param problem
      * @param outputFilePrefix
      * @return a runnable optimizer
+     * @see #getOptRunnable(int, AbstractOptimizationProblem, int, String)
      */
     public static OptimizerRunnable getOptRunnable(final int optType,
                                                    AbstractOptimizationProblem problem, String outputFilePrefix) {
@@ -713,6 +690,7 @@ public class OptimizerFactory {
     }
 
     // /////////////////////// Creating default strategies
+
     /**
      * Use lambda, default random seed and terminator to produce OptimizationParameters.
      *
@@ -728,12 +706,12 @@ public class OptimizerFactory {
     /**
      * Use default random seed and terminator for a parameter set.
      *
-     * @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
-     * long, InterfaceTerminator)
      * @param opt
      * @param popSize
      * @param problem
      * @return
+     * @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
+     *      long, InterfaceTerminator)
      */
     public static OptimizationParameters makeParams(InterfaceOptimizer opt, int popSize, AbstractOptimizationProblem problem) {
         return makeParams(opt, popSize, problem, randSeed, getTerminator());
@@ -742,12 +720,12 @@ public class OptimizerFactory {
     /**
      * Use default random seed and the population size of the optimizer.
      *
-     * @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
-     * long, InterfaceTerminator)
      * @param opt
      * @param popSize
      * @param problem
      * @return
+     * @see #makeParams(InterfaceOptimizer, int, AbstractOptimizationProblem,
+     *      long, InterfaceTerminator)
      */
     public static OptimizationParameters makeParams(InterfaceOptimizer opt, AbstractOptimizationProblem problem, InterfaceTerminator term) {
         return makeParams(opt, opt.getPopulation().getTargetSize(), problem, randSeed, term);
@@ -757,14 +735,14 @@ public class OptimizerFactory {
      * Set the population size, initialize the population and return a parameter
      * structure containing all given parts.
      *
-     * @see #makeParams(InterfaceOptimizer, Population,
-     * AbstractOptimizationProblem, long, InterfaceTerminator)
      * @param opt
      * @param popSize
      * @param problem
      * @param seed
      * @param term
      * @return
+     * @see #makeParams(InterfaceOptimizer, Population,
+     *      AbstractOptimizationProblem, long, InterfaceTerminator)
      */
     public static OptimizationParameters makeParams(InterfaceOptimizer opt,
                                                     int popSize, AbstractOptimizationProblem problem, long seed,
@@ -780,13 +758,13 @@ public class OptimizerFactory {
      * The result can be modified and then used to create an OptimizerRunnable,
      * which of course can simply be run.
      *
-     * @see OptimizerRunnable
      * @param opt
      * @param pop
      * @param problem
      * @param seed
      * @param term
      * @return
+     * @see OptimizerRunnable
      */
     public static OptimizationParameters makeParams(InterfaceOptimizer opt,
                                                     Population pop, AbstractOptimizationProblem problem, long seed,
@@ -1137,6 +1115,7 @@ public class OptimizerFactory {
     }
 
     ///////////////////////////// termination management
+
     /**
      * Replace the current user-defined terminator by the given one.
      *
@@ -1185,6 +1164,7 @@ public class OptimizerFactory {
     }
 
     ///////////////////////////// default parameters
+
     /**
      * Create a standard multi-start hill-climber parameter set with 50 initial
      * individuals.
@@ -1323,7 +1303,6 @@ public class OptimizerFactory {
     }
 
     /**
-     *
      * @param problem
      * @return
      */

src/eva2/OptimizerRunnable.java

@@ -1,24 +1,20 @@
 package eva2;
 
-import eva2.optimization.go.InterfaceOptimizationParameters;
-import eva2.optimization.stat.StatisticsDummy;
-import eva2.optimization.stat.InterfaceStatistics;
-import eva2.optimization.stat.StatisticsParameter;
-import eva2.optimization.stat.AbstractStatistics;
-import eva2.optimization.stat.StatisticsStandalone;
-import eva2.optimization.stat.InterfaceTextListener;
 import eva2.optimization.OptimizationStateListener;
-import eva2.optimization.individuals.IndividualInterface;
+import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.go.InterfaceTerminator;
+import eva2.optimization.individuals.IndividualInterface;
 import eva2.optimization.individuals.InterfaceDataTypeBinary;
 import eva2.optimization.individuals.InterfaceDataTypeDouble;
 import eva2.optimization.individuals.InterfaceDataTypeInteger;
+import eva2.optimization.modules.OptimizationParameters;
+import eva2.optimization.modules.Processor;
 import eva2.optimization.operator.postprocess.InterfacePostProcessParams;
 import eva2.optimization.operator.postprocess.PostProcessParams;
 import eva2.optimization.population.Population;
 import eva2.optimization.population.SolutionSet;
-import eva2.optimization.modules.OptimizationParameters;
-import eva2.optimization.modules.Processor;
+import eva2.optimization.stat.*;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.BitSet;
@@ -28,7 +24,6 @@ import java.util.BitSet;
  * This Runnable class just encapsulates the Processor class with some simple ways to access a solution.
  *
  * @author mkron
- *
  */
 public class OptimizerRunnable implements Runnable {
     private Processor proc;
@@ -104,6 +99,7 @@ public class OptimizerRunnable implements Runnable {
 
     /**
      * A unique ID for the runnable.
+     *
      * @return
      */
     public int getID() {
@@ -157,8 +153,7 @@ public class OptimizerRunnable implements Runnable {
             } else {
                 if (doRestart) {
                     proc.restartOptimization();
-                            }
-				else {
+                } else {
                     proc.startOptimization();
                 }
                 proc.runOptOnce();
@@ -258,8 +253,8 @@ public class OptimizerRunnable implements Runnable {
     /**
      * Set the verbosity level in the statistics module to the given value.
      *
-	 * @see StatsParameter
      * @param vLev
+     * @see StatsParameter
      */
     public void setVerbosityLevel(int vLev) {
         if (vLev >= 0 && vLev < proc.getStatistics().getStatisticsParameter().getOutputVerbosity().getTags().length) {
@@ -272,8 +267,8 @@ public class OptimizerRunnable implements Runnable {
     /**
      * Set the output direction in the statistics module.
      *
-	 * @see StatsParameter
      * @param outp
+     * @see StatsParameter
      */
     public void setOutputTo(int outp) {
         ((StatisticsParameter) proc.getStatistics().getStatisticsParameter()).setOutputTo(outp);
@@ -281,6 +276,7 @@ public class OptimizerRunnable implements Runnable {
 
     /**
      * Set the number of multiruns in the statistics module.
+     *
      * @param multis
      */
     public void setMultiRuns(int multis) {
@@ -289,8 +285,9 @@ public class OptimizerRunnable implements Runnable {
 
     /**
      * Indicate whether full stats should be printed as text (or only selected entries).
-	 * @see StatsParameter
+     *
      * @param addInfo
+     * @see StatsParameter
      */
     public void setOutputFullStatsToText(boolean addInfo) {
         ((AbstractStatistics) proc.getStatistics()).getStatisticsParameter().setOutputAllFieldsAsText(addInfo);

src/eva2/cli/Main.java

@@ -1,21 +1,19 @@
 package eva2.cli;
 
-import eva2.optimization.problems.InterfaceOptimizationProblem;
-import eva2.optimization.strategies.DifferentialEvolution;
-import eva2.optimization.strategies.InterfaceOptimizer;
-import eva2.util.annotation.Parameter;
-import org.apache.commons.cli.*;
 import eva2.optimization.OptimizationStateListener;
+import eva2.optimization.problems.InterfaceOptimizationProblem;
+import eva2.optimization.strategies.InterfaceOptimizer;
+import org.apache.commons.cli.*;
 import org.reflections.Reflections;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 public class Main implements OptimizationStateListener {
 
 
-
     private static Options createDefaultCommandLineOptions() {
         Options opt = new Options();
 

src/eva2/client/ClassPreloader.java

@@ -8,7 +8,6 @@ import eva2.gui.editor.GenericObjectEditor;
  * done at startup time and accelerates later reloading.
  *
  * @author mkron
- *
  */
 public class ClassPreloader implements Runnable {
 

src/eva2/examples/TestingCbnPostProc.java

@@ -1,10 +1,12 @@
 package eva2.examples;
+
 import eva2.OptimizerFactory;
 import eva2.optimization.individuals.AbstractEAIndividual;
+import eva2.optimization.modules.OptimizationParameters;
 import eva2.optimization.operator.postprocess.PostProcessParams;
 import eva2.optimization.operator.terminators.EvaluationTerminator;
 import eva2.optimization.problems.FM0Problem;
-import eva2.optimization.modules.OptimizationParameters;
+
 import java.util.List;
 
 public class TestingCbnPostProc {
@@ -35,5 +37,7 @@ public class TestingCbnPostProc {
         for (AbstractEAIndividual indy : ppSols) {
             System.out.println(AbstractEAIndividual.getDefaultDataString(indy));
         }
-	};
+    }
+
+    ;
 }

src/eva2/examples/TestingGAB1.java

@@ -1,11 +1,13 @@
 package eva2.examples;
+
 import eva2.OptimizerFactory;
+import eva2.optimization.modules.OptimizationParameters;
 import eva2.optimization.operator.selection.SelectXProbRouletteWheel;
 import eva2.optimization.operator.terminators.EvaluationTerminator;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.B1Problem;
 import eva2.optimization.strategies.GeneticAlgorithm;
-import eva2.optimization.modules.OptimizationParameters;
+
 import java.util.BitSet;
 
 public class TestingGAB1 {
@@ -32,6 +34,8 @@ public class TestingGAB1 {
             System.out.print(sol.get(i) + " ");
         }
         System.out.println();
-	};
+    }
+
+    ;
 }
 

src/eva2/examples/TestingPlusCmaEs.java

@@ -39,5 +39,6 @@ public class TestingPlusCmaEs {
         System.out.println(esParams.getTerminator().lastTerminationMessage() + "\nFound solution: "
                 + AbstractEAIndividual.getDefaultDataString(bestIndy));
     }
+
     ;
 }

src/eva2/gui/AboutDialog.java

@@ -6,12 +6,12 @@ package eva2.gui;
 
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author becker

src/eva2/gui/BeanInspector.java

@@ -7,13 +7,8 @@ import eva2.tools.SelectedTag;
 import eva2.tools.StringTools;
 import eva2.tools.Tag;
 import eva2.util.annotation.Description;
-import eva2.util.annotation.Parameter;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyDescriptor;
+import java.beans.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -641,7 +636,8 @@ public class BeanInspector {
                 infoBf.append((String) ret);
             } else {
                 Description description = obj.getClass().getAnnotation(Description.class);
-                if(description != null) {;
+                if (description != null) {
+                    ;
                     infoBf.append("\t");
                     infoBf.append(description.text());
                 }

src/eva2/gui/EvAModuleButtonPanelMaker.java

@@ -15,14 +15,12 @@ import eva2.optimization.modules.ModuleAdapter;
 import eva2.optimization.stat.OptimizationJob;
 import eva2.tools.ToolBoxGui;
 
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.Serializable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.JToolBar;
 
 /**
  * Contains the GUI elements of start and stop buttons and optionally a help

src/eva2/gui/EvATabbedFrameMaker.java

@@ -8,14 +8,14 @@ package eva2.gui;
 import eva2.optimization.go.InterfaceNotifyOnInformers;
 import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
 
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
 import java.awt.*;
 import java.awt.event.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.swing.*;
-import javax.swing.plaf.basic.BasicButtonUI;
 
 /**
  * Produces the main EvA2 frame and a tool bar instance. TODO This class should be removed

src/eva2/gui/EvATreeSelectionListener.java

@@ -1,14 +1,14 @@
 package eva2.gui;
 
-import java.awt.Component;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyEditor;
-import javax.swing.JTree;
+import javax.swing.*;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
 
 /**
  * Listener for use with the EvATreeNode class. It implements both the tree selection listener

src/eva2/gui/ExtAction.java

@@ -13,10 +13,7 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================*/
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.KeyStroke;
+import javax.swing.*;
 
 /**
  *

src/eva2/gui/ExtActionChangedListener.java

@@ -13,9 +13,9 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================*/
 
+import javax.swing.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import javax.swing.JComponent;
 
 /**
  *

src/eva2/gui/ExtDesktopManager.java

@@ -10,14 +10,10 @@ package eva2.gui;
  *            $Author: streiche $
  */
 
-import java.awt.Component;
-import java.awt.Event;
+import javax.swing.*;
+import java.awt.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.DefaultDesktopManager;
-import javax.swing.JInternalFrame;
-import javax.swing.JMenuItem;
-import javax.swing.KeyStroke;
 
 /**
  *

src/eva2/gui/HtmlDemo.java

@@ -13,20 +13,15 @@ package eva2.gui;
 import eva2.EvAInfo;
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JViewport;
+import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLFrameHyperlinkEvent;
+import java.awt.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 /**
  *

src/eva2/gui/JDocFrame.java

@@ -1,19 +1,7 @@
 package eva2.gui;
-/*
- * Title:        EvA2
- * Description:
- * Copyright:    Copyright (c) 2003
- * Company:      University of Tuebingen, Computer Architecture
- * @author Holger Ulmer, Felix Streichert, Hannes Planatscher
- * @version:  $Revision: 10 $
- *            $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $
- *            $Author: streiche $
- */
 
+import javax.swing.*;
 import java.io.File;
-import javax.swing.JInternalFrame;
-import javax.swing.JMenu;
-import javax.swing.JToolBar;
 
 /**
  *

src/eva2/gui/JEFrame.java

@@ -10,16 +10,13 @@ package eva2.gui;
  *            $Author: streiche $
  */
 
-import java.awt.Event;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.AbstractAction;
-import javax.swing.JComponent;
-import javax.swing.JInternalFrame;
-import javax.swing.KeyStroke;
+import javax.swing.*;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
 public class JEFrame extends JInternalFrame {
     private boolean closeAllOnClose = false;

src/eva2/gui/JEFrameRegister.java

@@ -1,8 +1,8 @@
 package eva2.gui;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
-import javax.swing.JDesktopPane;
 /*
  * Title:        EvA2
  * Description:

src/eva2/gui/JExtDesktopPane.java

@@ -7,14 +7,13 @@ package eva2.gui;
 
 import eva2.gui.editor.ComponentFilter;
 
-import java.awt.Component;
-import java.awt.Event;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyVetoException;
 import java.util.Vector;
-import javax.swing.*;
 
 /**
  *

src/eva2/gui/JExtDesktopPaneToolBar.java

@@ -2,11 +2,9 @@ package eva2.gui;
 
 import eva2.tools.ToolBoxGui;
 
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JToolBar;
-import javax.swing.SwingConstants;
 
 /**
  * @author becker

src/eva2/gui/JExtFileChooser.java

@@ -13,8 +13,8 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================*/
 
-import java.io.File;
 import javax.swing.*;
+import java.io.File;
 
 public class JExtFileChooser extends JFileChooser {
     private boolean overwriteWarning = true;

src/eva2/gui/JExtMenu.java

@@ -10,12 +10,9 @@ package eva2.gui;
  *            $Author: streiche $
  */
 
-import java.beans.*;
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.KeyStroke;
+import javax.swing.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 /**
  *

src/eva2/gui/JExtToolBar.java

@@ -10,11 +10,11 @@ package eva2.gui;
  *            $Author: streiche $
  */
 
-import java.awt.Insets;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import javax.swing.*;
 
 /**
  *

src/eva2/gui/JParaPanel.java

@@ -11,11 +11,10 @@ package eva2.gui;
 import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.stat.OptimizationJobList;
 
+import javax.swing.*;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
 import java.io.Serializable;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
 
 public class JParaPanel implements Serializable, PanelMaker {
 

src/eva2/gui/JTextEditorInternalFrame.java

@@ -13,14 +13,21 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================*/
 
-import java.awt.Event;
-import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Keymap;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.io.*;
 import java.util.Hashtable;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import javax.swing.undo.*;
 
 
 public class JTextEditorInternalFrame extends JDocFrame {

src/eva2/gui/JTextoutputFrame.java

@@ -5,18 +5,14 @@ package eva2.gui;
  * $ $Date: 2007-11-15 14:58:12 +0100 (Thu, 15 Nov 2007) $ $Author: mkron $
  */
 
-import eva2.EvAInfo;
 import eva2.optimization.tools.FileTools;
-import eva2.tools.BasicResourceLoader;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.Serializable;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.Serializable;
 
 /**
  *

src/eva2/gui/LoggingLevelLabel.java

@@ -4,15 +4,13 @@
  */
 package eva2.gui;
 
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
 
 /**
  * This is a JLabel that shows the current logging level

src/eva2/gui/LoggingPanel.java

@@ -1,17 +1,15 @@
 package eva2.gui;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Point;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 /**
  * Simple logging panel that shows logs produced by EvA2

src/eva2/gui/Main.java

@@ -1,7 +1,8 @@
 package eva2.gui;
 
 import eva2.EvAInfo;
-import eva2.client.*;
+import eva2.client.ClassPreloader;
+import eva2.client.EvAComAdapter;
 import eva2.optimization.OptimizationStateListener;
 import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.modules.AbstractModuleAdapter;
@@ -23,8 +24,9 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.net.URL;
-import java.util.*;
-import java.util.logging.ConsoleHandler;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -373,7 +375,6 @@ public class Main extends JFrame implements OptimizationStateListener {
             }
 
 
-
             LoggingPanel logPanel = new LoggingPanel();
             logPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 

src/eva2/gui/OptimizationEditorPanel.java

@@ -6,8 +6,9 @@ import eva2.tools.BasicResourceLoader;
 import eva2.tools.EVAHELP;
 import eva2.tools.SerializedObject;
 import eva2.util.annotation.Description;
-import org.reflections.Reflections;
 
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicComboBoxRenderer;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -19,11 +20,11 @@ import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Vector;
 import java.util.logging.Logger;
-import javax.swing.*;
-import javax.swing.plaf.basic.BasicComboBoxRenderer;
 
 /**
  *

src/eva2/gui/PanelMaker.java

@@ -1,6 +1,6 @@
 package eva2.gui;
 
-import javax.swing.JComponent;
+import javax.swing.*;
 
 /**
  * Simple helper interface.

src/eva2/gui/PropertyBoolSelector.java

@@ -1,9 +1,9 @@
 package eva2.gui;
 
+import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.beans.PropertyEditor;
-import javax.swing.JCheckBox;
 
 /**
  * A checkbox for boolean editors.

src/eva2/gui/PropertyDialog.java

@@ -9,10 +9,9 @@ import eva2.EvAInfo;
 import eva2.tools.BasicResourceLoader;
 import eva2.tools.EVAHELP;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
+import javax.swing.*;
+import java.awt.*;
 import java.beans.PropertyEditor;
-import javax.swing.JDialog;
 
 /**
  *

src/eva2/gui/PropertyPanel.java

@@ -12,14 +12,9 @@ package eva2.gui;
 
 import eva2.tools.EVAHELP;
 
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 
 /**
  *

src/eva2/gui/PropertySheetPanel.java

@@ -13,6 +13,11 @@ package eva2.gui;
 import eva2.gui.editor.GenericObjectEditor;
 import eva2.tools.EVAHELP;
 
+import javax.swing.*;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableModel;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -22,11 +27,6 @@ import java.lang.reflect.Method;
 import java.util.EventObject;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
 
 /**
  * There are some trick methods interpreted here. Check EvA2Notes.txt.

src/eva2/gui/PropertySheetPanelStat.java

@@ -13,18 +13,12 @@ package eva2.gui;
  * IMPORTS
  *==========================================================================*/
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 
 /**
  *

src/eva2/gui/PropertySlider.java

@@ -5,6 +5,9 @@ package eva2.gui;
  * $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $ $Author: streiche $
  */
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.KeyAdapter;
@@ -12,10 +15,6 @@ import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyEditor;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 /**
  *

src/eva2/gui/PropertyText.java

@@ -1,12 +1,11 @@
 package eva2.gui;
 
+import javax.swing.*;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.JTextField;
 
 /**
  * A text property editor view. Updates the editor on key release and lost focus

src/eva2/gui/PropertyValueSelector.java

@@ -5,11 +5,8 @@ package eva2.gui;
  * $Date: 2007-05-04 14:22:16 +0200 (Fri, 04 May 2007) $ $Author: mkron $
  */
 
+import javax.swing.*;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 
 public class PropertyValueSelector extends JComboBox {
 

src/eva2/gui/SplashScreen.java

@@ -14,8 +14,8 @@ package eva2.gui;
 
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.*;
 import javax.swing.*;
+import java.awt.*;
 
 
 class SplashScreen extends Frame {

src/eva2/gui/editor/AbstractListSelectionEditor.java

@@ -1,23 +1,14 @@
 package eva2.gui.editor;
 
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingConstants;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/BigStringEditor.java

@@ -15,10 +15,15 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyDialog;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyEditor;
 
 /*==========================================================================*
  * CLASS DECLARATION

src/eva2/gui/editor/EnumEditor.java

@@ -2,11 +2,11 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyValueSelector;
 
-import java.awt.BorderLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyEditorSupport;
-import javax.swing.JFrame;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/GenericArrayEditor.java

@@ -4,6 +4,9 @@ import eva2.gui.*;
 import eva2.tools.EVAHELP;
 import eva2.tools.SerializedObject;
 
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
@@ -15,9 +18,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 public class GenericArrayEditor extends JPanel implements PropertyEditor {
 

src/eva2/gui/editor/GenericDoubleArrayEditor.java

@@ -2,27 +2,12 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyDoubleArray;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
 
 /**
  * A simple focus listener with an object ID and callback.

src/eva2/gui/editor/GenericEpsilonConstraintEditor.java

@@ -2,12 +2,12 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyEpsilonConstraint;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/GenericEpsilonThresholdEditor.java

@@ -2,12 +2,12 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyEpsilonThreshold;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/GenericFilePathEditor.java

@@ -2,6 +2,7 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyFilePath;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -9,10 +10,6 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
 import java.io.File;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/GenericIntArrayEditor.java

@@ -2,6 +2,7 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyIntArray;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -10,7 +11,6 @@ import java.awt.event.KeyListener;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/GenericObjectEditor.java

@@ -4,18 +4,8 @@ import eva2.EvAInfo;
 import eva2.gui.OptimizationEditorPanel;
 import eva2.tools.ReflectPackage;
 
-import java.awt.Component;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.beans.PropertyDescriptor;
-import java.beans.PropertyEditor;
+import java.awt.*;
+import java.beans.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;

src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java

@@ -9,31 +9,14 @@ import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingConstants;
 
 
 /**

src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java

@@ -8,17 +8,8 @@ import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -27,16 +18,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
 
 
 /**

src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java

@@ -2,12 +2,15 @@ package eva2.gui.editor;
 
 import eva2.gui.PropertyWeightedLPTchebycheff;
 
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/editor/MultiLineStringEditor.java

@@ -3,8 +3,11 @@ package eva2.gui.editor;
 import eva2.gui.MultiLineString;
 
 import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
+import java.awt.event.TextEvent;
+import java.awt.event.TextListener;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyEditor;
 
 
 /**

src/eva2/gui/editor/StatisticsEditor.java

@@ -13,9 +13,12 @@ package eva2.gui.editor;
 import eva2.gui.PropertySheetPanelStat;
 import eva2.optimization.stat.GenericStatistics;
 
-import java.awt.*;
-import java.beans.*;
 import javax.swing.*;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyEditor;
 
 public class StatisticsEditor implements PropertyEditor {
 

src/eva2/gui/editor/TagEditor.java

@@ -16,13 +16,12 @@ import eva2.tools.BasicResourceLoader;
 import eva2.tools.SelectedTag;
 import eva2.tools.Tag;
 
-import java.awt.BorderLayout;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyEditorManager;
 import java.beans.PropertyEditorSupport;
-import javax.swing.JFrame;
 
 /**
  *

src/eva2/gui/plot/DPointSetMultiIcon.java

@@ -1,20 +1,9 @@
 package eva2.gui.plot;
 
 
-import eva2.tools.chart2d.DArray;
-import eva2.tools.chart2d.DBorder;
-import eva2.tools.chart2d.DComponent;
-import eva2.tools.chart2d.DIntDoubleMap;
-import eva2.tools.chart2d.DMeasures;
-import eva2.tools.chart2d.DPoint;
-import eva2.tools.chart2d.DPointIcon;
-import eva2.tools.chart2d.DPointSet;
-import eva2.tools.chart2d.DRectangle;
+import eva2.tools.chart2d.*;
 
-import java.awt.BasicStroke;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Stroke;
+import java.awt.*;
 import java.util.ArrayList;
 
 

src/eva2/gui/plot/DataViewerInterface.java

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

src/eva2/gui/plot/FunctionArea.java

@@ -1,31 +1,15 @@
 package eva2.gui.plot;
 
-import eva2.gui.*;
+import eva2.gui.Exp;
+import eva2.gui.InterfaceSelectablePointIcon;
 import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
 import eva2.tools.ToolBoxGui;
-import eva2.tools.chart2d.Chart2DDPointIconCircle;
-import eva2.tools.chart2d.Chart2DDPointIconContent;
-import eva2.tools.chart2d.Chart2DDPointIconCross;
-import eva2.tools.chart2d.Chart2DDPointIconPoint;
-import eva2.tools.chart2d.Chart2DDPointIconText;
-import eva2.tools.chart2d.DArea;
-import eva2.tools.chart2d.DBorder;
-import eva2.tools.chart2d.DFunction;
-import eva2.tools.chart2d.DPoint;
-import eva2.tools.chart2d.DPointIcon;
-import eva2.tools.chart2d.DPointSet;
-import eva2.tools.chart2d.ScaledBorder;
+import eva2.tools.chart2d.*;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
@@ -35,9 +19,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JFileChooser;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
 
 /**
  *

src/eva2/gui/plot/GraphPointSet.java

@@ -14,15 +14,10 @@ package eva2.gui.plot;
  * IMPORTS
  *==========================================================================*/
 
-import eva2.tools.chart2d.DArea;
-import eva2.tools.chart2d.DMeasures;
-import eva2.tools.chart2d.DPoint;
-import eva2.tools.chart2d.DPointIcon;
-import eva2.tools.chart2d.DPointSet;
+import eva2.tools.chart2d.*;
 import eva2.tools.math.Mathematics;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
+import java.awt.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 

src/eva2/gui/plot/GraphPointSetLegend.java

@@ -4,20 +4,11 @@ import eva2.tools.Pair;
 import eva2.tools.StringTools;
 import eva2.tools.chart2d.SlimRect;
 
-import java.awt.Color;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.*;
 import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import javax.swing.BoxLayout;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 
 /**
  * A class representing the legend of a plot. It is created from a list of

src/eva2/gui/plot/Plot.java

@@ -7,25 +7,17 @@ import eva2.optimization.population.Population;
 import eva2.tools.BasicResourceLoader;
 import eva2.tools.chart2d.DPointSet;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Formatter;
-import java.util.Locale;
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.Formatter;
+import java.util.Locale;
 
 /**
  * ToDo: Rename to PlotWindow

src/eva2/gui/plot/TopoPlot.java

@@ -1,17 +1,4 @@
 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: 306 $
- *            $Date: 2007-12-04 14:22:52 +0100 (Tue, 04 Dec 2007) $
- *            $Author: mkron $
- */
-/*==========================================================================*
- * IMPORTS
- *==========================================================================*/
 
 import eva2.optimization.problems.Interface2DBorderProblem;
 import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem;
@@ -19,13 +6,8 @@ import eva2.tools.chart2d.DRectangle;
 import eva2.tools.diagram.ColorBarCalculator;
 import eva2.tools.math.Mathematics;
 
-import java.awt.Color;
-import javax.swing.JPanel;
-
-
-/*==========================================================================*
- * CLASS DECLARATION
- *==========================================================================*/
+import javax.swing.*;
+import java.awt.*;
 
 /**
  *

src/eva2/gui/utils/CustomTabbedPaneUI.java

@@ -4,13 +4,13 @@
  */
 package eva2.gui.utils;
 
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicTabbedPaneUI;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import javax.swing.*;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.BasicTabbedPaneUI;
 
 public class CustomTabbedPaneUI extends BasicTabbedPaneUI {
 

src/eva2/gui/utils/VerticalButtonUI.java

@@ -1,11 +1,9 @@
 package eva2.gui.utils;
 
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
 import java.awt.*;
 import java.awt.geom.AffineTransform;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.plaf.basic.BasicButtonUI;
 
 public class VerticalButtonUI extends BasicButtonUI {
 

src/eva2/optimization/go/GOStandaloneVersion.java

@@ -21,8 +21,8 @@ import eva2.optimization.strategies.GeneticAlgorithm;
 import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.tools.math.RNG;
 
-import java.awt.BorderLayout;
-import java.awt.List;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
@@ -32,7 +32,6 @@ import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import javax.swing.*;
 
 @eva2.util.annotation.Description(text = "This is a simple example framework for Evolutionary Algorithms.")
 public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopulationChangedEventListener, java.io.Serializable {

src/eva2/optimization/go/MOCCOStandalone.java

@@ -1,42 +1,23 @@
 package eva2.optimization.go;
 
-import eva2.optimization.mocco.MOCCOState;
-import eva2.optimization.mocco.MOCCOParameterizeGDF;
-import eva2.optimization.mocco.MOCCOParameterizeTchebycheff;
-import eva2.optimization.mocco.MOCCOParameterizeRefPoint;
-import eva2.optimization.mocco.MOCCOChooseReferenceSolution;
-import eva2.optimization.mocco.MOCCOChooseReferencePoint;
-import eva2.optimization.mocco.MOCCOParameterizeSTEP;
-import eva2.optimization.mocco.MOCCOProblemInitialization;
-import eva2.optimization.mocco.MOCCOProblemRedefinition;
-import eva2.optimization.mocco.MOCCOParameterizeMO;
-import eva2.optimization.mocco.MOCCOChooseMOStrategy;
-import eva2.optimization.mocco.MOCCOInitialPopulationSize;
-import eva2.optimization.mocco.MOCCOParameterizeSO;
-import eva2.optimization.mocco.InterfaceProcessElement;
-import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
-import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem;
-import eva2.optimization.problems.InterfaceOptimizationProblem;
-import eva2.optimization.problems.TF1Problem;
-import eva2.optimization.problems.InterfaceOptimizationObjective;
 import eva2.gui.JParaPanel;
 import eva2.gui.PropertyDoubleArray;
 import eva2.optimization.individuals.AbstractEAIndividual;
+import eva2.optimization.mocco.*;
 import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer;
 import eva2.optimization.operator.moso.InterfaceMOSOConverter;
 import eva2.optimization.operator.moso.MOSOWeightedFitness;
 import eva2.optimization.operator.terminators.EvaluationTerminator;
 import eva2.optimization.population.Population;
+import eva2.optimization.problems.*;
 import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.optimization.strategies.IslandModelEA;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.GridLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.*;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/go/SwingWorker.java

@@ -1,6 +1,6 @@
 package eva2.optimization.go;
 
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 
 /**
  * This is the 3rd version of SwingWorker (also known as

src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java

@@ -4,10 +4,10 @@ package eva2.optimization.mocco;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.tools.BasicResourceLoader;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 
 /**

src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java

@@ -6,10 +6,10 @@ import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener;
 import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.optimization.problems.InterfaceOptimizationObjective;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java

@@ -8,10 +8,10 @@ import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.optimization.problems.InterfaceOptimizationObjective;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java

@@ -2,15 +2,10 @@ package eva2.optimization.mocco;
 
 import eva2.optimization.go.MOCCOStandalone;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeGDF.java

@@ -1,9 +1,9 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyDoubleArray;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.individuals.AbstractEAIndividual;
@@ -16,11 +16,11 @@ import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeMO.java

@@ -1,8 +1,8 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.population.Population;
@@ -12,10 +12,10 @@ import eva2.optimization.strategies.MultiObjectiveEA;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java

@@ -1,8 +1,8 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.operator.migration.SOBestMigration;
@@ -13,15 +13,10 @@ import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 import eva2.tools.math.RNG;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeSO.java

@@ -1,8 +1,8 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.strategies.GeneticAlgorithm;
@@ -11,15 +11,10 @@ import eva2.optimization.strategies.MultiObjectiveEA;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java

@@ -1,9 +1,9 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyDoubleArray;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.individuals.AbstractEAIndividual;
@@ -16,18 +16,11 @@ import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java

@@ -1,8 +1,8 @@
 package eva2.optimization.mocco;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.operator.migration.SOBestMigration;
@@ -13,17 +13,10 @@ import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 import eva2.tools.math.RNG;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOPhase.java

@@ -2,14 +2,10 @@ package eva2.optimization.mocco;
 
 import eva2.optimization.go.MOCCOStandalone;
 
-import java.awt.BorderLayout;
-import java.awt.Font;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOProblemInitialization.java

@@ -5,12 +5,10 @@ import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.problems.InterfaceOptimizationProblem;
 import eva2.tools.ReflectPackage;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOProblemRedefinition.java

@@ -5,10 +5,10 @@ import eva2.gui.JParaPanel;
 import eva2.optimization.go.MOCCOStandalone;
 import eva2.optimization.problems.InterfaceOptimizationProblem;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/mocco/MOCCOState.java

@@ -12,7 +12,7 @@ import eva2.optimization.problems.InterfaceOptimizationProblem;
 import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.optimization.strategies.MultiObjectiveEA;
 
-import java.awt.Color;
+import java.awt.*;
 import java.util.ArrayList;
 
 /**

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

@@ -14,6 +14,7 @@ import eva2.tools.chart2d.DPoint;
 import eva2.tools.chart2d.DPointIcon;
 import eva2.tools.chart2d.ScaledBorder;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -23,7 +24,6 @@ import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.swing.*;
 
 
 /**

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

@@ -8,18 +8,13 @@ import eva2.optimization.individuals.AbstractEAIndividual;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.optimization.problems.InterfaceOptimizationObjective;
-import eva2.tools.chart2d.Chart2DDPointContentSelectable;
-import eva2.tools.chart2d.Chart2DDPointIconCross;
-import eva2.tools.chart2d.Chart2DDPointIconPoint;
-import eva2.tools.chart2d.DPoint;
-import eva2.tools.chart2d.DPointIcon;
-import eva2.tools.chart2d.ScaledBorder;
+import eva2.tools.chart2d.*;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import javax.swing.*;
 
 
 /**

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

@@ -13,10 +13,10 @@ import eva2.tools.chart2d.DPoint;
 import eva2.tools.chart2d.DPointIcon;
 import eva2.tools.chart2d.ScaledBorder;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/modules/AbstractModuleAdapter.java

@@ -10,9 +10,9 @@ package eva2.optimization.modules;
  *            $Author: mkron $
  */
 
+import eva2.optimization.OptimizationStateListener;
 import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.go.InterfaceProcessor;
-import eva2.optimization.OptimizationStateListener;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/eva2/optimization/modules/AbstractOptimizationParameters.java

@@ -1,8 +1,8 @@
 package eva2.optimization.modules;
 
 import eva2.gui.BeanInspector;
-import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.go.InterfaceNotifyOnInformers;
+import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.go.InterfacePopulationChangedEventListener;
 import eva2.optimization.go.InterfaceTerminator;
 import eva2.optimization.operator.postprocess.InterfacePostProcessParams;

src/eva2/optimization/modules/DEParameters.java

@@ -1,8 +1,8 @@
 package eva2.optimization.modules;
 
 
-import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.enums.DETypeEnum;
+import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.operator.terminators.EvaluationTerminator;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.F1Problem;

src/eva2/optimization/modules/GenericModuleAdapter.java

@@ -3,11 +3,10 @@ package eva2.optimization.modules;
 
 import eva2.gui.EvAModuleButtonPanelMaker;
 import eva2.gui.EvATabbedFrameMaker;
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.JParaPanel;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.stat.*;
-import eva2.optimization.stat.OptimizationJob;
 
 import java.io.Serializable;
 

src/eva2/optimization/modules/OptimizationParameters.java

@@ -18,7 +18,7 @@ import java.util.logging.Level;
 /**
  * OptimizationParamers for configuration of an
  * optimization run.
- *
+ * <p/>
  * This class is used to generate the default GUI
  * configuration panel for optimizations.
  */

src/eva2/optimization/modules/PSOParameters.java

@@ -2,8 +2,8 @@ package eva2.optimization.modules;
 
 
 import eva2.gui.editor.GenericObjectEditor;
-import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.enums.PSOTopologyEnum;
+import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.operator.terminators.EvaluationTerminator;
 import eva2.optimization.population.Population;
 import eva2.optimization.problems.F1Problem;

src/eva2/optimization/modules/Processor.java

@@ -1,9 +1,8 @@
 package eva2.optimization.modules;
 
-import eva2.optimization.go.*;
-import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.gui.BeanInspector;
 import eva2.optimization.OptimizationStateListener;
+import eva2.optimization.go.*;
 import eva2.optimization.operator.paramcontrol.ConstantParameters;
 import eva2.optimization.operator.paramcontrol.InterfaceParameterControl;
 import eva2.optimization.operator.postprocess.PostProcess;
@@ -15,20 +14,20 @@ import eva2.optimization.population.Population;
 import eva2.optimization.population.PopulationInterface;
 import eva2.optimization.problems.AbstractOptimizationProblem;
 import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
-import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.optimization.stat.InterfaceStatistics;
 import eva2.optimization.stat.InterfaceTextListener;
 import eva2.optimization.stat.StatisticsWithGUI;
+import eva2.optimization.strategies.InterfaceOptimizer;
 import eva2.tools.EVAERROR;
 import eva2.tools.EVAHELP;
 import eva2.tools.StringTools;
 import eva2.tools.math.RNG;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.JOptionPane;
 
 /**
  * The Processor may run as a thread permanently (GenericModuleAdapter) and is
@@ -258,7 +257,8 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo
                 if (popLog != null) {
                     EVAHELP.logString(this.optimizationParameters.getOptimizer().getPopulation().getIndyList(), popLog);
                 }
-            } while (isOptimizationRunning() && !this.optimizationParameters.getTerminator().isTerminated(this.optimizationParameters.getOptimizer().getAllSolutions()));
+            }
+            while (isOptimizationRunning() && !this.optimizationParameters.getTerminator().isTerminated(this.optimizationParameters.getOptimizer().getAllSolutions()));
 
             runCounter++;
             maybeFinishParamCtrl(optimizationParameters);

src/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java

@@ -3,10 +3,10 @@ package eva2.optimization.operator.classification;
 import eva2.tools.chart2d.*;
 import eva2.tools.math.RNG;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import javax.swing.*;
 
 /**
  * Self-organizing maps, a simple, but easy to visualize method

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

@@ -1,12 +1,8 @@
 package eva2.optimization.operator.constraint;
 
-import eva2.optimization.operator.paramcontrol.InterfaceParameterControl;
-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.editor.GenericObjectEditor;
 import eva2.optimization.individuals.AbstractEAIndividual;
+import eva2.optimization.operator.paramcontrol.*;
 import eva2.optimization.problems.AbstractProblemDouble;
 import eva2.tools.EVAERROR;
 

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

@@ -1,24 +1,15 @@
 package eva2.optimization.operator.crossover;
 
 
-import eva2.gui.editor.GenericObjectEditor;
 import eva2.gui.PropertyEditorProvider;
+import eva2.gui.editor.GenericObjectEditor;
 import eva2.optimization.tools.AbstractObjectEditor;
 import eva2.optimization.tools.GeneralGEOFaker;
 import eva2.optimization.tools.GeneralOptimizationEditorProperty;
 import eva2.tools.BasicResourceLoader;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -27,16 +18,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
 
 
 /**

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

@@ -10,12 +10,12 @@ import eva2.optimization.population.Population;
 import eva2.optimization.problems.F1Problem;
 import eva2.optimization.problems.InterfaceOptimizationProblem;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import javax.swing.*;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/optimization/operator/distancemetric/PhenotypeMetric.java

@@ -2,12 +2,7 @@ package eva2.optimization.operator.distancemetric;
 
 
 import eva2.gui.BeanInspector;
-import eva2.optimization.individuals.AbstractEAIndividual;
-import eva2.optimization.individuals.InterfaceDataTypeBinary;
-import eva2.optimization.individuals.InterfaceDataTypeDouble;
-import eva2.optimization.individuals.InterfaceDataTypeInteger;
-import eva2.optimization.individuals.InterfaceDataTypePermutation;
-import eva2.optimization.individuals.InterfaceDataTypeProgram;
+import eva2.optimization.individuals.*;
 
 import java.util.BitSet;
 

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

@@ -17,7 +17,8 @@ import eva2.tools.chart2d.Chart2DDPointIconCircle;
 import eva2.tools.chart2d.Chart2DDPointIconText;
 import eva2.tools.chart2d.DPoint;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.IOException;
 
 /**
  * This method implements the clustering based subdivision