From e9733307d985e8525824e889918ceef53a28fc60 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Wed, 16 Sep 2009 14:07:58 +0000
Subject: [PATCH] Minor adaptions due to move wsi.ra --> eva2.tools

---
 ant/build.xml                                     | 15 ++++++++++++++-
 src/eva2/gui/DPointSetMultiIcon.java              |  2 +-
 src/eva2/gui/PropertyRemoteServers.java           |  2 +-
 src/eva2/server/go/MOCCOStandalone.java           |  4 ----
 .../go/operators/mutation/MutateESStandard.java   |  2 +-
 src/eva2/server/go/strategies/IslandModelEA.java  |  2 +-
 src/eva2/tools/ReflectPackage.java                |  3 ---
 src/eva2/tools/chart2d/DArray.java                |  2 +-
 src/eva2/tools/chart2d/DBorder.java               |  2 +-
 src/eva2/tools/chart2d/DPointSet.java             |  2 +-
 src/eva2/tools/sort/XYDoubleArray.java            |  2 --
 11 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ant/build.xml b/ant/build.xml
index f710456c..51b61538 100644
--- a/ant/build.xml
+++ b/ant/build.xml
@@ -258,7 +258,20 @@
     <copy todir="${build.directory}/resources">
       <fileset dir="${resources.directory}" includes="**/*" />
    </copy>
-</target>
+
+  	<!-- 
+  	<copy todir="${JE2Probs.directory}/${build.directory}/resources">
+      <fileset dir="${JE2Probs.directory}/${resources.directory}" includes="**/*" />
+   </copy>
+  	
+    <copy todir="${JE2ESModel.directory}/${build.directory}/resources">
+      <fileset dir="${JE2ESModel.directory}/${resources.directory}" includes="**/*" />
+   </copy>
+    <copy todir="${JE2Research.directory}/${build.directory}/resources">
+      <fileset dir="${JE2Research.directory}/${resources.directory}" includes="**/*" />
+   </copy>  
+   -->
+  </target>
 	
 <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	        Compile JE2Probs
