halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Major renaming event for base package, JavaEvA -> EvA2

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-04-17 13:02:11 +00:00
parent 1614d205ef
commit 0105c97c41
525 changed files with 3095 additions and 3007 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/JavaEvA.props → resources/EvA2.props
View File

@ -12,7 +12,7 @@ ServerList = localhost,134.2.172.14,ranode22
#################### Internals: Do not alter! #################### Internals: Do not alter!
# base class for modules. Do not alter! # base class for modules. Do not alter!
ModulePackage = javaeva.server.modules ModulePackage = eva2.server.modules
# filter class for modules. Do not alter! # filter class for modules. Do not alter!
ModuleFilterClass = javaeva.server.modules.AbstractModuleAdapter ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter

BIN
resources/images/JavaEvA2SplashScreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
resources/images/JavaEvaSplashScreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

0
resources/images/JavaEvAIcon.gif → resources/images/icon1.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 937 B

After

Width:  |  Height:  |  Size: 937 B

0
resources/images/JavaEvAIcon_2.gif → resources/images/icon2.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 959 B

0
resources/images/JavaEvAIcon_3.gif → resources/images/icon3.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1010 B

BIN
resources/images/splashScreen2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

77
src/javaeva/OptimizerFactory.java → src/eva2/OptimizerFactory.java
View File

