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

minor layout changes

Browse Source
This commit is contained in:
hneemann 2018-02-26 23:53:46 +01:00
parent 1994ae8054
commit 0c7efdbc9c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/draw/elements/Circuit.java
View File

@ -13,6 +13,7 @@ import de.neemann.digital.core.io.InValue;
import de.neemann.digital.core.io.Out; import de.neemann.digital.core.io.Out;
import de.neemann.digital.core.memory.DataField; import de.neemann.digital.core.memory.DataField;
import de.neemann.digital.core.memory.DataFieldConverter; import de.neemann.digital.core.memory.DataFieldConverter;
import de.neemann.digital.core.memory.rom.ROMManger;
import de.neemann.digital.core.wiring.Clock; import de.neemann.digital.core.wiring.Clock;
import de.neemann.digital.draw.graphics.Graphic; import de.neemann.digital.draw.graphics.Graphic;
import de.neemann.digital.draw.graphics.Polygon; import de.neemann.digital.draw.graphics.Polygon;
@ -84,6 +85,7 @@ public class Circuit {
xStream.alias("testData", TestCaseDescription.class); xStream.alias("testData", TestCaseDescription.class);
xStream.alias("inverterConfig", InverterConfig.class); xStream.alias("inverterConfig", InverterConfig.class);
xStream.addImplicitCollection(InverterConfig.class, "inputs"); xStream.addImplicitCollection(InverterConfig.class, "inputs");
xStream.alias("storedRoms", ROMManger.class);
xStream.ignoreUnknownElements(); xStream.ignoreUnknownElements();
return xStream; return xStream;
} }

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

@ -63,8 +63,7 @@ public class ROMEditorDialog extends JDialog {
} }
}); });
JPanel buttons = new JPanel(); JPanel buttons = new JPanel(new FlowLayout());
buttons.setLayout(new BoxLayout(buttons, BoxLayout.Y_AXIS));
buttons.add(new ToolTipAction(Lang.get("btn_edit")) { buttons.add(new ToolTipAction(Lang.get("btn_edit")) {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -83,15 +82,14 @@ public class ROMEditorDialog extends JDialog {
}.setToolTip(Lang.get("tt_deleteItem")).createJButton()); }.setToolTip(Lang.get("tt_deleteItem")).createJButton());
getContentPane().add(buttons, BorderLayout.EAST); getContentPane().add(buttons, BorderLayout.EAST);
JButton okButton = new JButton(new AbstractAction(Lang.get("ok")) { buttons.add(new JButton(new AbstractAction(Lang.get("ok")) {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ok = true; ok = true;
dispose(); dispose();
} }
}); }));
getContentPane().add(okButton, BorderLayout.SOUTH); getContentPane().add(buttons, BorderLayout.SOUTH);
pack(); pack();
setLocationRelativeTo(parent); setLocationRelativeTo(parent);

4
src/test/resources/dig/test/romContent/rom.dig
View File

@ -4,7 +4,7 @@
<attributes> <attributes>
<entry> <entry>
<string>romContent</string> <string>romContent</string>
<de.neemann.digital.core.memory.rom.ROMManger> <storedRoms>
<roms> <roms>
<entry> <entry>
<string>R3-B</string> <string>R3-B</string>
@ -39,7 +39,7 @@
<data size="4">9,a,b,c</data> <data size="4">9,a,b,c</data>
</entry> </entry>
</roms> </roms>
</de.neemann.digital.core.memory.rom.ROMManger> </storedRoms>
</entry> </entry>
</attributes> </attributes>
<visualElements> <visualElements>