From 0c7efdbc9c11d868f9002a02d8cc89981d221ea2 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 26 Feb 2018 23:53:46 +0100
Subject: [PATCH] minor layout changes

---
 .../java/de/neemann/digital/draw/elements/Circuit.java |  2 ++
 .../digital/gui/components/ROMEditorDialog.java        | 10 ++++------
 src/test/resources/dig/test/romContent/rom.dig         |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java
index d6fb9ff53..6f61a8c75 100644
--- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java
+++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java
@@ -13,6 +13,7 @@ import de.neemann.digital.core.io.InValue;
 import de.neemann.digital.core.io.Out;
 import de.neemann.digital.core.memory.DataField;
 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.draw.graphics.Graphic;
 import de.neemann.digital.draw.graphics.Polygon;
@@ -84,6 +85,7 @@ public class Circuit {
         xStream.alias("testData", TestCaseDescription.class);
         xStream.alias("inverterConfig", InverterConfig.class);
         xStream.addImplicitCollection(InverterConfig.class, "inputs");
+        xStream.alias("storedRoms", ROMManger.class);
         xStream.ignoreUnknownElements();
         return xStream;
     }
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 5291b9562..e2bd8ff45 100644
--- a/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/ROMEditorDialog.java
@@ -63,8 +63,7 @@ public class ROMEditorDialog extends JDialog {
             }
         });
 
-        JPanel buttons = new JPanel();
-        buttons.setLayout(new BoxLayout(buttons, BoxLayout.Y_AXIS));
+        JPanel buttons = new JPanel(new FlowLayout());
         buttons.add(new ToolTipAction(Lang.get("btn_edit")) {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -83,15 +82,14 @@ public class ROMEditorDialog extends JDialog {
         }.setToolTip(Lang.get("tt_deleteItem")).createJButton());
         getContentPane().add(buttons, BorderLayout.EAST);
 
-        JButton okButton = new JButton(new AbstractAction(Lang.get("ok")) {
+        buttons.add(new JButton(new AbstractAction(Lang.get("ok")) {
             @Override
             public void actionPerformed(ActionEvent e) {
                 ok = true;
                 dispose();
             }
-        });
-        getContentPane().add(okButton, BorderLayout.SOUTH);
-
+        }));
+        getContentPane().add(buttons, BorderLayout.SOUTH);
 
         pack();
         setLocationRelativeTo(parent);
diff --git a/src/test/resources/dig/test/romContent/rom.dig b/src/test/resources/dig/test/romContent/rom.dig
index 592d9e5cd..e2d6205bb 100644
--- a/src/test/resources/dig/test/romContent/rom.dig
+++ b/src/test/resources/dig/test/romContent/rom.dig
@@ -4,7 +4,7 @@
   <attributes>
     <entry>
       <string>romContent</string>
-      <de.neemann.digital.core.memory.rom.ROMManger>
+      <storedRoms>
         <roms>
           <entry>
             <string>R3-B</string>
@@ -39,7 +39,7 @@
             <data size="4">9,a,b,c</data>
           </entry>
         </roms>
-      </de.neemann.digital.core.memory.rom.ROMManger>
+      </storedRoms>
     </entry>
   </attributes>
   <visualElements>