From d5f1a9eeee6667a2d16a17a80626dde68017584f Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sun, 19 Oct 2014 20:01:01 +0200 Subject: [PATCH] Dialogs now open up relative to the parent window. --- src/eva2/gui/PropertyDialog.java | 4 ++-- src/eva2/gui/PropertyPanel.java | 4 ++-- src/eva2/gui/PropertySheetPanel.java | 2 +- src/eva2/gui/editor/BigStringEditor.java | 2 +- src/eva2/gui/editor/GenericArrayEditor.java | 2 +- src/eva2/optimization/modules/EPParameters.java | 8 +------- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/eva2/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java index 342c2b27..b271f4be 100644 --- a/src/eva2/gui/PropertyDialog.java +++ b/src/eva2/gui/PropertyDialog.java @@ -24,7 +24,7 @@ public class PropertyDialog extends JDialog { /** * */ - public PropertyDialog(Window parent, PropertyEditor editor, String title, int x, int y) { + public PropertyDialog(Window parent, PropertyEditor editor, String title) { super(parent, title, ModalityType.APPLICATION_MODAL); setTitle(getFrameNameFromEditor(editor)); BasicResourceLoader loader = BasicResourceLoader.instance(); @@ -36,7 +36,7 @@ public class PropertyDialog extends JDialog { add(editorComponent, BorderLayout.CENTER); pack(); - setLocation(x, y); + setLocationRelativeTo(parent); } protected static String getFrameNameFromEditor(PropertyEditor editor) { diff --git a/src/eva2/gui/PropertyPanel.java b/src/eva2/gui/PropertyPanel.java index 07b73a0b..4fd12ce5 100644 --- a/src/eva2/gui/PropertyPanel.java +++ b/src/eva2/gui/PropertyPanel.java @@ -34,10 +34,10 @@ public class PropertyPanel extends JPanel { add(textLabel, gbConstraints); } - public void showDialog(int initX, int initY) { + public void showDialog() { Window parent = (Window)this.getRootPane().getParent(); if (propertyDialog == null) { - propertyDialog = new PropertyDialog(parent, propertyEditor, EVAHELP.cutClassName(propertyEditor.getClass().getName()), initX, initY); + propertyDialog = new PropertyDialog(parent, propertyEditor, EVAHELP.cutClassName(propertyEditor.getClass().getName())); propertyDialog.setPreferredSize(new Dimension(500, 300)); propertyDialog.setModal(true); propertyDialog.setVisible(true); diff --git a/src/eva2/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java index a26baf14..75ffcd2a 100644 --- a/src/eva2/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -1075,7 +1075,7 @@ class PropertyCellEditor extends AbstractCellEditor implements TableCellEditor { dialogButton.addActionListener(new ActionListener() { @Override public void actionPerformed(final ActionEvent event) { - ((PropertyPanel) value).showDialog(0, 0); + ((PropertyPanel) value).showDialog(); fireEditingStopped(); } }); diff --git a/src/eva2/gui/editor/BigStringEditor.java b/src/eva2/gui/editor/BigStringEditor.java index 34fc8557..9755fc9f 100644 --- a/src/eva2/gui/editor/BigStringEditor.java +++ b/src/eva2/gui/editor/BigStringEditor.java @@ -28,7 +28,7 @@ public class BigStringEditor implements PropertyEditor { isFinished = false; BigStringEditor editor = new BigStringEditor(); - PropertyDialog dialog = new PropertyDialog(null, editor, file, 50, 50); + PropertyDialog dialog = new PropertyDialog(null, editor, file); while (isFinished == false) { try { diff --git a/src/eva2/gui/editor/GenericArrayEditor.java b/src/eva2/gui/editor/GenericArrayEditor.java index 3e9f8a6b..cef0a6b2 100644 --- a/src/eva2/gui/editor/GenericArrayEditor.java +++ b/src/eva2/gui/editor/GenericArrayEditor.java @@ -237,7 +237,7 @@ public class GenericArrayEditor extends JPanel implements PropertyEditor { Object item = dlm.getElementAt(index); list.ensureIndexIsVisible(index); propPanel.getEditor().setValue(item); - propPanel.showDialog(e.getXOnScreen(), e.getYOnScreen()); + propPanel.showDialog(); propPanel = null; } } diff --git a/src/eva2/optimization/modules/EPParameters.java b/src/eva2/optimization/modules/EPParameters.java index d49d95ba..25e442a3 100644 --- a/src/eva2/optimization/modules/EPParameters.java +++ b/src/eva2/optimization/modules/EPParameters.java @@ -17,13 +17,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * The class gives access to all EP parameters for the EvA - * top level GUI. - * Created by IntelliJ IDEA. - * User: streiche - * Date: 27.10.2004 - * Time: 13:49:09 - * To change this template use File | Settings | File Templates. + * */ public class EPParameters extends AbstractOptimizationParameters implements InterfaceOptimizationParameters, Serializable {