Several fixes, cleanup.

src/eva2/EvAInfo.java

@@ -55,7 +55,7 @@ public class EvAInfo {
             System.err.println(ex.getMessage());
             System.exit(1);
         }
-        InputStream istr = BasicResourceLoader.instance().getStreamFromResourceLocation(EvAInfo.iconLocation);
+        InputStream istr = BasicResourceLoader.getInstance().getStreamFromResourceLocation(EvAInfo.iconLocation);
         if (istr == null) {
             throw new RuntimeException(resourceNotFoundErrorMessage(EvAInfo.iconLocation) + " (EvAInfo.static)");
         }

src/eva2/gui/AboutDialog.java

@@ -35,7 +35,7 @@ class AboutDialog extends JDialog {
         setResizable(false);
         
         /* Load EvA2 Image */
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes = loader.getBytesFromResourceLocation(eva2.EvAInfo.splashLocation, true);
         ImageIcon imageIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(bytes));
         

src/eva2/gui/HtmlDemo.java

@@ -77,7 +77,7 @@ public class HtmlDemo {
             return;
         }
         JFrame frame = new JFrame(name);
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
         frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
         JScrollPane scroller = new JScrollPane();

src/eva2/gui/Main.java

@@ -390,7 +390,7 @@ public class Main extends JFrame implements OptimizationStateListener {
             desktopConst.weighty = 1.0;
             desktopPanel.add(desktopPane, desktopConst);
 
-            BasicResourceLoader loader = BasicResourceLoader.instance();
+            BasicResourceLoader loader = BasicResourceLoader.getInstance();
             byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
             // TODO: use setIconImages (for better support of multiple icons when changing programs etc.)
             setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));

src/eva2/gui/OptimizationEditorPanel.java

