From 023f09e044c62ad661f64dc7a7083e2670c22c02 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 16 Oct 2014 14:29:42 +0200 Subject: [PATCH] - Move stuff around - Deactivate nasty packing on frame update - Go back to native UI rendering --- src/eva2/client/EvAComAdapter.java | 1 + src/eva2/gui/Main.java | 18 +++++++----------- src/eva2/gui/OptimizationEditorPanel.java | 8 +------- .../modules/AbstractModuleAdapter.java | 1 - .../{go => modules}/InterfaceProcessor.java | 2 +- src/eva2/optimization/modules/Processor.java | 1 - 6 files changed, 10 insertions(+), 21 deletions(-) rename src/eva2/optimization/{go => modules}/InterfaceProcessor.java (95%) diff --git a/src/eva2/client/EvAComAdapter.java b/src/eva2/client/EvAComAdapter.java index d5098838..693cbd10 100644 --- a/src/eva2/client/EvAComAdapter.java +++ b/src/eva2/client/EvAComAdapter.java @@ -57,6 +57,7 @@ public class EvAComAdapter { * @return */ public String[] getModuleNameList() { + System.out.println("SAYYYYY WHAAAAAT?"); String[] list = getLocalMainAdapter().getModuleNameList(); LOGGER.info("List of modules available:"); diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java index f08c1071..e139a913 100644 --- a/src/eva2/gui/Main.java +++ b/src/eva2/gui/Main.java @@ -551,8 +551,8 @@ public class Main extends JFrame implements OptimizationStateListener { } else { /* Set Look and Feel */ try { - //UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); } catch (Exception ex) { LOGGER.log(Level.INFO, "Could not set Look&Feel", ex); } @@ -560,11 +560,10 @@ public class Main extends JFrame implements OptimizationStateListener { /* Available command-line parameters */ String[] keys = new String[]{ - "--help", "--autorun", "--nosplash", "--nogui", - "--remotehost", "--params", "--treeView" + "--help", "--autorun", "--nosplash", "--nogui", "--params", "--treeView" }; /* Number of arguments per parameter */ - int[] arities = new int[]{0, 0, 0, 0, 1, 1, 0}; + int[] arities = new int[]{0, 0, 0, 0, 1, 0}; Object[] values = new Object[keys.length]; Integer[] unknownArgs = StringTools.parseArguments(args, keys, arities, values, true); @@ -590,8 +589,8 @@ public class Main extends JFrame implements OptimizationStateListener { boolean autorun = (values[1] != null); boolean nosplash = (values[2] != null); boolean nogui = (values[3] != null); - boolean treeView = (values[6] != null); - String paramsFile = StringTools.checkSingleStringArg(keys[5], values[5], arities[5] - 1); + boolean treeView = (values[5] != null); + String paramsFile = StringTools.checkSingleStringArg(keys[4], values[4], arities[4] - 1); new Main("", paramsFile, autorun, nosplash, nogui, treeView); } @@ -626,7 +625,6 @@ public class Main extends JFrame implements OptimizationStateListener { // GUI update due to the changes made through the API evaClient.refreshMainPanels(); - return evaClient; } @@ -655,7 +653,6 @@ public class Main extends JFrame implements OptimizationStateListener { sbuf.append(" --nogui: Deactivate GUI (makes most sense with autorun and params set)\n"); sbuf.append(" --autorun: Start an optimization immediately and exit after execution\n"); sbuf.append(" --params PARAMFILE: Load the (serialized) parameters file on start\n"); - sbuf.append(" --remotehost HOSTNAME: Try to load a module from a (remote) server\n"); return sbuf.toString(); } @@ -743,7 +740,6 @@ public class Main extends JFrame implements OptimizationStateListener { JExtMenu menuOptions = new JExtMenu("&Options"); menuOptions.add(actPreferences); - //menuOptions.add(menuSelHosts); menuOptions.addSeparator(); menuOptions.add(actQuit); @@ -753,7 +749,7 @@ public class Main extends JFrame implements OptimizationStateListener { } /** - * Retrieve the GOParamters of a loaded module. Return null if no module is + * Retrieve the optimization parameters of a loaded module. Return null if no module is * loaded. * * @return diff --git a/src/eva2/gui/OptimizationEditorPanel.java b/src/eva2/gui/OptimizationEditorPanel.java index 77bfb9b7..03b7df96 100644 --- a/src/eva2/gui/OptimizationEditorPanel.java +++ b/src/eva2/gui/OptimizationEditorPanel.java @@ -254,7 +254,6 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener { protected Object copyObject(Object source) { Object result = null; try { -// System.out.println("Copying " + BeanInspector.toString(source)); SerializedObject so = new SerializedObject(source); result = so.getObject(); so = null; @@ -393,11 +392,6 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener { public void updateChildPropertySheet() { // Set the object as the target of the propertysheet propertySheetPanel.setTarget(genericObjectEditor.getValue()); - // Adjust size of containing window if possible - if ((getTopLevelAncestor() != null) - && (getTopLevelAncestor() instanceof Window)) { - ((Window) getTopLevelAncestor()).pack(); - } } /** @@ -418,7 +412,7 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener { genericObjectEditor.setValue(n); // TODO ? setObject(n); } catch (Exception ex) { - System.err.println("Exeption in itemStateChanged " + ex.getMessage()); + System.err.println("Exception in itemStateChanged " + ex.getMessage()); System.err.println("Classpath is " + System.getProperty("java.class.path")); ex.printStackTrace(); objectChooser.hidePopup(); diff --git a/src/eva2/optimization/modules/AbstractModuleAdapter.java b/src/eva2/optimization/modules/AbstractModuleAdapter.java index 399f29e3..105e6996 100644 --- a/src/eva2/optimization/modules/AbstractModuleAdapter.java +++ b/src/eva2/optimization/modules/AbstractModuleAdapter.java @@ -3,7 +3,6 @@ package eva2.optimization.modules; import eva2.optimization.OptimizationStateListener; import eva2.optimization.go.InterfaceOptimizationParameters; -import eva2.optimization.go.InterfaceProcessor; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/eva2/optimization/go/InterfaceProcessor.java b/src/eva2/optimization/modules/InterfaceProcessor.java similarity index 95% rename from src/eva2/optimization/go/InterfaceProcessor.java rename to src/eva2/optimization/modules/InterfaceProcessor.java index 87d27170..f8c65c54 100644 --- a/src/eva2/optimization/go/InterfaceProcessor.java +++ b/src/eva2/optimization/modules/InterfaceProcessor.java @@ -1,4 +1,4 @@ -package eva2.optimization.go; +package eva2.optimization.modules; import eva2.optimization.OptimizationStateListener; diff --git a/src/eva2/optimization/modules/Processor.java b/src/eva2/optimization/modules/Processor.java index cad7ca20..2b047b80 100644 --- a/src/eva2/optimization/modules/Processor.java +++ b/src/eva2/optimization/modules/Processor.java @@ -5,7 +5,6 @@ import eva2.optimization.OptimizationStateListener; import eva2.optimization.go.InterfaceNotifyOnInformers; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.go.InterfacePopulationChangedEventListener; -import eva2.optimization.go.InterfaceProcessor; import eva2.optimization.operator.paramcontrol.ConstantParameters; import eva2.optimization.operator.paramcontrol.InterfaceParameterControl; import eva2.optimization.operator.postprocess.PostProcess;