From aadee117606e27a0b787b58fac4e82fa581e5426 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Sun, 10 Apr 2016 18:18:17 +0200
Subject: [PATCH] added constant to store the last data file key.

---
 src/main/java/de/neemann/digital/core/memory/ROM.java  | 10 +++++++---
 .../neemann/digital/gui/components/EditorFactory.java  |  9 +++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/neemann/digital/core/memory/ROM.java b/src/main/java/de/neemann/digital/core/memory/ROM.java
index 171f59585..95c37b27a 100644
--- a/src/main/java/de/neemann/digital/core/memory/ROM.java
+++ b/src/main/java/de/neemann/digital/core/memory/ROM.java
@@ -17,6 +17,10 @@ import java.io.File;
  * @author hneemann
  */
 public class ROM extends Node implements Element {
+    /**
+     * Key used to store the source file in the attribute set
+     */
+    public final static String LAST_DATA_FILE_KEY = "lastDataFile";
 
     /**
      * The ROMs {@link ElementTypeDescription}
@@ -51,9 +55,9 @@ public class ROM extends Node implements Element {
         data = attr.get(AttributeKey.Data);
         addrBits = attr.get(AttributeKey.AddrBits);
         showList = attr.get(AttributeKey.ShowListing);
-        if (showList)
-            listFile = attr.getFile("lastDataFile");
-        else
+        if (showList) {
+            listFile = attr.getFile(LAST_DATA_FILE_KEY);
+        } else
             listFile = null;
     }
 
diff --git a/src/main/java/de/neemann/digital/gui/components/EditorFactory.java b/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
index b2c411e7d..e8bb77872 100644
--- a/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
+++ b/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
@@ -4,6 +4,7 @@ import de.neemann.digital.core.element.AttributeKey;
 import de.neemann.digital.core.element.ElementAttributes;
 import de.neemann.digital.core.element.Rotation;
 import de.neemann.digital.core.memory.DataField;
+import de.neemann.digital.core.memory.ROM;
 import de.neemann.digital.lang.Lang;
 import de.neemann.gui.ErrorMessage;
 import de.neemann.gui.ToolTipAction;
@@ -194,9 +195,9 @@ public final class EditorFactory {
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     JFileChooser fc = new JFileChooser();
-                    fc.setSelectedFile(attr.getFile("lastDataFile"));
+                    fc.setSelectedFile(attr.getFile(ROM.LAST_DATA_FILE_KEY));
                     if (fc.showOpenDialog(panel) == JFileChooser.APPROVE_OPTION) {
-                        attr.setFile("lastDataFile", fc.getSelectedFile());
+                        attr.setFile(ROM.LAST_DATA_FILE_KEY, fc.getSelectedFile());
                         try {
                             data = new DataField(fc.getSelectedFile());
                         } catch (IOException e1) {
@@ -209,13 +210,13 @@ public final class EditorFactory {
                         @Override
                         public void actionPerformed(ActionEvent e) {
                             try {
-                                data = new DataField(attr.getFile("lastDataFile"));
+                                data = new DataField(attr.getFile(ROM.LAST_DATA_FILE_KEY));
                             } catch (IOException e1) {
                                 new ErrorMessage(Lang.get("msg_errorReadingFile")).addCause(e1).show(panel);
                             }
                         }
                     }
-                            .setActive(attr.getFile("lastDataFile") != null)
+                    .setActive(attr.getFile(ROM.LAST_DATA_FILE_KEY) != null)
                             .setToolTip(Lang.get("btn_reload_tt"))
                             .createJButton()
             );