From cdc84255737ddd9dc4c35f39328d9de3806a6fc9 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 31 Aug 2012 09:22:53 +0000 Subject: [PATCH] refs #10 Changed from old EvAInfo.default logger to proper Logger instances. --- src/eva2/EvAInfo.java | 2 - src/eva2/client/EvAClient.java | 5 +- src/eva2/gui/EvAModuleButtonPanelMaker.java | 2 +- src/eva2/gui/EvATabbedFrameMaker.java | 2 +- src/eva2/gui/ExtDesktopManager.java | 2 +- src/eva2/gui/GenericArrayEditor.java | 4 +- src/eva2/gui/GenericObjectEditor.java | 2 +- src/eva2/gui/PropertySheetPanel.java | 2 +- src/eva2/server/EvAServer.java | 2 +- src/eva2/server/ModuleServer.java | 2 +- .../go/operators/mutation/NoMutation.java | 68 ++++++++++++------- .../server/go/populations/Population.java | 2 +- .../server/modules/AbstractGOParameters.java | 2 +- src/eva2/server/modules/EPParameters.java | 2 +- src/eva2/server/modules/GAParameters.java | 2 +- src/eva2/tools/BasicResourceLoader.java | 15 ++-- src/eva2/tools/EVAERROR.java | 2 +- src/eva2/tools/Serializer.java | 2 +- src/eva2/tools/jproxy/ComAdapter.java | 5 +- src/eva2/tools/jproxy/MainAdapterImpl.java | 2 +- src/eva2/tools/jproxy/RMIServer.java | 2 +- 21 files changed, 68 insertions(+), 61 deletions(-) diff --git a/src/eva2/EvAInfo.java b/src/eva2/EvAInfo.java index abd1f91d..f7b02831 100644 --- a/src/eva2/EvAInfo.java +++ b/src/eva2/EvAInfo.java @@ -44,8 +44,6 @@ public class EvAInfo { public static final String infoTitle = productName+" Information"; public static final String copyrightYear = "2010-2012"; - - public static final String defaultLogger = "eva2"; ////////////// Property handling... diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index 62c25713..f0ea939f 100644 --- a/src/eva2/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -29,7 +29,6 @@ import eva2.tools.StringTools; import eva2.tools.jproxy.RemoteStateListener; import java.awt.*; import java.awt.event.*; -import java.io.Serializable; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -38,8 +37,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.help.*; import javax.swing.*; -import javax.swing.border.TitledBorder; -import javax.swing.plaf.SeparatorUI; /** @@ -75,7 +72,7 @@ public class EvAClient extends JFrame implements RemoteStateListener { // LogPanel private LoggingPanel logPanel; - private static final Logger LOGGER = Logger.getLogger(EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(EvAClient.class.getName()); // Module: private ExtAction actModuleLoad; diff --git a/src/eva2/gui/EvAModuleButtonPanelMaker.java b/src/eva2/gui/EvAModuleButtonPanelMaker.java index 66678bf7..9a34ce3e 100644 --- a/src/eva2/gui/EvAModuleButtonPanelMaker.java +++ b/src/eva2/gui/EvAModuleButtonPanelMaker.java @@ -31,7 +31,7 @@ import javax.swing.JToolBar; */ public class EvAModuleButtonPanelMaker implements RemoteStateListener, Serializable, PanelMaker { - private static final Logger LOGGER = Logger.getLogger(EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(EvAModuleButtonPanelMaker.class.getName()); private String m_Name = "undefined"; private ModuleAdapter moduleAdapter; private boolean runningState; diff --git a/src/eva2/gui/EvATabbedFrameMaker.java b/src/eva2/gui/EvATabbedFrameMaker.java index 084e8bf6..3a8299e1 100644 --- a/src/eva2/gui/EvATabbedFrameMaker.java +++ b/src/eva2/gui/EvATabbedFrameMaker.java @@ -22,7 +22,7 @@ import javax.swing.plaf.basic.BasicButtonUI; */ public class EvATabbedFrameMaker implements Serializable, PanelMaker, InterfaceNotifyOnInformers { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(EvATabbedFrameMaker.class.getName()); private static final long serialVersionUID = 2637376545826821423L; private ArrayList pmContainer = null; private JExtToolBar extToolBar; diff --git a/src/eva2/gui/ExtDesktopManager.java b/src/eva2/gui/ExtDesktopManager.java index 67b57b12..34ad1f4f 100644 --- a/src/eva2/gui/ExtDesktopManager.java +++ b/src/eva2/gui/ExtDesktopManager.java @@ -23,7 +23,7 @@ import javax.swing.KeyStroke; */ public class ExtDesktopManager extends DefaultDesktopManager { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(ExtDesktopManager.class.getName()); int WINDOW_LIST_START; public final static String INDEX = "Index"; diff --git a/src/eva2/gui/GenericArrayEditor.java b/src/eva2/gui/GenericArrayEditor.java index efa0c727..5520c0e1 100644 --- a/src/eva2/gui/GenericArrayEditor.java +++ b/src/eva2/gui/GenericArrayEditor.java @@ -19,7 +19,7 @@ import javax.swing.event.ListSelectionListener; public class GenericArrayEditor extends JPanel implements PropertyEditor { - private final static Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private final static Logger LOGGER = Logger.getLogger(GenericArrayEditor.class.getName()); /** * Handles property change notification */ @@ -283,7 +283,7 @@ public class GenericArrayEditor extends JPanel implements PropertyEditor { final PropertyEditor e = (PropertyEditor) editorClass.newInstance(); if (e instanceof GenericObjectEditor) { ((GenericObjectEditor) e).setClassType(valueClass); - } + } e.setValue(value); JPanel cellPanel = new JPanel() { diff --git a/src/eva2/gui/GenericObjectEditor.java b/src/eva2/gui/GenericObjectEditor.java index c741b982..c0b8e317 100644 --- a/src/eva2/gui/GenericObjectEditor.java +++ b/src/eva2/gui/GenericObjectEditor.java @@ -32,7 +32,7 @@ import eva2.tools.jproxy.RMIProxyLocal; public class GenericObjectEditor implements PropertyEditor { - private static final Logger logger = Logger.getLogger(EvAInfo.defaultLogger); + private static final Logger logger = Logger.getLogger(GenericObjectEditor.class.getName()); private Object m_Object; private Object m_Backup; private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); diff --git a/src/eva2/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java index 3557e40e..d36d813f 100644 --- a/src/eva2/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -30,7 +30,7 @@ import javax.swing.table.TableModel; */ public class PropertySheetPanel extends JPanel implements PropertyChangeListener { - public final static Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + public final static Logger LOGGER = Logger.getLogger(PropertySheetPanel.class.getName()); /** * The target object being edited. */ diff --git a/src/eva2/server/EvAServer.java b/src/eva2/server/EvAServer.java index 7e903e1e..32cff982 100644 --- a/src/eva2/server/EvAServer.java +++ b/src/eva2/server/EvAServer.java @@ -25,7 +25,7 @@ public class EvAServer { //private EvAComAdapter m_ComAdapter; private static String userName; private RMIServerEvA rmiServer; - private static final Logger LOGGER = Logger.getLogger(EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(EvAServer.class.getName()); /** * Constructor of EvAServer. Calls RMIConnection(). diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/server/ModuleServer.java index c00bbdec..b6352027 100644 --- a/src/eva2/server/ModuleServer.java +++ b/src/eva2/server/ModuleServer.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; * Collect available ModuleAdapter implementations and load them on request. */ public class ModuleServer { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(ModuleServer.class.getName()); private static int instanceCounter = 0; private List> moduleClassList; private ModuleAdapter moduleAdapter; diff --git a/src/eva2/server/go/operators/mutation/NoMutation.java b/src/eva2/server/go/operators/mutation/NoMutation.java index c785f3e5..8b3ecc7b 100644 --- a/src/eva2/server/go/operators/mutation/NoMutation.java +++ b/src/eva2/server/go/operators/mutation/NoMutation.java @@ -14,65 +14,87 @@ import eva2.server.go.problems.InterfaceOptimizationProblem; */ public class NoMutation implements InterfaceMutation, java.io.Serializable { - /** This method will enable you to clone a given mutation operator + /** + * This method will enable you to clone a given mutation operator + * * @return The clone */ + @Override public Object clone() { return new NoMutation(); } - /** This method allows you to evaluate wether two mutation operators - * are actually the same. - * @param mutator The other mutation operator + /** + * This method allows you to evaluate wether two mutation operators are + * actually the same. + * + * @param mutator The other mutation operator */ + @Override public boolean equals(Object mutator) { - if (mutator instanceof NoMutation) return true; - else return false; + if (mutator instanceof NoMutation) { + return true; + } else { + return false; + } } - /** This method allows you to init the mutation operator - * @param individual The individual that will be mutated. - * @param opt The optimization problem. + /** + * This method allows you to init the mutation operator + * + * @param individual The individual that will be mutated. + * @param opt The optimization problem. */ + @Override public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { - } - /** This method will mutate a given AbstractEAIndividual. If the individual + /** + * This method will mutate a given AbstractEAIndividual. If the individual * doesn't implement InterfaceGAIndividual nothing happens. - * @param individual The individual that is to be mutated + * + * @param individual The individual that is to be mutated */ + @Override public void mutate(AbstractEAIndividual individual) { } - /** This method allows you to perform either crossover on the strategy parameters - * or to deal in some other way with the crossover event. - * @param indy1 The original mother - * @param partners The original partners + /** + * This method allows you to perform either crossover on the strategy + * parameters or to deal in some other way with the crossover event. + * + * @param indy1 The original mother + * @param partners The original partners */ + @Override public void crossoverOnStrategyParameters(AbstractEAIndividual indy1, Population partners) { // nothing to do here } - /** This method allows you to get a string representation of the mutation + /** + * This method allows you to get a string representation of the mutation * operator + * * @return A descriptive string. */ + @Override public String getStringRepresentation() { return "No mutation"; } -/********************************************************************************************************************** - * These are for GUI - */ - /** This method allows the CommonJavaObjectEditorPanel to read the - * name to the current object. + /** + * This method allows the CommonJavaObjectEditorPanel to read the name to + * the current object. + * * @return The name. */ public String getName() { return "No mutation"; } - /** This method returns a global info string + + /** + * This method returns a global info string + * * @return description */ public static String globalInfo() { diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java index b4e66253..46ce353d 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -40,7 +40,7 @@ import java.util.logging.Logger; public class Population extends ArrayList implements PopulationInterface, Cloneable, java.io.Serializable { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(Population.class.getName()); protected int generationCount = 0; protected int functionCallCount = 0; protected int targetPopSize = 50; diff --git a/src/eva2/server/modules/AbstractGOParameters.java b/src/eva2/server/modules/AbstractGOParameters.java index 46d28c41..f6d40458 100644 --- a/src/eva2/server/modules/AbstractGOParameters.java +++ b/src/eva2/server/modules/AbstractGOParameters.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; public abstract class AbstractGOParameters implements InterfaceGOParameters, Serializable { - protected static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + protected static final Logger LOGGER = Logger.getLogger(AbstractGOParameters.class.getName()); protected long randomSeed = (long)0.0; // Opt. Algorithms and Parameters diff --git a/src/eva2/server/modules/EPParameters.java b/src/eva2/server/modules/EPParameters.java index c613e23c..9ee64f2f 100644 --- a/src/eva2/server/modules/EPParameters.java +++ b/src/eva2/server/modules/EPParameters.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; */ public class EPParameters extends AbstractGOParameters implements InterfaceGOParameters, Serializable { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(EPParameters.class.getName()); /** diff --git a/src/eva2/server/modules/GAParameters.java b/src/eva2/server/modules/GAParameters.java index bab365b7..aff11a44 100644 --- a/src/eva2/server/modules/GAParameters.java +++ b/src/eva2/server/modules/GAParameters.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public class GAParameters extends AbstractGOParameters implements InterfaceGOParameters, Serializable { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(GAParameters.class.getName()); /** * Load or create a new instance of the class. diff --git a/src/eva2/tools/BasicResourceLoader.java b/src/eva2/tools/BasicResourceLoader.java index 8b38768a..8a9a2fcd 100644 --- a/src/eva2/tools/BasicResourceLoader.java +++ b/src/eva2/tools/BasicResourceLoader.java @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// package eva2.tools; +import eva2.EvAInfo; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; @@ -39,14 +40,12 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; -import eva2.EvAInfo; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Loads resource file from directory OR jar file. Now it is easier possible to @@ -61,16 +60,12 @@ import java.util.logging.Logger; */ public class BasicResourceLoader implements ResourceLoader { - //~ Static fields/initializers ///////////////////////////////////////////// - /** * Obtain a suitable logger. */ - private static Logger logger = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static Logger logger = Logger.getLogger(BasicResourceLoader.class.getName()); private static BasicResourceLoader resourceLoader; - //~ Constructors /////////////////////////////////////////////////////////// - /** * Constructor for the ResourceLoader object */ @@ -78,8 +73,6 @@ public class BasicResourceLoader implements ResourceLoader { } - //~ Methods //////////////////////////////////////////////////////////////// - /** * Description of the Method * diff --git a/src/eva2/tools/EVAERROR.java b/src/eva2/tools/EVAERROR.java index 4c88ae25..aff84183 100644 --- a/src/eva2/tools/EVAERROR.java +++ b/src/eva2/tools/EVAERROR.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; * */ public class EVAERROR { - private static final Logger logger = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger logger = Logger.getLogger(EVAERROR.class.getName()); private static transient HashMap errorMap = null; /** * diff --git a/src/eva2/tools/Serializer.java b/src/eva2/tools/Serializer.java index 351a0a7f..34314f37 100644 --- a/src/eva2/tools/Serializer.java +++ b/src/eva2/tools/Serializer.java @@ -15,7 +15,7 @@ public class Serializer { /** * The logging instance for this class. */ - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(Serializer.class.getName()); /** * Private constructor to prevent instantiating module class. diff --git a/src/eva2/tools/jproxy/ComAdapter.java b/src/eva2/tools/jproxy/ComAdapter.java index 9f4a6ca6..fe05e1f3 100644 --- a/src/eva2/tools/jproxy/ComAdapter.java +++ b/src/eva2/tools/jproxy/ComAdapter.java @@ -9,9 +9,6 @@ package eva2.tools.jproxy; * $Date: 2004/04/28 07:50:32 $ * $Author: ulmerh $ */ -/*==========================================================================* - * IMPORTS - *==========================================================================*/ import java.net.MalformedURLException; import java.rmi.Naming; import java.rmi.NotBoundException; @@ -29,7 +26,7 @@ import java.util.logging.Logger; * */ public class ComAdapter { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(ComAdapter.class.getName()); public static final int PORT = 1099; public static final String SEP = "_"; static protected ComAdapter m_instance = null; diff --git a/src/eva2/tools/jproxy/MainAdapterImpl.java b/src/eva2/tools/jproxy/MainAdapterImpl.java index 87c62e64..c0f5f0d5 100644 --- a/src/eva2/tools/jproxy/MainAdapterImpl.java +++ b/src/eva2/tools/jproxy/MainAdapterImpl.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; */ public class MainAdapterImpl implements MainAdapter { - private static final Logger LOGGER = Logger.getLogger(eva2.EvAInfo.defaultLogger); + private static final Logger LOGGER = Logger.getLogger(MainAdapterImpl.class.getName()); public static final String MAIN_ADAPTER_NAME = "MainRemoteObjectName"; public static final int PORT = 1099; private String m_Buf = ""; diff --git a/src/eva2/tools/jproxy/RMIServer.java b/src/eva2/tools/jproxy/RMIServer.java index 17d9ed32..d62d1738 100644 --- a/src/eva2/tools/jproxy/RMIServer.java +++ b/src/eva2/tools/jproxy/RMIServer.java @@ -47,7 +47,7 @@ public class RMIServer { protected static String userName; protected static int numberOfVM = 0; private Registry myRegistry = null; - protected static final Logger LOGGER = Logger.getLogger(EvAInfo.defaultLogger); + protected static final Logger LOGGER = Logger.getLogger(RMIServer.class.getName()); /** *