fixed a bug with the remove last game feature

stieglma · Sep 11, 2015 · 2f19b3e · 2f19b3e
1 parent b5001f3
commit 2f19b3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Schafkopfauswerter.jar b/Schafkopfauswerter.jar
diff --git a/src/main/java/RemoveLastGame.aj b/src/main/java/RemoveLastGame.aj
@@ -1,3 +1,4 @@
+import java.awt.Button;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -12,6 +13,7 @@ import me.stieglmaier.schafkopfAuswerter.view.GUI;
 public privileged aspect RemoveLastGame {
 
     private GUI gui;
+    private JButton buttonRemoveLastGame;
 
     /**
      * catch constructor call, so that we have the correct gui, to refer to everywhere
@@ -36,11 +38,16 @@ public privileged aspect RemoveLastGame {
         return false;
     }
 
+    after() : execution(* GameData.addData(*)) {
+        this.buttonRemoveLastGame.setEnabled(true);
+    }
+
     /** add remove last game button */
     after() returning(JPanel panel): call(JPanel GUI.createButtonPane()) {
-        JButton buttonRemoveLastGame = new JButton("letztes Spiel löschen");
-        buttonRemoveLastGame.addActionListener(new RemoveLastGameListener());
+        this.buttonRemoveLastGame = new JButton("letztes Spiel löschen");
+        this.buttonRemoveLastGame.addActionListener(new RemoveLastGameListener());
         panel.add(buttonRemoveLastGame);
+        this.buttonRemoveLastGame.setEnabled(false);
     }
 
     /** catch execution of removelastgamelistener and remove the game + update ui */
@@ -50,8 +57,9 @@ public privileged aspect RemoveLastGame {
             gui.table.updateUI();
             gui.updateValues();
         }
+
         if(gui.model.getGameData().size() <= 1) {
-            gui.tabbedPane.setEnabledAt(1, false);
+            this.buttonRemoveLastGame.setEnabled(false);
         }
     }
 

diff --git a/src/main/java/me/stieglmaier/schafkopfAuswerter/view/GUI.java b/src/main/java/me/stieglmaier/schafkopfAuswerter/view/GUI.java
@@ -105,8 +105,6 @@ private JTabbedPane createTabbedPane() {
         tabbedPane.addTab("Einstellungen", null, new ConfigPopup(this), null);
         tabbedPane.addTab("Tabelle", null, scrollPane, null);
 
-        tabbedPane.setEnabledAt(1, false);
-
         return tabbedPane;
     }
 }