diff --git a/src/main/java/de/neemann/digital/draw/graphics/text/text/Index.java b/src/main/java/de/neemann/digital/draw/graphics/text/text/Index.java index 563cc9263..b1292b1fc 100644 --- a/src/main/java/de/neemann/digital/draw/graphics/text/text/Index.java +++ b/src/main/java/de/neemann/digital/draw/graphics/text/text/Index.java @@ -20,8 +20,6 @@ public class Index implements Text { */ public Index(Text var) { this.var = var; - this.superScript = superScript; - this.subScript = subScript; } /** diff --git a/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java b/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java index 72c15c5ae..a170f35f4 100644 --- a/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java @@ -22,13 +22,12 @@ import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.util.Collections; +import java.util.Comparator; /** * The editor to edit the roms */ public class ROMEditorDialog extends JDialog { - private final ROMManger romManager; private final ROMModel romModel; private boolean ok = false; @@ -41,7 +40,6 @@ public class ROMEditorDialog extends JDialog { */ public ROMEditorDialog(JDialog parent, Model model, ROMManger romManager) { super(parent, Lang.get("win_romDialog"), true); - this.romManager = romManager; romModel = new ROMModel(); for (Node n : model.findNode(n -> n instanceof ROMInterface)) { @@ -118,7 +116,7 @@ public class ROMEditorDialog extends JDialog { return romModel.createRomManager(); } - private static final class RomHolder implements Comparable { + private static final class RomHolder { private final ROMInterface ri; private DataField data; @@ -139,11 +137,6 @@ public class ROMEditorDialog extends JDialog { return data.getData().length > 0; } - @Override - public int compareTo(RomHolder that) { - return ri.getLabel().compareTo(that.ri.getLabel()); - } - public boolean edit(ROMEditorDialog romEditorDialog) { DataEditor de = new DataEditor(romEditorDialog, data, 1 << ri.getAddrBits(), ri.getDataBits(), ri.getAddrBits(), false, NoSync.INST); if (de.showDialog()) { @@ -187,7 +180,7 @@ public class ROMEditorDialog extends JDialog { } private void sort() { - Collections.sort(romlist); + romlist.sort(Comparator.comparing(r -> r.ri.getLabel())); } public void delete(int i) {