From 61b9ece199b7be487664e28adb6ad1d1ef70b2a2 Mon Sep 17 00:00:00 2001
From: Jonas <jonas.goergen@yahoo.de>
Date: Thu, 7 May 2020 12:58:44 +0200
Subject: [PATCH 1/2] Fix wrong action listener for ButtonSaveAsAction

---
 src/view/JAlphaNotationGUI.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/view/JAlphaNotationGUI.java b/src/view/JAlphaNotationGUI.java
index 9d4239a..4fe128f 100644
--- a/src/view/JAlphaNotationGUI.java
+++ b/src/view/JAlphaNotationGUI.java
@@ -104,7 +104,7 @@ public class JAlphaNotationGUI {
     protected JButtonCompileViewActionListener ButtonCompileActionListener;
     protected JButtonNewViewActionListener ButtonNewActionListener;
     protected JSaveViewActionListener ButtonSaveActionListener;
-    protected JButtonSaveAsViewActionListener ButtonSaveAsActionListener;
+    protected JSaveAsViewActionListener ButtonSaveAsActionListener;
     protected JLoadViewActionListener ButtonLoadActionListener;
     protected JButtonPlayViewActionListener ButtonPlayActionListener;
     protected JButtonPauseViewActionListener ButtonPauseActionListener;
@@ -323,7 +323,7 @@ protected void InitListeners() {
         this.ButtonCompileActionListener = new JButtonCompileViewActionListener(this);
         this.ButtonNewActionListener = new JButtonNewViewActionListener(this);
         this.ButtonSaveActionListener = new JSaveViewActionListener(this);
-        this.ButtonSaveAsActionListener = new JButtonSaveAsViewActionListener(this);
+        this.ButtonSaveAsActionListener = new JSaveAsViewActionListener(this);
         this.ButtonLoadActionListener = new JLoadViewActionListener(this);
         this.ButtonPlayActionListener = new JButtonPlayViewActionListener(this);
         this.ButtonPauseActionListener = new JButtonPauseViewActionListener(this);
@@ -1293,11 +1293,11 @@ public void setButtonSaveActionListener(JSaveViewActionListener buttonSaveAction
         ButtonSaveActionListener = buttonSaveActionListener;
     }
 
-    public JButtonSaveAsViewActionListener getButtonSaveAsActionListener() {
+    public JSaveAsViewActionListener getButtonSaveAsActionListener() {
         return ButtonSaveAsActionListener;
     }
 
-    public void setButtonSaveAsActionListener(JButtonSaveAsViewActionListener buttonSaveAsActionListener) {
+    public void setButtonSaveAsActionListener(JSaveAsViewActionListener buttonSaveAsActionListener) {
         ButtonSaveAsActionListener = buttonSaveAsActionListener;
     }
 

From ccf02a97cbf763829e9b61bb33be21e24d7d6056 Mon Sep 17 00:00:00 2001
From: Jonas <jonas.goergen@yahoo.de>
Date: Thu, 7 May 2020 13:01:49 +0200
Subject: [PATCH 2/2] Fix labels not parsed to address, leading to
 NumberFormatException

---
 src/model/Compiler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/model/Compiler.java b/src/model/Compiler.java
index 5022fa8..320d891 100644
--- a/src/model/Compiler.java
+++ b/src/model/Compiler.java
@@ -371,10 +371,11 @@ private String[] addressLookup(Token token, int[] flags) {
                     addresses[i] = token.addrs[i];
                     break;
                 case Instruction.FLAG_LABEL:
-                    if (labelMap.get(token.addrs[i]) == null) {
+                    Integer labelAddr = labelMap.get(token.addrs[i]);
+                    if (labelAddr == null) {
                         throw new CompileException(token.getLineNumber(), "Undefined Label!");
                     }
-                    addresses[i] = token.addrs[i];
+                    addresses[i] = labelAddr.toString();
                     break;
                 default:
                     break;