diff --git a/src/eva2/gui/DPointSetMultiIcon.java b/src/eva2/gui/DPointSetMultiIcon.java
index 6cb2a7b7..8b5a8b51 100644
--- a/src/eva2/gui/DPointSetMultiIcon.java
+++ b/src/eva2/gui/DPointSetMultiIcon.java
@@ -400,7 +400,7 @@ public class DPointSetMultiIcon extends DComponent
 
     public String toString()
     {
-        String text = "wsi.ra.chart2d.DPointSet[size:" + getSize();
+        String text = "eva2.tools.chart2d.DPointSet[size:" + getSize();
 
         for (int i = 0; i < xMI.getSize(); i++)
         {
diff --git a/src/eva2/gui/PropertyRemoteServers.java b/src/eva2/gui/PropertyRemoteServers.java
index ccd48aad..c97f4a04 100644
--- a/src/eva2/gui/PropertyRemoteServers.java
+++ b/src/eva2/gui/PropertyRemoteServers.java
@@ -34,7 +34,7 @@ class ServerNode implements java.io.Serializable {
 public class PropertyRemoteServers implements java.io.Serializable {
 
     private ServerNode[]        m_AvailableNodes;
-//    private String              m_ClassToStart  = "wsi.ra.jproxy.RMIServer";
+//    private String              m_ClassToStart  = "eva2.tools.jproxy.RMIServer";
     private transient String    m_password      = "";
     private String              m_Login         = "";
 //    private boolean             m_DeployJar     = true;
diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java
index bb46a29e..a12931c5 100644
--- a/src/eva2/server/go/MOCCOStandalone.java
+++ b/src/eva2/server/go/MOCCOStandalone.java
@@ -39,10 +39,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.ArrayList;
 
-
-/*import wsi.ra.jproxy.test.Something;
-import wsi.ra.jproxy.test.SomethingInterface;*/
-
 /**
  * Created by IntelliJ IDEA.
  * User: streiche
diff --git a/src/eva2/server/go/operators/mutation/MutateESStandard.java b/src/eva2/server/go/operators/mutation/MutateESStandard.java
index 771212ef..e195dd1c 100644
--- a/src/eva2/server/go/operators/mutation/MutateESStandard.java
+++ b/src/eva2/server/go/operators/mutation/MutateESStandard.java
@@ -5,7 +5,7 @@
 //import eva2.server.go.individuals.InterfaceESIndividual;
 //import eva2.server.go.populations.Population;
 //import eva2.server.go.problems.InterfaceOptimizationProblem;
-//import wsi.ra.math.RNG;
+//import eva2.tools.math.RNG;
 //
 ///**
 // * Created by IntelliJ IDEA.
diff --git a/src/eva2/server/go/strategies/IslandModelEA.java b/src/eva2/server/go/strategies/IslandModelEA.java
index a94cf1db..7bfa04ac 100644
--- a/src/eva2/server/go/strategies/IslandModelEA.java
+++ b/src/eva2/server/go/strategies/IslandModelEA.java
@@ -322,7 +322,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I
      */
     public static void main(String[] args) {
         // @todo die ServerStarter muss ich noch hin kriegen
-        // @todo Wichtig ich brauche den wsi.ra.jproxy.RMIServer!
+        // @todo Wichtig ich brauche den eva2.tools.jproxy.RMIServer!
         PropertyRemoteServers s = new PropertyRemoteServers();
         s.addServerNode("raold1.informatik.uni-tuebingen.de", 2);
         s.addServerNode("raold2.informatik.uni-tuebingen.de", 2);
diff --git a/src/eva2/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java
index db540764..edfaae63 100644
--- a/src/eva2/tools/ReflectPackage.java
+++ b/src/eva2/tools/ReflectPackage.java
@@ -20,9 +20,6 @@ import javax.management.ObjectName;
 
 import eva2.tools.tool.BasicResourceLoader;
 
-
-//import wsi.ra.tool.BasicResourceLoader;
-
 /**
  * Allow for java to list Classes that exist in one package and can be instantiated from
  * the classpath, either directly or through a jar on the classpath.
diff --git a/src/eva2/tools/chart2d/DArray.java b/src/eva2/tools/chart2d/DArray.java
index 5d77b0a1..7072e40d 100644
--- a/src/eva2/tools/chart2d/DArray.java
+++ b/src/eva2/tools/chart2d/DArray.java
@@ -190,7 +190,7 @@ public class DArray implements DIntDoubleMap{
   }
 
   public String toString(){
-    String text = "wsi.ra.chart2d.DArray[size:"+size;
+    String text = "eva2.tools.chart2d.DArray[size:"+size;
     if( size < 11 )
       for( int i=0; i<size; i++ ) text += ", "+value[i];
     text += "]";
diff --git a/src/eva2/tools/chart2d/DBorder.java b/src/eva2/tools/chart2d/DBorder.java
index e9c56dd2..8fd2fec3 100644
--- a/src/eva2/tools/chart2d/DBorder.java
+++ b/src/eva2/tools/chart2d/DBorder.java
@@ -44,7 +44,7 @@ public class DBorder extends Insets{
   }
 
   public String toString(){
-    return "wsi.ra.chart2d.DBorder[top="+top+",left="+left
+    return "eva2.tools.chart2d.DBorder[top="+top+",left="+left
            +",bottom="+bottom+",right="+right+"]";
   }
 }
\ No newline at end of file
diff --git a/src/eva2/tools/chart2d/DPointSet.java b/src/eva2/tools/chart2d/DPointSet.java
index 3e4c41b5..62c28b1d 100644
--- a/src/eva2/tools/chart2d/DPointSet.java
+++ b/src/eva2/tools/chart2d/DPointSet.java
@@ -240,7 +240,7 @@ public class DPointSet extends DComponent
   }
 
   public String toString(){
-    String text = "wsi.ra.chart2d.DPointSet[size:"+getSize();
+    String text = "eva2.tools.chart2d.DPointSet[size:"+getSize();
     for( int i=0; i<x.getSize(); i++ )
       text += ",("+x.getImage(i)+","+y.getImage(i)+")";
     text += "]";
diff --git a/src/eva2/tools/sort/XYDoubleArray.java b/src/eva2/tools/sort/XYDoubleArray.java
index 8ed80e84..9318b154 100644
--- a/src/eva2/tools/sort/XYDoubleArray.java
+++ b/src/eva2/tools/sort/XYDoubleArray.java
@@ -20,8 +20,6 @@ package eva2.tools.sort;
  * IMPORTS
  *==========================================================================*/
 
-//import wsi.ra.jchart2d.*;
-import java.util.*;
 
 /*==========================================================================*
  * CLASS DECLARATION