diff --git a/src/main/java/eva2/gui/editor/DoubleArrayEditor.java b/src/main/java/eva2/gui/editor/DoubleArrayEditor.java index 95e5da8f..fda7a02d 100644 --- a/src/main/java/eva2/gui/editor/DoubleArrayEditor.java +++ b/src/main/java/eva2/gui/editor/DoubleArrayEditor.java @@ -100,14 +100,10 @@ public class DoubleArrayEditor extends JPanel implements PropertyEditor { this.normalizeButton.addActionListener(this.normalizeAction); this.okButton = new JButton("OK"); this.okButton.setEnabled(true); - this.okButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - //backupObject = copyObject(object); - if ((customEditor.getTopLevelAncestor() != null) && (customEditor.getTopLevelAncestor() instanceof Window)) { - Window w = (Window) customEditor.getTopLevelAncestor(); - w.dispose(); - } + this.okButton.addActionListener(e -> { + if ((customEditor.getTopLevelAncestor() != null) && (customEditor.getTopLevelAncestor() instanceof Window)) { + Window w = (Window) customEditor.getTopLevelAncestor(); + w.dispose(); } }); this.buttonPanel.add(this.addButton); @@ -124,7 +120,7 @@ public class DoubleArrayEditor extends JPanel implements PropertyEditor { ActionListener addAction = new ActionListener() { @Override public void actionPerformed(ActionEvent event) { - doubleArray.addRowCopy(lastFocussedRow); // copy the last focussed row + doubleArray.addRowCopy(lastFocussedRow); // copy the last focused row updateEditor(); } }; @@ -145,7 +141,7 @@ public class DoubleArrayEditor extends JPanel implements PropertyEditor { }; /** - * This action listener nomalizes each columng of the values of the DoubleArray. + * This action listener normalizes each column of the values of the DoubleArray. */ ActionListener normalizeAction = new ActionListener() { @Override @@ -183,7 +179,6 @@ public class DoubleArrayEditor extends JPanel implements PropertyEditor { } doubleArray.setDoubleArray(tmpDD); - //updateEditor(); } }; @@ -223,9 +218,7 @@ public class DoubleArrayEditor extends JPanel implements PropertyEditor { } public void notifyFocusID(int id) { - // notification of which column has the focus lastFocussedRow = id; -// System.out.println("Focus now on " + id); } /** diff --git a/src/main/java/eva2/gui/editor/IntArrayEditor.java b/src/main/java/eva2/gui/editor/IntArrayEditor.java index 69ef3422..ea2211eb 100644 --- a/src/main/java/eva2/gui/editor/IntArrayEditor.java +++ b/src/main/java/eva2/gui/editor/IntArrayEditor.java @@ -4,7 +4,6 @@ import eva2.gui.PropertyIntArray; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -55,14 +54,10 @@ public class IntArrayEditor extends JPanel implements PropertyEditor { this.buttonPanel = new JPanel(); this.okButton = new JButton("OK"); this.okButton.setEnabled(true); - this.okButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - //backupObject = copyObject(object); - if ((customEditor.getTopLevelAncestor() != null) && (customEditor.getTopLevelAncestor() instanceof Window)) { - Window w = (Window) customEditor.getTopLevelAncestor(); - w.dispose(); - } + this.okButton.addActionListener(e -> { + if ((customEditor.getTopLevelAncestor() != null) && (customEditor.getTopLevelAncestor() instanceof Window)) { + Window w = (Window) customEditor.getTopLevelAncestor(); + w.dispose(); } }); this.buttonPanel.add(this.okButton); diff --git a/src/main/java/eva2/gui/editor/MultiLineString.java b/src/main/java/eva2/gui/editor/MultiLineString.java index ef3fac1c..e27c7fd3 100644 --- a/src/main/java/eva2/gui/editor/MultiLineString.java +++ b/src/main/java/eva2/gui/editor/MultiLineString.java @@ -12,10 +12,6 @@ public class MultiLineString { public MultiLineString() { } - public static void main(String[] args) { - MultiLineString multiLineString1 = new MultiLineString(); - } - public String getString() { return string; }