diff --git a/src/eva2/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java index 90570611..2a6062a3 100644 --- a/src/eva2/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -1,6 +1,7 @@ package eva2.gui; import eva2.gui.editor.GenericObjectEditor; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.EVAHELP; import eva2.util.annotation.Description; @@ -241,7 +242,6 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener // Look for a globalInfo method that returns a string // describing the target int methsFound = 0; // dont loop too long, so count until all found - // @ToDo: Replace hideHideable method with annotation for (MethodDescriptor methodDescriptor : methodDescriptors) { String name = methodDescriptor.getDisplayName(); Method meth = methodDescriptor.getMethod(); @@ -265,7 +265,7 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener // values, views and editors... propertyEditors = new PropertyEditor[propertyDescriptors.length]; // collect property values if possible - objectValues = getValues(targetObject, propertyDescriptors, true, false, true); + objectValues = getValues(targetObject, propertyDescriptors, true, true, true); views = new JComponent[propertyDescriptors.length]; viewWrappers = new JComponent[propertyDescriptors.length]; propertyLabels = new JLabel[propertyDescriptors.length]; @@ -753,6 +753,7 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener views[i].repaint(); revalidate(); } + return true; } diff --git a/src/eva2/gui/editor/GenericArrayEditor.java b/src/eva2/gui/editor/GenericArrayEditor.java index cef0a6b2..75dca93a 100644 --- a/src/eva2/gui/editor/GenericArrayEditor.java +++ b/src/eva2/gui/editor/GenericArrayEditor.java @@ -325,7 +325,7 @@ public class GenericArrayEditor extends JPanel implements PropertyEditor { /** * Updates the type of object being edited, so attempts to find an appropriate propertyeditor. * - * @param o a value of type 'Object' + * @param obj a value of type 'Object' */ private void updateEditorType(Object obj) { @@ -639,7 +639,6 @@ public class GenericArrayEditor extends JPanel implements PropertyEditor { * Create a menu item with given title and listener, add it to the menu and return it. It may be * enabled or disabled. * - * @param menu * @param title * @param aListener * @param enabled diff --git a/src/eva2/optimization/strategies/AbstractOptimizer.java b/src/eva2/optimization/strategies/AbstractOptimizer.java index aa2864a4..210f727d 100644 --- a/src/eva2/optimization/strategies/AbstractOptimizer.java +++ b/src/eva2/optimization/strategies/AbstractOptimizer.java @@ -1,5 +1,6 @@ package eva2.optimization.strategies; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; import eva2.problems.F1Problem; @@ -68,6 +69,7 @@ public abstract class AbstractOptimizer implements InterfaceOptimizer { @Override public void setProblem(InterfaceOptimizationProblem problem) { this.optimizationProblem = problem; + GenericObjectEditor.setShowProperty(this.getClass(), "problem", false); } @Override