@ -1,48 +1,49 @@
/* /*
* Copyright (c) ZBiT, University of Tübingen, Germany * Copyright (c) ZBiT, University of Tübingen, Germany
*/ */
package javaeva; package eva2;
import java.util.BitSet; import java.util.BitSet;
import java.util.Vector; import java.util.Vector;
import javaeva.server.go.IndividualInterface; import eva2.server.go.IndividualInterface;
import javaeva.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.InterfacePopulationChangedEventListener;
import javaeva.server.go.InterfaceTerminator; import eva2.server.go.InterfaceTerminator;
import javaeva.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.individuals.InterfaceDataTypeBinary;
import javaeva.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.individuals.InterfaceDataTypeDouble;
import javaeva.server.go.individuals.InterfaceESIndividual; import eva2.server.go.individuals.InterfaceESIndividual;
import javaeva.server.go.operators.cluster.ClusteringDensityBased; import eva2.server.go.operators.cluster.ClusteringDensityBased;
import javaeva.server.go.operators.crossover.CrossoverESDefault; import eva2.server.go.operators.crossover.CrossoverESDefault;
import javaeva.server.go.operators.crossover.InterfaceCrossover; import eva2.server.go.operators.crossover.InterfaceCrossover;
import javaeva.server.go.operators.crossover.NoCrossover; import eva2.server.go.operators.crossover.NoCrossover;
import javaeva.server.go.operators.mutation.InterfaceMutation; import eva2.server.go.operators.mutation.InterfaceMutation;
import javaeva.server.go.operators.mutation.MutateESCovarianceMartixAdaption; import eva2.server.go.operators.mutation.MutateESCovarianceMartixAdaption;
import javaeva.server.go.operators.mutation.MutateESFixedStepSize; import eva2.server.go.operators.mutation.MutateESFixedStepSize;
import javaeva.server.go.operators.mutation.MutateESGlobal; import eva2.server.go.operators.mutation.MutateESGlobal;
import javaeva.server.go.operators.mutation.NoMutation; import eva2.server.go.operators.mutation.NoMutation;
import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.server.go.operators.postprocess.InterfacePostProcessParams;
import javaeva.server.go.operators.postprocess.PostProcessParams; import eva2.server.go.operators.postprocess.PostProcessParams;
import javaeva.server.go.operators.selection.InterfaceSelection; import eva2.server.go.operators.selection.InterfaceSelection;
import javaeva.server.go.operators.terminators.CombinedTerminator; import eva2.server.go.operators.terminators.CombinedTerminator;
import javaeva.server.go.operators.terminators.EvaluationTerminator; import eva2.server.go.operators.terminators.EvaluationTerminator;
import javaeva.server.go.operators.terminators.FitnessConvergenceTerminator; import eva2.server.go.operators.terminators.FitnessConvergenceTerminator;
import javaeva.server.go.populations.Population; import eva2.server.go.populations.Population;
import javaeva.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.AbstractOptimizationProblem;
import javaeva.server.go.strategies.ClusterBasedNichingEA; import eva2.server.go.strategies.ClusterBasedNichingEA;
import javaeva.server.go.strategies.ClusteringHillClimbing; import eva2.server.go.strategies.ClusteringHillClimbing;
import javaeva.server.go.strategies.DifferentialEvolution; import eva2.server.go.strategies.DifferentialEvolution;
import javaeva.server.go.strategies.EvolutionStrategies; import eva2.server.go.strategies.EvolutionStrategies;
import javaeva.server.go.strategies.GeneticAlgorithm; import eva2.server.go.strategies.GeneticAlgorithm;
import javaeva.server.go.strategies.GradientDescentAlgorithm; import eva2.server.go.strategies.GradientDescentAlgorithm;
import javaeva.server.go.strategies.HillClimbing; import eva2.server.go.strategies.HillClimbing;
import javaeva.server.go.strategies.InterfaceOptimizer; import eva2.server.go.strategies.InterfaceOptimizer;
import javaeva.server.go.strategies.MonteCarloSearch; import eva2.server.go.strategies.MonteCarloSearch;
import javaeva.server.go.strategies.ParticleSwarmOptimization; import eva2.server.go.strategies.ParticleSwarmOptimization;
import javaeva.server.go.strategies.SimulatedAnnealing; import eva2.server.go.strategies.SimulatedAnnealing;
import javaeva.server.go.strategies.Tribes; import eva2.server.go.strategies.Tribes;
import javaeva.server.modules.GOParameters; import eva2.server.modules.GOParameters;
/** /**
* <p> * <p>

31
src/javaeva/OptimizerRunnable.java → src/eva2/OptimizerRunnable.java
View File

@ -1,23 +1,24 @@
package javaeva; package eva2;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.BitSet; import java.util.BitSet;
import javaeva.server.go.IndividualInterface; import eva2.server.go.IndividualInterface;
import javaeva.server.go.InterfaceGOParameters; import eva2.server.go.InterfaceGOParameters;
import javaeva.server.go.InterfaceTerminator; import eva2.server.go.InterfaceTerminator;
import javaeva.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.individuals.InterfaceDataTypeBinary;
import javaeva.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.individuals.InterfaceDataTypeDouble;
import javaeva.server.go.individuals.InterfaceDataTypeInteger; import eva2.server.go.individuals.InterfaceDataTypeInteger;
import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; import eva2.server.go.operators.postprocess.InterfacePostProcessParams;
import javaeva.server.go.operators.postprocess.PostProcessParams; import eva2.server.go.operators.postprocess.PostProcessParams;
import javaeva.server.go.populations.Population; import eva2.server.go.populations.Population;
import javaeva.server.modules.GOParameters; import eva2.server.modules.GOParameters;
import javaeva.server.modules.Processor; import eva2.server.modules.Processor;
import javaeva.server.stat.AbstractStatistics; import eva2.server.stat.AbstractStatistics;
import javaeva.server.stat.InterfaceTextListener; import eva2.server.stat.InterfaceTextListener;
import javaeva.server.stat.StatisticsStandalone; import eva2.server.stat.StatisticsStandalone;
/** /**
* This Runnable class just encapsulates the Processor class with some simple ways to access a solution. * This Runnable class just encapsulates the Processor class with some simple ways to access a solution.

6
src/javaeva/client/AppExitAction.java → src/eva2/client/AppExitAction.java
View File

@ -1,8 +1,10 @@
package javaeva.client; package eva2.client;
import javaeva.gui.ExtAction;
import javax.swing.*; import javax.swing.*;
import eva2.gui.ExtAction;
import java.awt.event.WindowListener; import java.awt.event.WindowListener;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;

79
src/javaeva/client/EvAClient.java → src/eva2/client/EvAClient.java
View File

@ -1,7 +1,7 @@
package javaeva.client; package eva2.client;
/* /*
* Title: JavaEvA * Title: EvA2
* Description: * Description:
* Copyright: Copyright (c) 2003 * Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture * Company: University of Tuebingen, Computer Architecture
@ -28,18 +28,6 @@ import java.net.URL;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import javaeva.gui.ExtAction;
import javaeva.gui.JEFrame;
import javaeva.gui.JEFrameRegister;
import javaeva.gui.JExtMenu;
import javaeva.gui.JTabbedModuleFrame;
import javaeva.gui.LogPanel;
import javaeva.server.EvAServer;
import javaeva.server.modules.ModuleAdapter;
import javaeva.tools.EVAERROR;
import javaeva.tools.EVAHELP;
import javaeva.tools.ReflectPackage;
import javaeva.tools.Serializer;
import javax.swing.ButtonGroup; import javax.swing.ButtonGroup;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
@ -59,6 +47,19 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.event.MenuEvent; import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener; import javax.swing.event.MenuListener;
import eva2.gui.ExtAction;
import eva2.gui.JEFrame;
import eva2.gui.JEFrameRegister;
import eva2.gui.JExtMenu;
import eva2.gui.JTabbedModuleFrame;
import eva2.gui.LogPanel;
import eva2.server.EvAServer;
import eva2.server.modules.ModuleAdapter;
import eva2.tools.EVAERROR;
import eva2.tools.EVAHELP;
import eva2.tools.ReflectPackage;
import eva2.tools.Serializer;
import wsi.ra.jproxy.RemoteStateListener; import wsi.ra.jproxy.RemoteStateListener;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
@ -73,15 +74,14 @@ import wsi.ra.tool.BasicResourceLoader;
* *
*/ */
public class EvAClient implements RemoteStateListener, Serializable { public class EvAClient implements RemoteStateListener, Serializable {
public static final String EVA_PROPERTY_FILE = "resources/JavaEvA.props"; public static final String EVA_PROPERTY_FILE = "resources/EvA2.props";
private static Properties EVA_PROPERTIES; private static Properties EVA_PROPERTIES;
public static final String iconLocation = "resources/images/JavaEvAIcon_3.gif"; public static final String iconLocation = "resources/images/icon3.gif";
private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.png"; private static final String splashLocation = "resources/images/splashScreen2.png";
// private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.jpg";
final int splashScreenTime = 1500; final int splashScreenTime = 1500;
public static boolean TRACE = false; public static boolean TRACE = false;
private static String m_ProductName = "JavaEvA 2"; private static String m_ProductName = "EvA 2";
// private int PREFERRED_WIDTH = 680; // private int PREFERRED_WIDTH = 680;
// private int PREFERRED_HEIGHT = 550; // private int PREFERRED_HEIGHT = 550;
public JEFrame m_Frame; public JEFrame m_Frame;
@ -155,8 +155,8 @@ public class EvAClient implements RemoteStateListener, Serializable {
} }
/** /**
* Constructor of GUI of JavaEva. * Constructor of GUI of EvA2.
* Works as client for the JavaEva server. * Works as client for the EvA2 server.
* *
*/ */
public EvAClient(final String hostName) { public EvAClient(final String hostName) {
@ -202,9 +202,9 @@ public class EvAClient implements RemoteStateListener, Serializable {
try { try {
m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
m_Frame.setTitle("JavaEvA workbench"); m_Frame.setTitle("EvA2 workbench");
try { try {
Thread.sleep(200); Thread.sleep(200);
@ -231,7 +231,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
m_Frame.addWindowListener(new WindowAdapter() { m_Frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {
System.out.println("Closing JavaEvA Client. Bye!"); System.out.println("Closing EvA2 Client. Bye!");
m_Frame.dispose(); m_Frame.dispose();
Set<String> keys = System.getenv().keySet(); Set<String> keys = System.getenv().keySet();
if (keys.contains("MATLAB")) { if (keys.contains("MATLAB")) {
@ -256,27 +256,6 @@ public class EvAClient implements RemoteStateListener, Serializable {
m_Frame.setVisible(true); m_Frame.setVisible(true);
} }
} }
//
// /**
// * Create the JavaEvA splash screen.
// */
// public void createSplashScreen() {
// BasicResourceLoader loader = BasicResourceLoader.instance();
// byte[] bytes = loader.getBytesFromResourceLocation("resources/images/JavaEvA2SplashScreen.jpg");
// try {
// ImageIcon ii = new ImageIcon(Toolkit.getDefaultToolkit().createImage(bytes));
// JLabel splashLabel = new JLabel(ii);
// m_splashScreen = new JWindow();
// m_splashScreen.getContentPane().add(splashLabel);
// m_splashScreen.pack();
// Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
// //splashScreen.setSize(screenSize);
// m_splashScreen.setLocation(screenSize.width / 2 - m_splashScreen.getSize().width / 2, screenSize.height / 2 - m_splashScreen.getSize().height / 2);
// } catch (java.lang.NullPointerException e) {
// System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!");
// }
//
// }
/** /**
* The one and only main of the client program. * The one and only main of the client program.
@ -531,7 +510,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
if (selectedModule == null) { // show a dialog and ask for a module if (selectedModule == null) { // show a dialog and ask for a module
String[] ModuleNameList = m_ComAdapter.getModuleNameList(); String[] ModuleNameList = m_ComAdapter.getModuleNameList();
if (ModuleNameList == null) { if (ModuleNameList == null) {
JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "JavaEvA Information", 1); JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "EvA2 Information", 1);
} else { } else {
String LastModuleName = Serializer.loadString("lastmodule.ser"); String LastModuleName = Serializer.loadString("lastmodule.ser");
if (LastModuleName == null) LastModuleName = ModuleNameList[0]; if (LastModuleName == null) LastModuleName = ModuleNameList[0];
@ -664,7 +643,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
} }
private void showPleaseWaitDialog() { private void showPleaseWaitDialog() {
JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "JavaEvA Information", 1); JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "EvA2 Information", 1);
} }
private void showAboutDialog() { private void showAboutDialog() {
@ -672,11 +651,11 @@ public class EvAClient implements RemoteStateListener, Serializable {
(m_Frame, (m_Frame,
m_ProductName + m_ProductName +
"\n University of Tuebingen\n Computer Architecture\n H. Ulmer & F. Streichert & H. Planatscher & M. de Paly & M. Kronfeld\n Prof. Dr. Andreas Zell \n (c) 2008 \n Version " + "\n University of Tuebingen\n Computer Architecture\n H. Ulmer & F. Streichert & H. Planatscher & M. de Paly & M. Kronfeld\n Prof. Dr. Andreas Zell \n (c) 2008 \n Version " +
EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/JavaEvA", "JavaEvA Information", 1); EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/EvA2", "EvA2 Information", 1);
} }
private void showNoHostFoundDialog() { private void showNoHostFoundDialog() {
JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "JavaEvA Information", 1); JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "EvA2 Information", 1);
} }
/** /**
@ -779,7 +758,7 @@ final class SplashScreen extends Frame {
splashWindow.setLocation(screenSize.width / 2 - splashWindow.getSize().width / 2, screenSize.height / 2 - splashWindow.getSize().height / 2); splashWindow.setLocation(screenSize.width / 2 - splashWindow.getSize().width / 2, screenSize.height / 2 - splashWindow.getSize().height / 2);
splashWindow.setVisible(true); splashWindow.setVisible(true);
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!"); System.err.println("Could not find EvA2 splash screen, please move rescoure folder to working directory!");
} }
} }

15
src/javaeva/client/EvAComAdapter.java → src/eva2/client/EvAComAdapter.java
View File

@ -1,7 +1,7 @@
package javaeva.client; package eva2.client;
/* /*
* Title: JavaEvA * Title: EvA2
* Description: * Description:
* Copyright: Copyright (c) 2003 * Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture * Company: University of Tuebingen, Computer Architecture
@ -17,11 +17,12 @@ package javaeva.client;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.rmi.registry.Registry; import java.rmi.registry.Registry;
import java.util.ArrayList; import java.util.ArrayList;
import javaeva.gui.LogPanel;
import javaeva.server.EvAMainAdapter; import eva2.gui.LogPanel;
import javaeva.server.EvAMainAdapterImpl; import eva2.server.EvAMainAdapter;
import javaeva.server.RMIServerEvA; import eva2.server.EvAMainAdapterImpl;
import javaeva.server.modules.ModuleAdapter; import eva2.server.RMIServerEvA;
import eva2.server.modules.ModuleAdapter;
import wsi.ra.jproxy.ComAdapter; import wsi.ra.jproxy.ComAdapter;
import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapter;

7
src/javaeva/client/RMIConnectionEvA.java → src/eva2/client/RMIConnectionEvA.java
View File

@ -1,10 +1,11 @@
package javaeva.client; package eva2.client;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import javaeva.server.EvAMainAdapter; import eva2.server.EvAMainAdapter;
import javaeva.server.modules.ModuleAdapter; import eva2.server.modules.ModuleAdapter;
import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapter;
import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterClient;
import wsi.ra.jproxy.RMIConnection; import wsi.ra.jproxy.RMIConnection;

9
src/javaeva/gui/BeanInspector.java → src/eva2/gui/BeanInspector.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -21,9 +21,10 @@ import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javaeva.server.go.populations.Population; import eva2.server.go.populations.Population;
import javaeva.tools.SelectedTag; import eva2.tools.SelectedTag;
import javaeva.tools.Tag; import eva2.tools.Tag;
/* /*
* ==========================================================================* * ==========================================================================*

2
src/javaeva/gui/BigStringEditor.java → src/eva2/gui/BigStringEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

10
src/javaeva/gui/Chart2DDPointContentSelectable.java → src/eva2/gui/Chart2DDPointContentSelectable.java
View File

@ -1,12 +1,14 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;
import javaeva.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener;
import javaeva.server.go.problems.InterfaceOptimizationProblem;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.individuals.AbstractEAIndividual;
import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener;
import eva2.server.go.problems.InterfaceOptimizationProblem;
import java.awt.*; import java.awt.*;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;

2
src/javaeva/gui/Chart2DDPointIconCircle.java → src/eva2/gui/Chart2DDPointIconCircle.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;

7
src/javaeva/gui/Chart2DDPointIconContent.java → src/eva2/gui/Chart2DDPointIconContent.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;
@ -7,11 +7,12 @@ import java.awt.*;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import javaeva.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.problems.InterfaceOptimizationProblem;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.individuals.AbstractEAIndividual;
import eva2.server.go.problems.InterfaceOptimizationProblem;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.
* User: streiche * User: streiche

2
src/javaeva/gui/Chart2DDPointIconCross.java → src/eva2/gui/Chart2DDPointIconCross.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;

2
src/javaeva/gui/Chart2DDPointIconPoint.java → src/eva2/gui/Chart2DDPointIconPoint.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;

2
src/javaeva/gui/Chart2DDPointIconText.java → src/eva2/gui/Chart2DDPointIconText.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointIcon;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;

2
src/javaeva/gui/ComponentFilter.java → src/eva2/gui/ComponentFilter.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/DPointSetMultiIcon.java → src/eva2/gui/DPointSetMultiIcon.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.chart2d.*; import wsi.ra.chart2d.*;

2
src/javaeva/gui/DataViewer.java → src/eva2/gui/DataViewer.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/DataViewerInterface.java → src/eva2/gui/DataViewerInterface.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/Exp.java → src/eva2/gui/Exp.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/ExtAction.java → src/eva2/gui/ExtAction.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/ExtActionChangedListener.java → src/eva2/gui/ExtActionChangedListener.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/ExtDesktopManager.java → src/eva2/gui/ExtDesktopManager.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

7
src/javaeva/gui/FunctionArea.java → src/eva2/gui/FunctionArea.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
@ -29,13 +29,14 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import javaeva.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefPointListener;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import eva2.server.go.individuals.AbstractEAIndividual;
import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener;
import wsi.ra.chart2d.DArea; import wsi.ra.chart2d.DArea;
import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DBorder;
import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPoint;

10
src/javaeva/gui/GenericAreaEditor.java → src/eva2/gui/GenericAreaEditor.java
View File

@ -1,10 +1,12 @@
package javaeva.gui; package eva2.gui;
import javaeva.tools.EVAHELP;
import javaeva.server.go.individuals.codings.gp.AbstractGPNode;
import javaeva.server.go.individuals.codings.gp.GPArea;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.individuals.codings.gp.AbstractGPNode;
import eva2.server.go.individuals.codings.gp.GPArea;
import eva2.tools.EVAHELP;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;

8
src/javaeva/gui/GenericArrayEditor.java → src/eva2/gui/GenericArrayEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -13,8 +13,6 @@ package javaeva.gui;
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.tools.EVAHELP;
import javaeva.tools.SelectedTag;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
@ -31,6 +29,10 @@ import javax.swing.JOptionPane;
import javax.swing.DefaultListModel; import javax.swing.DefaultListModel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListCellRenderer;
import eva2.tools.EVAHELP;
import eva2.tools.SelectedTag;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;

2
src/javaeva/gui/GenericDoubleArrayEditor.java → src/eva2/gui/GenericDoubleArrayEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

2
src/javaeva/gui/GenericEpsilonConstraintEditor.java → src/eva2/gui/GenericEpsilonConstraintEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

2
src/javaeva/gui/GenericEpsilonThresholdEditor.java → src/eva2/gui/GenericEpsilonThresholdEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

2
src/javaeva/gui/GenericFilePathEditor.java → src/eva2/gui/GenericFilePathEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

2
src/javaeva/gui/GenericIntArrayEditor.java → src/eva2/gui/GenericIntArrayEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

9
src/javaeva/gui/GenericObjectEditor.java → src/eva2/gui/GenericObjectEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -45,9 +45,6 @@ import java.util.ArrayList;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.Vector; import java.util.Vector;
import javaeva.client.EvAClient;
import javaeva.tools.EVAHELP;
import javaeva.tools.ReflectPackage;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
@ -57,6 +54,10 @@ import javax.swing.JFileChooser;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import eva2.client.EvAClient;
import eva2.tools.EVAHELP;
import eva2.tools.ReflectPackage;
import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyLocal;

10
src/javaeva/gui/GenericOptimizationObjectivesEditor.java → src/eva2/gui/GenericOptimizationObjectivesEditor.java
View File

@ -1,10 +1,12 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.problems.InterfaceOptimizationObjective;
import javaeva.server.go.problems.InterfaceOptimizationTarget;
import javaeva.server.go.tools.GeneralGOEProperty;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.problems.InterfaceOptimizationObjective;
import eva2.server.go.problems.InterfaceOptimizationTarget;
import eva2.server.go.tools.GeneralGOEProperty;
import java.beans.*; import java.beans.*;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;

8
src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java → src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java
View File

@ -1,9 +1,11 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.problems.InterfaceOptimizationObjective;
import javaeva.server.go.tools.GeneralGOEProperty;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.problems.InterfaceOptimizationObjective;
import eva2.server.go.tools.GeneralGOEProperty;
import java.beans.*; import java.beans.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;

6
src/javaeva/gui/GenericRemoteServersEditor.java → src/eva2/gui/GenericRemoteServersEditor.java
View File

@ -1,8 +1,11 @@
package javaeva.gui; package eva2.gui;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.SwingWorker;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
@ -12,7 +15,6 @@ import java.io.*;
import java.util.Vector; import java.util.Vector;
import java.util.Enumeration; import java.util.Enumeration;
import javaeva.server.go.SwingWorker;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

8
src/javaeva/gui/GenericStringListEditor.java → src/eva2/gui/GenericStringListEditor.java
View File

@ -1,9 +1,11 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.individuals.codings.gp.AbstractGPNode;
import javaeva.server.go.individuals.codings.gp.GPArea;
import javax.swing.*; import javax.swing.*;
import eva2.server.go.individuals.codings.gp.AbstractGPNode;
import eva2.server.go.individuals.codings.gp.GPArea;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;

2
src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java → src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import javax.swing.*; import javax.swing.*;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;

2
src/javaeva/gui/Graph.java → src/eva2/gui/Graph.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import java.io.Serializable; import java.io.Serializable;

2
src/javaeva/gui/GraphPointSet.java → src/eva2/gui/GraphPointSet.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/GraphWindow.java → src/eva2/gui/GraphWindow.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

10
src/javaeva/gui/HtmlDemo.java → src/eva2/gui/HtmlDemo.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -12,7 +12,6 @@ package javaeva.gui;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.tools.EVAHELP;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JViewport; import javax.swing.JViewport;
@ -21,6 +20,10 @@ import javax.swing.event.HyperlinkListener;
import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkEvent;
import javax.swing.text.html.HTMLFrameHyperlinkEvent; import javax.swing.text.html.HTMLFrameHyperlinkEvent;
import javax.swing.text.html.HTMLDocument; import javax.swing.text.html.HTMLDocument;
import eva2.client.EvAClient;
import eva2.tools.EVAHELP;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.io.IOException; import java.io.IOException;
@ -29,7 +32,6 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.awt.Toolkit; import java.awt.Toolkit;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
import javaeva.client.EvAClient;
/** /**
* *
*/ */
@ -97,7 +99,7 @@ public class HtmlDemo {
try { try {
frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.err.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
JScrollPane scroller = new JScrollPane(); JScrollPane scroller = new JScrollPane();
JViewport vp = scroller.getViewport(); JViewport vp = scroller.getViewport();

6
src/javaeva/gui/InterfaceDPointWithContent.java → src/eva2/gui/InterfaceDPointWithContent.java
View File

@ -1,7 +1,7 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

6
src/javaeva/gui/InterfaceSelectablePointIcon.java → src/eva2/gui/InterfaceSelectablePointIcon.java
View File

@ -1,7 +1,7 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.AbstractEAIndividual;
import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/JClassTree.java → src/eva2/gui/JClassTree.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/JDocFrame.java → src/eva2/gui/JDocFrame.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/JEFrame.java → src/eva2/gui/JEFrame.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/JEFrameRegister.java → src/eva2/gui/JEFrameRegister.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import java.util.ArrayList; import java.util.ArrayList;
/* /*
* Title: JavaEvA * Title: JavaEvA

6
src/javaeva/gui/JExtDesktopPane.java → src/eva2/gui/JExtDesktopPane.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -65,7 +65,7 @@ public class JExtDesktopPane extends JDesktopPane{
} }
}); });
m_mnuWindow.add(actWindowOverlap = new ExtAction("Ü&berlappend", "Ordnet die Fenster überlappend an"){ m_mnuWindow.add(actWindowOverlap = new ExtAction("<EFBFBD>&berlappend", "Ordnet die Fenster <20>berlappend an"){
public void actionPerformed(ActionEvent e){ public void actionPerformed(ActionEvent e){
overlapWindows(); overlapWindows();
} }
@ -89,7 +89,7 @@ public class JExtDesktopPane extends JDesktopPane{
JScrollPane pane = new JScrollPane(list); JScrollPane pane = new JScrollPane(list);
pane.setPreferredSize(new Dimension(pane.getPreferredSize().width, 150)); pane.setPreferredSize(new Dimension(pane.getPreferredSize().width, 150));
if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster auswählen", JOptionPane.OK_CANCEL_OPTION, if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster ausw<EFBFBD>hlen", JOptionPane.OK_CANCEL_OPTION,
JOptionPane.PLAIN_MESSAGE, null, null, null) == JOptionPane.OK_OPTION) JOptionPane.PLAIN_MESSAGE, null, null, null) == JOptionPane.OK_OPTION)
if(list.getSelectedIndex() != -1) selectFrame(frames[list.getSelectedIndex()]); if(list.getSelectedIndex() != -1) selectFrame(frames[list.getSelectedIndex()]);
} }

4
src/javaeva/gui/JExtFileChooser.java → src/eva2/gui/JExtFileChooser.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -31,7 +31,7 @@ public class JExtFileChooser extends JFileChooser{
File f = getSelectedFile(); File f = getSelectedFile();
if(f != null && f.exists()) if(f != null && f.exists())
if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie überschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return; if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie <EFBFBD>berschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return;
} }
super.approveSelection(); super.approveSelection();

2
src/javaeva/gui/JExtMenu.java → src/eva2/gui/JExtMenu.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/JExtToolBar.java → src/eva2/gui/JExtToolBar.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

5
src/javaeva/gui/JModuleGeneralPanel.java → src/eva2/gui/JModuleGeneralPanel.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -16,7 +16,6 @@ package javaeva.gui;
import java.io.Serializable; import java.io.Serializable;
import java.net.InetAddress; import java.net.InetAddress;
import javaeva.server.modules.ModuleAdapter;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -25,6 +24,8 @@ import javax.swing.JComponent;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import eva2.server.modules.ModuleAdapter;
import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyLocal;
import wsi.ra.jproxy.RemoteStateListener; import wsi.ra.jproxy.RemoteStateListener;
/*==========================================================================* /*==========================================================================*

2
src/javaeva/gui/JParaPanel.java → src/eva2/gui/JParaPanel.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA

14
src/javaeva/gui/JTabbedModuleFrame.java → src/eva2/gui/JTabbedModuleFrame.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -12,10 +12,6 @@ package javaeva.gui;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.gui.JModuleGeneralPanel;
import javaeva.gui.JParaPanel;
import javaeva.server.modules.ModuleAdapter;
import javaeva.client.EvAClient;
import java.io.Serializable; import java.io.Serializable;
import java.awt.*; import java.awt.*;
@ -24,6 +20,12 @@ import java.awt.print.* ;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.*; import javax.swing.border.*;
import javax.swing.event.*; import javax.swing.event.*;
import eva2.client.EvAClient;
import eva2.gui.JModuleGeneralPanel;
import eva2.gui.JParaPanel;
import eva2.server.modules.ModuleAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
/*==========================================================================* /*==========================================================================*
@ -105,7 +107,7 @@ public class JTabbedModuleFrame implements Serializable {
try { try {
m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); System.out.println("Could not find EvA2 icon, please move resource folder to working directory!");
} }
JPanel m_SuperPanel = createContentPane(); JPanel m_SuperPanel = createContentPane();

10
src/javaeva/gui/JTextEditorInternalFrame.java → src/eva2/gui/JTextEditorInternalFrame.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -29,7 +29,7 @@ public class JTextEditorInternalFrame extends JDocFrame{
protected UndoManager undo = new UndoManager(); protected UndoManager undo = new UndoManager();
private class UndoAction extends ExtAction{ private class UndoAction extends ExtAction{
public UndoAction(){ public UndoAction(){
super("Rückgängig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion rückgängig", super("R<EFBFBD>ckg<EFBFBD>ngig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion r<EFBFBD>ckg<EFBFBD>ngig",
KeyStroke.getKeyStroke(KeyEvent.VK_Z, Event.CTRL_MASK)); KeyStroke.getKeyStroke(KeyEvent.VK_Z, Event.CTRL_MASK));
setEnabled(false); setEnabled(false);
} }
@ -51,7 +51,7 @@ public class JTextEditorInternalFrame extends JDocFrame{
} }
else{ else{
setEnabled(false); setEnabled(false);
putValue(Action.NAME, "Rückgängig"); putValue(Action.NAME, "R<EFBFBD>ckg<EFBFBD>ngig");
} }
} }
} // end of inner class UndoAction } // end of inner class UndoAction
@ -171,9 +171,9 @@ public class JTextEditorInternalFrame extends JDocFrame{
keyActions = keys.getKeyStrokesForAction(a); keyActions = keys.getKeyStrokesForAction(a);
if(keyActions != null && keyActions.length > 0) a.putValue(ExtAction.KEYSTROKE, keyActions[0]); if(keyActions != null && keyActions.length > 0) a.putValue(ExtAction.KEYSTROKE, keyActions[0]);
a.putValue(Action.SMALL_ICON, new ImageIcon("images/EditPaste.gif")); a.putValue(Action.SMALL_ICON, new ImageIcon("images/EditPaste.gif"));
a.putValue(ExtAction.CAPTION, "Einfügen"); a.putValue(ExtAction.CAPTION, "Einf<EFBFBD>gen");
a.putValue(ExtAction.MNEMONIC, new Character('e')); a.putValue(ExtAction.MNEMONIC, new Character('e'));
a.putValue(ExtAction.TOOLTIP, "Fügt Text aus der Zwischenablage ein"); a.putValue(ExtAction.TOOLTIP, "F<EFBFBD>gt Text aus der Zwischenablage ein");
mnuEdit.add(a); mnuEdit.add(a);
barEdit.add(a); barEdit.add(a);

9
src/javaeva/gui/JTextoutputFrame.java → src/eva2/gui/JTextoutputFrame.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -25,8 +25,6 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.Serializable; import java.io.Serializable;
import javaeva.client.EvAClient;
import javaeva.tools.MultirunRefiner;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JFrame; import javax.swing.JFrame;
@ -38,6 +36,9 @@ import javax.swing.JViewport;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import eva2.client.EvAClient;
import eva2.tools.MultirunRefiner;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
@ -110,7 +111,7 @@ Serializable {
try { try {
frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); System.out.println("Could not find EvA2 icon, please move resource folder to working directory!");
} }
frame.addWindowListener(new WindowAdapter() { frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {

4
src/javaeva/gui/JTextoutputFrameInterface.java → src/eva2/gui/JTextoutputFrameInterface.java
View File

@ -1,6 +1,6 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.stat.InterfaceTextListener; import eva2.server.stat.InterfaceTextListener;
/* /*
* Title: JavaEvA * Title: JavaEvA

8
src/javaeva/gui/LogPanel.java → src/eva2/gui/LogPanel.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -17,9 +17,11 @@ import java.text.*;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.*; import javax.swing.event.*;
import eva2.client.EvAClient;
import java.awt.event.*; import java.awt.event.*;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
import javaeva.client.EvAClient;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
*==========================================================================*/ *==========================================================================*/
@ -97,7 +99,7 @@ public class LogPanel extends JPanel {
try { try {
frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
LogPanel panel = new LogPanel(); LogPanel panel = new LogPanel();
frame.getContentPane().add(panel, BorderLayout.CENTER); frame.getContentPane().add(panel, BorderLayout.CENTER);

2
src/javaeva/gui/Mnemonic.java → src/eva2/gui/Mnemonic.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/MultiLineString.java → src/eva2/gui/MultiLineString.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* <p>Title: The JavaEvA</p> * <p>Title: The JavaEvA</p>

2
src/javaeva/gui/MultiLineStringEditor.java → src/eva2/gui/MultiLineStringEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
import java.beans.*; import java.beans.*;
import java.awt.*; import java.awt.*;

7
src/javaeva/gui/Plot.java → src/eva2/gui/Plot.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -34,7 +34,6 @@ import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import javaeva.client.EvAClient;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
@ -44,6 +43,8 @@ import javax.swing.JPanel;
import com.sun.image.codec.jpeg.JPEGCodec; import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGImageEncoder; import com.sun.image.codec.jpeg.JPEGImageEncoder;
import eva2.client.EvAClient;
import wsi.ra.chart2d.DPointSet; import wsi.ra.chart2d.DPointSet;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
/*==========================================================================* /*==========================================================================*
@ -109,7 +110,7 @@ public class Plot implements PlotInterface, Serializable {
try { try {
m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
m_ButtonPanel = new JPanel(); m_ButtonPanel = new JPanel();

2
src/javaeva/gui/PlotInterface.java → src/eva2/gui/PlotInterface.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/PropertyBoolSelector.java → src/eva2/gui/PropertyBoolSelector.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

10
src/javaeva/gui/PropertyDialog.java → src/eva2/gui/PropertyDialog.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -12,16 +12,18 @@ package javaeva.gui;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.tools.EVAHELP;
import java.awt.Component; import java.awt.Component;
import java.awt.Toolkit; import java.awt.Toolkit;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import javax.swing.JFrame; import javax.swing.JFrame;
import eva2.client.EvAClient;
import eva2.tools.EVAHELP;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
import javaeva.client.EvAClient;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
*==========================================================================*/ *==========================================================================*/
@ -41,7 +43,7 @@ public class PropertyDialog extends JEFrame {
try { try {
setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
//System.out.println("PropertyDialog.Constructor of "+ Title); //System.out.println("PropertyDialog.Constructor of "+ Title);
addWindowListener(new WindowAdapter() { addWindowListener(new WindowAdapter() {

2
src/javaeva/gui/PropertyDoubleArray.java → src/eva2/gui/PropertyDoubleArray.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

11
src/javaeva/gui/PropertyEditorProvider.java → src/eva2/gui/PropertyEditorProvider.java
View File

@ -1,13 +1,14 @@
package javaeva.gui; package eva2.gui;
import java.awt.Color; import java.awt.Color;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager; import java.beans.PropertyEditorManager;
import javaeva.server.go.InterfaceTerminator; import eva2.server.go.InterfaceTerminator;
import javaeva.server.go.individuals.codings.gp.GPArea; import eva2.server.go.individuals.codings.gp.GPArea;
import javaeva.tools.SelectedTag; import eva2.tools.SelectedTag;
import sun.beans.editors.DoubleEditor; import sun.beans.editors.DoubleEditor;
import sun.beans.editors.IntEditor; import sun.beans.editors.IntEditor;
@ -162,6 +163,6 @@ public class PropertyEditorProvider {
PropertyEditorManager.registerEditor(PropertyRemoteServers.class , GenericRemoteServersEditor.class); PropertyEditorManager.registerEditor(PropertyRemoteServers.class , GenericRemoteServersEditor.class);
PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class , GenericOptimizationObjectivesEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class , GenericOptimizationObjectivesEditor.class);
PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class , GenericOptimizationObjectivesWithParamEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class , GenericOptimizationObjectivesWithParamEditor.class);
PropertyEditorManager.registerEditor(javaeva.gui.MultiLineString.class, javaeva.gui.MultiLineStringEditor.class); PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, eva2.gui.MultiLineStringEditor.class);
} }
} }

2
src/javaeva/gui/PropertyEpsilonConstraint.java → src/eva2/gui/PropertyEpsilonConstraint.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/PropertyEpsilonThreshold.java → src/eva2/gui/PropertyEpsilonThreshold.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/PropertyFilePath.java → src/eva2/gui/PropertyFilePath.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/PropertyIntArray.java → src/eva2/gui/PropertyIntArray.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/javaeva/gui/PropertyOptimizationObjectives.java → src/eva2/gui/PropertyOptimizationObjectives.java
View File

@ -1,6 +1,6 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.problems.InterfaceOptimizationObjective; import eva2.server.go.problems.InterfaceOptimizationObjective;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

4
src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java → src/eva2/gui/PropertyOptimizationObjectivesWithParam.java
View File

@ -1,6 +1,6 @@
package javaeva.gui; package eva2.gui;
import javaeva.server.go.problems.InterfaceOptimizationObjective; import eva2.server.go.problems.InterfaceOptimizationObjective;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

5
src/javaeva/gui/PropertyPanel.java → src/eva2/gui/PropertyPanel.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -19,10 +19,11 @@ import java.awt.Rectangle;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.PropertyEditor; import java.beans.PropertyEditor;
import javaeva.tools.EVAHELP;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import eva2.tools.EVAHELP;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
*==========================================================================*/ *==========================================================================*/

2
src/javaeva/gui/PropertyRemoteServers.java → src/eva2/gui/PropertyRemoteServers.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
//import javaeva.tools.ServerStarter; //import javaeva.tools.ServerStarter;
import java.rmi.Naming; import java.rmi.Naming;

7
src/javaeva/gui/PropertySheetPanel.java → src/eva2/gui/PropertySheetPanel.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -36,8 +36,6 @@ import java.beans.PropertyVetoException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import javaeva.tools.EVAHELP;
import javaeva.tools.StringTools;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JButton; import javax.swing.JButton;
@ -46,6 +44,9 @@ import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import eva2.tools.EVAHELP;
import eva2.tools.StringTools;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
*==========================================================================*/ *==========================================================================*/

5
src/javaeva/gui/PropertySheetPanelStat.java → src/eva2/gui/PropertySheetPanelStat.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -18,8 +18,9 @@ import java.awt.event.*;
import java.beans.*; import java.beans.*;
import java.lang.reflect.*; import java.lang.reflect.*;
import javax.swing.*; import javax.swing.*;
import eva2.tools.EVAHELP;
import sun.beans.editors.*; import sun.beans.editors.*;
import javaeva.tools.EVAHELP;
import java.io.Serializable; import java.io.Serializable;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION

2
src/javaeva/gui/PropertySlider.java → src/eva2/gui/PropertySlider.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/PropertyStringList.java → src/eva2/gui/PropertyStringList.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/PropertyText.java → src/eva2/gui/PropertyText.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/PropertyValueSelector.java → src/eva2/gui/PropertyValueSelector.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

2
src/javaeva/gui/PropertyWeightedLPTchebycheff.java → src/eva2/gui/PropertyWeightedLPTchebycheff.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
src/javaeva/gui/SerializedObject.java → src/eva2/gui/SerializedObject.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

5
src/javaeva/gui/StatisticsEditor.java → src/eva2/gui/StatisticsEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -16,7 +16,8 @@ package javaeva.gui;
import java.beans.*; import java.beans.*;
import java.awt.*; import java.awt.*;
import javax.swing.*; import javax.swing.*;
import javaeva.server.stat.GenericStatistics;
import eva2.server.stat.GenericStatistics;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION

11
src/javaeva/gui/TagEditor.java → src/eva2/gui/TagEditor.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -12,16 +12,17 @@ package javaeva.gui;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.tools.SelectedTag;
import javaeva.tools.Tag;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.event.*; import java.awt.event.*;
import java.awt.Toolkit; import java.awt.Toolkit;
import java.beans.*; import java.beans.*;
import javax.swing.*; import javax.swing.*;
import eva2.client.EvAClient;
import eva2.tools.SelectedTag;
import eva2.tools.Tag;
import wsi.ra.tool.BasicResourceLoader; import wsi.ra.tool.BasicResourceLoader;
import javaeva.client.EvAClient;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
*==========================================================================*/ *==========================================================================*/
@ -126,7 +127,7 @@ public class TagEditor extends PropertyEditorSupport {
try { try {
f.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); f.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes));
} catch (java.lang.NullPointerException e) { } catch (java.lang.NullPointerException e) {
System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!");
} }
f.addWindowListener(new WindowAdapter() { f.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {

5
src/javaeva/gui/TopoPlot.java → src/eva2/gui/TopoPlot.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -15,7 +15,8 @@ package javaeva.gui;
import wsi.ra.chart2d.*; import wsi.ra.chart2d.*;
import java.awt.*; import java.awt.*;
import javaeva.server.go.problems.Interface2DBorderProblem; import eva2.server.go.problems.Interface2DBorderProblem;
import wsi.ra.diagram.ColorBarCalculator; import wsi.ra.diagram.ColorBarCalculator;
/*==========================================================================* /*==========================================================================*

2
src/javaeva/gui/TreeElement.java → src/eva2/gui/TreeElement.java
View File

@ -1,4 +1,4 @@
package javaeva.gui; package eva2.gui;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:

1
src/javaeva/gui/WindowCloseAction.java → src/eva2/gui/WindowCloseAction.java
View File

@ -1,3 +1,4 @@
package eva2.gui;
//package javaeva.gui; //package javaeva.gui;
///*==========================================================================* ///*==========================================================================*
// * IMPORTS // * IMPORTS

4
src/javaeva/server/EvAMainAdapter.java → src/eva2/server/EvAMainAdapter.java
View File

@ -1,4 +1,4 @@
package javaeva.server; package eva2.server;
/** /**
* Title: javaeva * Title: javaeva
* Description: API for distributed and parallel computing. * Description: API for distributed and parallel computing.
@ -12,7 +12,7 @@ package javaeva.server;
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.server.modules.ModuleAdapter; import eva2.server.modules.ModuleAdapter;
import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapter;
import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterClient;
/*==========================================================================* /*==========================================================================*

6
src/javaeva/server/EvAMainAdapterImpl.java → src/eva2/server/EvAMainAdapterImpl.java
View File

@ -1,4 +1,4 @@
package javaeva.server; package eva2.server;
/** /**
* Title: The JProxy Framework * Title: The JProxy Framework
@ -12,8 +12,8 @@ package javaeva.server;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.client.EvAClient; import eva2.client.EvAClient;
import javaeva.server.modules.ModuleAdapter; import eva2.server.modules.ModuleAdapter;
import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterClient;
import wsi.ra.jproxy.MainAdapterImpl; import wsi.ra.jproxy.MainAdapterImpl;
/*==========================================================================* /*==========================================================================*

7
src/javaeva/server/EvAServer.java → src/eva2/server/EvAServer.java
View File

@ -1,4 +1,4 @@
package javaeva.server; package eva2.server;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -108,8 +108,9 @@ public class EvAServer {
} }
if (TRACE) System.out.println(" start multiServers int i= "+i); if (TRACE) System.out.println(" start multiServers int i= "+i);
try { try {
System.out.println("Calling the command:"+"java -cp \".:../lib/jdom.jar\" javaeva.server.EvAServer nomulti"); String cmd = "java -cp \".\" eva2.server.EvAServer nomulti";
Process pro = Runtime.getRuntime().exec("java -cp \".:../lib/jdom.jar:../lib/log4j.jar\" javaeva.server.EvAServer nomulti"); System.out.println("Calling the command:"+cmd);
Process pro = Runtime.getRuntime().exec(cmd);
//Process pro = Runtime.getRuntime().exec("server"); //Process pro = Runtime.getRuntime().exec("server");
BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream())); BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream()));
//pro //pro

90
src/javaeva/server/ModuleServer.java → src/eva2/server/ModuleServer.java
View File

@ -1,4 +1,4 @@
package javaeva.server; package eva2.server;
/* /*
* Title: JavaEvA * Title: JavaEvA
@ -18,13 +18,11 @@ import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Properties; import java.util.Properties;
import javaeva.server.modules.ModuleAdapter;
import javaeva.tools.EVAERROR;
import javaeva.tools.EVAHELP;
import javaeva.tools.ReflectPackage;
import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterClient;
import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyLocal;
import eva2.server.modules.ModuleAdapter;
import eva2.tools.EVAERROR;
import eva2.tools.ReflectPackage;
/*==========================================================================* /*==========================================================================*
* CLASS DECLARATION * CLASS DECLARATION
@ -35,8 +33,8 @@ import wsi.ra.jproxy.RMIProxyLocal;
public class ModuleServer { public class ModuleServer {
public static boolean TRACE = false; public static boolean TRACE = false;
private int m_InstanceCounter = 0; private int m_InstanceCounter = 0;
private ArrayList<Class> m_ModuleClassList; private ArrayList<Class<?>> m_ModuleClassList;
private ArrayList m_RunnungModules; // private ArrayList m_RunnungModules;
private ModuleAdapter m_ModuleAdapter; private ModuleAdapter m_ModuleAdapter;
private int m_ModuleAdapterCounter = 0; private int m_ModuleAdapterCounter = 0;
@ -49,26 +47,26 @@ public class ModuleServer {
if (m_InstanceCounter > 0) { if (m_InstanceCounter > 0) {
EVAERROR.EXIT("ModuleServer twice created"); EVAERROR.EXIT("ModuleServer twice created");
} }
m_RunnungModules = new ArrayList(); // m_RunnungModules = new ArrayList();
m_ModuleClassList = new ArrayList<Class>(); m_ModuleClassList = new ArrayList<Class<?>>();
String modulePckg = null; String modulePckg = null;
Class filterBy = null; Class<?> filterBy = null;
try { try {
modulePckg = EvAProps.getProperty("ModulePackage"); modulePckg = EvAProps.getProperty("ModulePackage");
filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass")); filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass"));
} catch(Exception e) { } catch(Exception e) {
System.err.println("Couldnt load modules:" + e.getMessage()); System.err.println("Creating ModuleServer failed: couldnt load modules:" + e.getMessage());
System.err.println("module path was " + modulePckg); System.err.println("module path was " + modulePckg + ", is it valid?");
System.err.println("filter class path was " + ((filterBy==null) ? "null" : filterBy.getName())); System.err.println("filter class path was " + ((filterBy==null) ? "null" : filterBy.getName()));
e.printStackTrace(); // e.printStackTrace();
} }
// this gets a list of all valid modules from the package // this gets a list of all valid modules from the package
Class[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true); Class<?>[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true);
for (Object cls : classes) { for (Object cls : classes) {
if (TRACE) System.out.println("- " + ((Class)cls).getName()); if (TRACE) System.out.println("- " + ((Class<?>)cls).getName());
m_ModuleClassList.add((Class)cls); m_ModuleClassList.add((Class<?>)cls);
} }
m_InstanceCounter++; m_InstanceCounter++;
@ -81,7 +79,7 @@ public class ModuleServer {
ArrayList<String> ModuleNameList = new ArrayList<String>(); ArrayList<String> ModuleNameList = new ArrayList<String>();
for (int i = 0; i < m_ModuleClassList.size(); i++) { for (int i = 0; i < m_ModuleClassList.size(); i++) {
try { try {
Class Modul = (Class) m_ModuleClassList.get(i); Class<?> Modul = (Class<?>) m_ModuleClassList.get(i);
Method[] methods = Modul.getDeclaredMethods(); Method[] methods = Modul.getDeclaredMethods();
for (int ii = 0; ii < methods.length; ii++) { for (int ii = 0; ii < methods.length; ii++) {
if (methods[ii].getName().equals("getName") == true) { if (methods[ii].getName().equals("getName") == true) {
@ -101,16 +99,16 @@ public class ModuleServer {
// and the running modules // and the running modules
// @todo running modules sind abgeschaltet // @todo running modules sind abgeschaltet
for (int i = 0; i < m_RunnungModules.size(); i++) { // for (int i = 0; i < m_RunnungModules.size(); i++) {
String AdapterName = null; // String AdapterName = null;
try { // try {
AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); // AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName();
} // }
catch (Exception ee) { // catch (Exception ee) {
System.err.println("Error: GetAdapterName" + ee.getMessage()); // System.err.println("Error: GetAdapterName" + ee.getMessage());
} // }
ModuleNameList.add(AdapterName); // ModuleNameList.add(AdapterName);
} // }
String[] x = new String[ModuleNameList.size()]; String[] x = new String[ModuleNameList.size()];
ModuleNameList.toArray(x); ModuleNameList.toArray(x);
@ -134,7 +132,7 @@ public class ModuleServer {
selectedModuleName); selectedModuleName);
} }
String moduleName; String moduleName;
Class module; Class<?> module;
Method[] methods; Method[] methods;
for (int i = 0; i < m_ModuleClassList.size(); i++) { for (int i = 0; i < m_ModuleClassList.size(); i++) {
moduleName = null; moduleName = null;
@ -159,9 +157,9 @@ public class ModuleServer {
selectedModuleName); selectedModuleName);
// create a module instance // create a module instance
Constructor[] Constructor = module.getConstructors(); Constructor<?>[] Constructor = module.getConstructors();
Object[] Para = new Object[2]; Object[] Para = new Object[2];
Class paramTypes[] = (Constructor[0]).getParameterTypes(); Class<?> paramTypes[] = (Constructor[0]).getParameterTypes();
Para[0] = paramTypes[0].cast(adapterName); Para[0] = paramTypes[0].cast(adapterName);
Para[1] = paramTypes[1].cast(Client); Para[1] = paramTypes[1].cast(Client);
m_ModuleAdapter = (ModuleAdapter) Constructor[0].newInstance(Para); m_ModuleAdapter = (ModuleAdapter) Constructor[0].newInstance(Para);
@ -184,21 +182,21 @@ public class ModuleServer {
return (ModuleAdapter) m_ModuleAdapter; return (ModuleAdapter) m_ModuleAdapter;
} }
} }
// @todo running modules sind gerade noch abgeschaltet // // @todo running modules sind gerade noch abgeschaltet
for (int i = 0; i < m_RunnungModules.size(); i++) { // for (int i = 0; i < m_RunnungModules.size(); i++) {
try { // try {
adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); // adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName();
} // }
catch (Exception e) { // catch (Exception e) {
System.out.println("Error : GetAdapterName" + e); // System.out.println("Error : GetAdapterName" + e);
} // }
if (adapterName.equals(selectedModuleName)) { // if (adapterName.equals(selectedModuleName)) {
if (TRACE) // if (TRACE)
System.out.println(" Choose a running Module!!! " + adapterName); // System.out.println(" Choose a running Module!!! " + adapterName);
m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i)); // m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i));
return (ModuleAdapter) m_ModuleAdapter; // return (ModuleAdapter) m_ModuleAdapter;
} // }
} // }
System.err.println("NO VALID MODULE DEFINED: " + selectedModuleName); System.err.println("NO VALID MODULE DEFINED: " + selectedModuleName);
return null; return null;

5
src/javaeva/server/RMIServerEvA.java → src/eva2/server/RMIServerEvA.java
View File

@ -1,4 +1,4 @@
package javaeva.server; package eva2.server;
/** /**
* Title: The JProxy Framework * Title: The JProxy Framework
* Description: API for distributed and parallel computing. * Description: API for distributed and parallel computing.
@ -16,7 +16,8 @@ import java.net.MalformedURLException;
import java.rmi.Naming; import java.rmi.Naming;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.rmi.registry.Registry; import java.rmi.registry.Registry;
import javaeva.client.EvAComAdapter;
import eva2.client.EvAComAdapter;
import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyLocal;
import wsi.ra.jproxy.RMIServer; import wsi.ra.jproxy.RMIServer;

4
src/javaeva/server/go/CrossoverInterface.java → src/eva2/server/go/CrossoverInterface.java
View File

@ -1,4 +1,4 @@
package javaeva.server.go; package eva2.server.go;
/* /*
* Title: JavaEvA * Title: JavaEvA
* Description: * Description:
@ -12,7 +12,7 @@ package javaeva.server.go;
/*==========================================================================* /*==========================================================================*
* IMPORTS * IMPORTS
*==========================================================================*/ *==========================================================================*/
import javaeva.server.stat.InterfaceStatistics; import eva2.server.stat.InterfaceStatistics;
/*==========================================================================* /*==========================================================================*
* INTERFACE DECLARATION * INTERFACE DECLARATION
*==========================================================================*/ *==========================================================================*/

Some files were not shown because too many files have changed in this diff Show More