From 6239abebe440febd82c5ab16334438de7d3356f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Dr=C3=A4ger?= Date: Thu, 7 Jan 2010 14:04:52 +0000 Subject: [PATCH] Restructured eva2 package. --- src/eva2/client/EvAClient.java | 2 +- src/eva2/gui/DPointSetMultiIcon.java | 2 +- src/eva2/gui/GenericOptimizationObjectivesEditor.java | 2 +- .../gui/GenericOptimizationObjectivesWithParamEditor.java | 2 +- src/eva2/gui/GenericRemoteServersEditor.java | 2 +- src/eva2/gui/HtmlDemo.java | 2 +- src/eva2/gui/JTextoutputFrame.java | 2 +- src/eva2/gui/LogPanel.java | 2 +- src/eva2/gui/Plot.java | 2 +- src/eva2/gui/PropertyDialog.java | 2 +- src/eva2/gui/TagEditor.java | 2 +- src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java | 2 +- .../go/operators/crossover/PropertyCrossoverMixerEditor.java | 2 +- .../go/operators/mutation/PropertyMutationMixerEditor.java | 2 +- .../go/operators/paretofrontmetrics/MetricErrorRatio.java | 2 +- src/eva2/server/go/populations/Population.java | 2 +- src/eva2/server/go/tools/FileTools.java | 2 +- src/eva2/tools/{tool => }/BasicResourceLoader.java | 5 +---- src/eva2/tools/{tool => }/DummyCategory.java | 2 +- src/eva2/tools/EVAHELP.java | 1 - src/eva2/tools/{tool => }/IntegerArrayList.java | 2 +- src/eva2/tools/ReflectPackage.java | 1 - src/eva2/tools/{tool => }/ResourceLoader.java | 2 +- src/eva2/tools/chart2d/DPointSet.java | 2 +- src/eva2/tools/{tool => math}/StatisticUtils.java | 2 +- src/eva2/tools/{tool => }/matlab/JMatLink.c | 0 src/eva2/tools/{tool => }/matlab/JMatLink.h | 0 src/eva2/tools/{tool => }/matlab/JMatLink.java | 2 +- src/eva2/tools/{tool => }/matlab/Makefile | 0 29 files changed, 24 insertions(+), 29 deletions(-) rename src/eva2/tools/{tool => }/BasicResourceLoader.java (99%) rename src/eva2/tools/{tool => }/DummyCategory.java (97%) rename src/eva2/tools/{tool => }/IntegerArrayList.java (96%) rename src/eva2/tools/{tool => }/ResourceLoader.java (98%) rename src/eva2/tools/{tool => math}/StatisticUtils.java (95%) rename src/eva2/tools/{tool => }/matlab/JMatLink.c (100%) rename src/eva2/tools/{tool => }/matlab/JMatLink.h (100%) rename src/eva2/tools/{tool => }/matlab/JMatLink.java (94%) rename src/eva2/tools/{tool => }/matlab/Makefile (100%) diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index 8c920e6d..ed5e96dd 100644 --- a/src/eva2/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -66,13 +66,13 @@ import eva2.server.modules.ModuleAdapter; import eva2.server.stat.AbstractStatistics; import eva2.server.stat.InterfaceStatisticsParameter; import eva2.server.stat.StatsParameter; +import eva2.tools.BasicResourceLoader; import eva2.tools.EVAERROR; import eva2.tools.EVAHELP; import eva2.tools.ReflectPackage; import eva2.tools.Serializer; import eva2.tools.StringTools; import eva2.tools.jproxy.RemoteStateListener; -import eva2.tools.tool.BasicResourceLoader; /** * diff --git a/src/eva2/gui/DPointSetMultiIcon.java b/src/eva2/gui/DPointSetMultiIcon.java index 8b5a8b51..388a9630 100644 --- a/src/eva2/gui/DPointSetMultiIcon.java +++ b/src/eva2/gui/DPointSetMultiIcon.java @@ -6,8 +6,8 @@ import java.awt.*; import java.util.ArrayList; +import eva2.tools.IntegerArrayList; import eva2.tools.chart2d.*; -import eva2.tools.tool.IntegerArrayList; /** diff --git a/src/eva2/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java index 3f6d66e0..468b7863 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesEditor.java @@ -6,7 +6,7 @@ import javax.swing.*; import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.server.go.problems.InterfaceOptimizationTarget; import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.beans.*; import java.awt.*; diff --git a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java index fea8a855..0e5ff6e4 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java @@ -5,7 +5,7 @@ import javax.swing.*; import eva2.server.go.problems.InterfaceOptimizationObjective; import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.beans.*; import java.awt.*; diff --git a/src/eva2/gui/GenericRemoteServersEditor.java b/src/eva2/gui/GenericRemoteServersEditor.java index 0a6fc994..997e3710 100644 --- a/src/eva2/gui/GenericRemoteServersEditor.java +++ b/src/eva2/gui/GenericRemoteServersEditor.java @@ -4,7 +4,7 @@ package eva2.gui; import javax.swing.*; import eva2.server.go.SwingWorker; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; diff --git a/src/eva2/gui/HtmlDemo.java b/src/eva2/gui/HtmlDemo.java index f78d2f8b..8dcd996d 100644 --- a/src/eva2/gui/HtmlDemo.java +++ b/src/eva2/gui/HtmlDemo.java @@ -30,7 +30,7 @@ import javax.swing.text.html.HTMLFrameHyperlinkEvent; import eva2.EvAInfo; import eva2.client.EvAClient; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; /** * */ diff --git a/src/eva2/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java index bef0addc..1bb6640e 100644 --- a/src/eva2/gui/JTextoutputFrame.java +++ b/src/eva2/gui/JTextoutputFrame.java @@ -38,7 +38,7 @@ import javax.swing.event.ChangeListener; import eva2.EvAInfo; import eva2.server.go.tools.FileTools; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/LogPanel.java b/src/eva2/gui/LogPanel.java index 9a9f1478..b5880b79 100644 --- a/src/eva2/gui/LogPanel.java +++ b/src/eva2/gui/LogPanel.java @@ -30,7 +30,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import eva2.EvAInfo; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/Plot.java b/src/eva2/gui/Plot.java index 3983b940..b72ea3dd 100644 --- a/src/eva2/gui/Plot.java +++ b/src/eva2/gui/Plot.java @@ -45,8 +45,8 @@ import com.sun.image.codec.jpeg.JPEGImageEncoder; import eva2.EvAInfo; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; +import eva2.tools.BasicResourceLoader; import eva2.tools.chart2d.DPointSet; -import eva2.tools.tool.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java index ec465a04..4541c990 100644 --- a/src/eva2/gui/PropertyDialog.java +++ b/src/eva2/gui/PropertyDialog.java @@ -20,8 +20,8 @@ import java.awt.event.WindowEvent; import java.beans.PropertyEditor; import eva2.EvAInfo; +import eva2.tools.BasicResourceLoader; import eva2.tools.EVAHELP; -import eva2.tools.tool.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/TagEditor.java b/src/eva2/gui/TagEditor.java index 35e45a60..bb5dd1cd 100644 --- a/src/eva2/gui/TagEditor.java +++ b/src/eva2/gui/TagEditor.java @@ -23,9 +23,9 @@ import java.beans.PropertyEditorSupport; import javax.swing.JFrame; import eva2.EvAInfo; +import eva2.tools.BasicResourceLoader; import eva2.tools.SelectedTag; import eva2.tools.Tag; -import eva2.tools.tool.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java index b544bbb2..2c6fe668 100644 --- a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java +++ b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java @@ -4,7 +4,7 @@ package eva2.server.go.mocco; import javax.swing.*; import eva2.server.go.MOCCOStandalone; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java index 4601547a..32871874 100644 --- a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java @@ -6,7 +6,7 @@ import javax.swing.*; import eva2.gui.*; import eva2.server.go.tools.GeneralGEOFaker; import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.beans.*; import java.awt.*; diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java index 81ad99f3..e9f18002 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java @@ -5,7 +5,7 @@ import javax.swing.*; import eva2.gui.*; import eva2.server.go.tools.GeneralGEOFaker; import eva2.server.go.tools.GeneralGOEProperty; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; import java.beans.*; import java.awt.*; diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java index bb8ec054..e13f989f 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java @@ -11,7 +11,7 @@ import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.tools.FileTools; -import eva2.tools.tool.ResourceLoader; +import eva2.tools.ResourceLoader; /** The error ratio metric only suited for small discrete diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java index 7eef3a33..47e31e57 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -23,8 +23,8 @@ import eva2.tools.EVAERROR; import eva2.tools.Pair; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; +import eva2.tools.math.StatisticUtils; import eva2.tools.math.Jama.Matrix; -import eva2.tools.tool.StatisticUtils; /** diff --git a/src/eva2/server/go/tools/FileTools.java b/src/eva2/server/go/tools/FileTools.java index 95981666..036c87b1 100644 --- a/src/eva2/server/go/tools/FileTools.java +++ b/src/eva2/server/go/tools/FileTools.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import javax.swing.JFileChooser; import javax.swing.JOptionPane; -import eva2.tools.tool.BasicResourceLoader; +import eva2.tools.BasicResourceLoader; /** diff --git a/src/eva2/tools/tool/BasicResourceLoader.java b/src/eva2/tools/BasicResourceLoader.java similarity index 99% rename from src/eva2/tools/tool/BasicResourceLoader.java rename to src/eva2/tools/BasicResourceLoader.java index 97fbb7d5..df3aad4a 100644 --- a/src/eva2/tools/tool/BasicResourceLoader.java +++ b/src/eva2/tools/BasicResourceLoader.java @@ -24,7 +24,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. /////////////////////////////////////////////////////////////////////////////// -package eva2.tools.tool; +package eva2.tools; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -39,13 +39,10 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Properties; -import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; -import eva2.tools.ReflectPackage; - /** * Loads resource file from directory OR jar file. Now it is easier possible to diff --git a/src/eva2/tools/tool/DummyCategory.java b/src/eva2/tools/DummyCategory.java similarity index 97% rename from src/eva2/tools/tool/DummyCategory.java rename to src/eva2/tools/DummyCategory.java index 16e03ecf..b7f71766 100644 --- a/src/eva2/tools/tool/DummyCategory.java +++ b/src/eva2/tools/DummyCategory.java @@ -1,4 +1,4 @@ -package eva2.tools.tool; +package eva2.tools; /** * Dummy class replacing the log4j Category because log4j couldnt be included in a clean diff --git a/src/eva2/tools/EVAHELP.java b/src/eva2/tools/EVAHELP.java index bfbdc81d..f5fe519c 100644 --- a/src/eva2/tools/EVAHELP.java +++ b/src/eva2/tools/EVAHELP.java @@ -26,7 +26,6 @@ import java.util.Enumeration; import java.util.Properties; import eva2.client.EvAClient; -import eva2.tools.tool.BasicResourceLoader; /** diff --git a/src/eva2/tools/tool/IntegerArrayList.java b/src/eva2/tools/IntegerArrayList.java similarity index 96% rename from src/eva2/tools/tool/IntegerArrayList.java rename to src/eva2/tools/IntegerArrayList.java index 8809c88e..77c59372 100644 --- a/src/eva2/tools/tool/IntegerArrayList.java +++ b/src/eva2/tools/IntegerArrayList.java @@ -11,7 +11,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package eva2.tools.tool; +package eva2.tools; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java index ab792c1e..17c3cfa5 100644 --- a/src/eva2/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -18,7 +18,6 @@ import java.util.jar.JarInputStream; import javax.management.MBeanServer; import javax.management.ObjectName; -import eva2.tools.tool.BasicResourceLoader; /** * Allow for java to list Classes that exist in one package and can be instantiated from diff --git a/src/eva2/tools/tool/ResourceLoader.java b/src/eva2/tools/ResourceLoader.java similarity index 98% rename from src/eva2/tools/tool/ResourceLoader.java rename to src/eva2/tools/ResourceLoader.java index ab8f5289..759002ed 100644 --- a/src/eva2/tools/tool/ResourceLoader.java +++ b/src/eva2/tools/ResourceLoader.java @@ -25,7 +25,7 @@ //MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //GNU General Public License for more details. /////////////////////////////////////////////////////////////////////////////// -package eva2.tools.tool; +package eva2.tools; /** * TODO description. diff --git a/src/eva2/tools/chart2d/DPointSet.java b/src/eva2/tools/chart2d/DPointSet.java index 62c28b1d..87d58b82 100644 --- a/src/eva2/tools/chart2d/DPointSet.java +++ b/src/eva2/tools/chart2d/DPointSet.java @@ -18,7 +18,7 @@ package eva2.tools.chart2d; import java.awt.* ; -import eva2.tools.tool.IntegerArrayList; +import eva2.tools.IntegerArrayList; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/tools/tool/StatisticUtils.java b/src/eva2/tools/math/StatisticUtils.java similarity index 95% rename from src/eva2/tools/tool/StatisticUtils.java rename to src/eva2/tools/math/StatisticUtils.java index 11781905..f985bc38 100644 --- a/src/eva2/tools/tool/StatisticUtils.java +++ b/src/eva2/tools/math/StatisticUtils.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package eva2.tools.tool; +package eva2.tools.math; import java.util.ArrayList; import java.util.Collections; diff --git a/src/eva2/tools/tool/matlab/JMatLink.c b/src/eva2/tools/matlab/JMatLink.c similarity index 100% rename from src/eva2/tools/tool/matlab/JMatLink.c rename to src/eva2/tools/matlab/JMatLink.c diff --git a/src/eva2/tools/tool/matlab/JMatLink.h b/src/eva2/tools/matlab/JMatLink.h similarity index 100% rename from src/eva2/tools/tool/matlab/JMatLink.h rename to src/eva2/tools/matlab/JMatLink.h diff --git a/src/eva2/tools/tool/matlab/JMatLink.java b/src/eva2/tools/matlab/JMatLink.java similarity index 94% rename from src/eva2/tools/tool/matlab/JMatLink.java rename to src/eva2/tools/matlab/JMatLink.java index a69c11e7..98cc07f1 100644 --- a/src/eva2/tools/tool/matlab/JMatLink.java +++ b/src/eva2/tools/matlab/JMatLink.java @@ -118,7 +118,7 @@ -package eva2.tools.tool.matlab; +package eva2.tools.matlab; diff --git a/src/eva2/tools/tool/matlab/Makefile b/src/eva2/tools/matlab/Makefile similarity index 100% rename from src/eva2/tools/tool/matlab/Makefile rename to src/eva2/tools/matlab/Makefile