TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-22 11:55:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed some findbugs issues

Browse Source
This commit is contained in:
hneemann 2018-03-03 12:00:42 +01:00
parent 5b8f88f5a8
commit 623c5f5301
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/draw/graphics/text/text/Index.java
View File

@ -20,8 +20,6 @@ public class Index implements Text {
*/ */
public Index(Text var) { public Index(Text var) {
this.var = var; this.var = var;
this.superScript = superScript;
this.subScript = subScript;
} }
/** /**

13
src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java
View File

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