@@ -234,7 +234,7 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
     private JButton makeIconButton(final String iconSrc, final String title) {
         JButton newButton;
         byte[] bytes;
-        bytes = BasicResourceLoader.instance().getBytesFromResourceLocation(iconSrc, false);
+        bytes = BasicResourceLoader.getInstance().getBytesFromResourceLocation(iconSrc, false);
         if (bytes == null) {
             newButton = new JButton(title);
         } else {

src/eva2/gui/PropertyDialog.java

@@ -23,7 +23,7 @@ public class PropertyDialog extends JDialog {
     public PropertyDialog(Window parent, PropertyEditor editor, String title) {
         super(parent, title, ModalityType.APPLICATION_MODAL);
         setTitle(getFrameNameFromEditor(editor));
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
         setLayout(new BorderLayout());

src/eva2/gui/SplashScreen.java

@@ -14,7 +14,7 @@ class SplashScreen extends JWindow {
 
     public SplashScreen(String imgLoc) {
         imgLocation = imgLoc;
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes = loader.getBytesFromResourceLocation(imgLocation, true);
         ImageIcon ii = new ImageIcon(Toolkit.getDefaultToolkit().createImage(bytes));
         JLabel splashLabel = new JLabel(ii);

src/eva2/gui/editor/OptimizationObjectivesEditor.java

@@ -130,7 +130,7 @@ public class OptimizationObjectivesEditor extends JPanel implements PropertyEdit
      * This method updates the server list
      */
     private void updateTargetList() {
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes;
         InterfaceOptimizationObjective[] list = this.optimizationObjectives.getSelectedTargets();
 

src/eva2/gui/editor/OptimizationObjectivesWithParamEditor.java

@@ -140,7 +140,7 @@ public class OptimizationObjectivesWithParamEditor extends JPanel implements Pro
      * This method updates the server list
      */
     private void updateTargetList() {
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes;
         InterfaceOptimizationObjective[] list = this.optimizationObjectivesWithWeights.getSelectedTargets();
         double[] weights = this.optimizationObjectivesWithWeights.getWeights();

src/eva2/gui/editor/TagEditor.java

@@ -114,7 +114,7 @@ public class TagEditor extends PropertyEditorSupport {
             ce.setValue(initial);
             PropertyValueSelector ps = new PropertyValueSelector(ce);
             JFrame f = new JFrame();
-            BasicResourceLoader loader = BasicResourceLoader.instance();
+            BasicResourceLoader loader = BasicResourceLoader.getInstance();
             byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
             f.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
             f.addWindowListener(new WindowAdapter() {

src/eva2/gui/plot/Plot.java

@@ -151,7 +151,7 @@ public class Plot implements PlotInterface, Serializable {
     @Override
     public void init() {
         internalFrame = new JEFrame("Plot: " + plotName);
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
 
         buttonPanel = new JPanel();

src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java

@@ -45,7 +45,7 @@ public class MOCCOChooseMOStrategy extends MOCCOPhase implements InterfaceProces
         JPanel tmpP = new JPanel();
         tmpP.setLayout(new GridBagLayout());
         JButton tmpB;
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes;
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.anchor = GridBagConstraints.WEST;

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

@@ -137,7 +137,7 @@ public class PropertyCrossoverMixerEditor extends JPanel implements PropertyEdit
      * This method updates the server list
      */
     private void updateTargetList() {
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes;
         InterfaceCrossover[] list = this.crossoverMixer.getSelectedCrossers();
         double[] weights = this.crossoverMixer.getWeights();

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

@@ -139,7 +139,7 @@ public class PropertyMutationMixerEditor extends JPanel implements PropertyEdito
      * This method updates the server list
      */
     private void updateTargetList() {
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte[] bytes;
         InterfaceMutation[] list = this.mutatorsWithWeights.getSelectedMutators();
         double[] weights = this.mutatorsWithWeights.getWeights();

src/eva2/optimization/tools/FileTools.java

@@ -24,7 +24,7 @@ public class FileTools {
      */
     static public String[] loadStringsFromFile(String file) {
         String[] result = null;
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
         byte bytes[] = loader.getBytesFromResourceLocation(file, false);
         if (bytes != null) {
             String data = new String(bytes);

src/eva2/tools/BasicResourceLoader.java

@@ -68,7 +68,7 @@ public class BasicResourceLoader implements ResourceLoader {
      *
      * @return Description of the Return Value
      */
-    public static synchronized BasicResourceLoader instance() {
+    public static synchronized BasicResourceLoader getInstance() {
         if (resourceLoader == null) {
             resourceLoader = new BasicResourceLoader();
         }
@@ -113,7 +113,7 @@ public class BasicResourceLoader implements ResourceLoader {
             return null;
         }
 
-        byte[] bytes = BasicResourceLoader.instance()
+        byte[] bytes = BasicResourceLoader.getInstance()
                 .getBytesFromResourceLocation(
                         resourceFile, false);
 
@@ -345,7 +345,7 @@ public class BasicResourceLoader implements ResourceLoader {
         }
 
         if (in == null) {
-            // try to search other classpathes...? not really necessary.
+            // try to search other classpaths...? not really necessary.
 //        	in = getStreamFromClassPath(resourceLocation);
         }
 
@@ -417,8 +417,7 @@ public class BasicResourceLoader implements ResourceLoader {
 
                     // only files with <65536 bytes are allowed
                     if (ze.getSize() > 65536) {
-                        System.out.println(
+                        System.out.println("Resource files should be smaller than 65536 bytes...");
-                                "Resource files should be smaller than 65536 bytes...");
                     }
 
                     size = (int) ze.getSize();
@@ -567,7 +566,7 @@ public class BasicResourceLoader implements ResourceLoader {
      */
     public static Properties readProperties(String resourceName) throws Exception {
         Properties prop = new Properties();
-        BasicResourceLoader loader = BasicResourceLoader.instance();
+        BasicResourceLoader loader = BasicResourceLoader.getInstance();
 
         byte bytes[] = loader.getBytesFromResourceLocation(resourceName, false);
         if (bytes != null) {

src/eva2/tools/ReflectPackage.java

@@ -292,7 +292,7 @@ public class ReflectPackage {
      */
     public static InputStream getResourceStreamFromCP(String res) {
 
-        InputStream in = BasicResourceLoader.instance().getStreamFromResourceLocation(res);
+        InputStream in = BasicResourceLoader.getInstance().getStreamFromResourceLocation(res);
         if (in != null) {
             return in;
         }

src/eva2/tools/ToolBoxGui.java

@@ -58,7 +58,7 @@ public class ToolBoxGui {
     public static JButton createIconifiedButton(final String iconSrc, final String title, final boolean withTitle) {
         JButton newButton;
         byte[] bytes;
-        bytes = BasicResourceLoader.instance().getBytesFromResourceLocation(iconSrc, false);
+        bytes = BasicResourceLoader.getInstance().getBytesFromResourceLocation(iconSrc, false);
         if (bytes == null) {
             newButton = new JButton(title);
         } else if (withTitle) {