From fa0d53524c3d109b7588bf3f8f09477725d403bb Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Thu, 16 Apr 2020 09:59:19 +0200
Subject: [PATCH] Flytter CardRectangle ut av CardChoiceScreen

---
 .../gamewrapper/screens/CardChoiceScreen.java | 26 +----------------
 .../gamewrapper/screens/CardRectangle.java    | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java

diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
index f182dbb..06081a5 100644
--- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
@@ -45,7 +45,7 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
     private final int maxCards;
     private final Stage stage;
     private final InputMultiplexer inputMultiplexer;
-    private ProgrammingCardDeck deck;
+    private final ProgrammingCardDeck deck;
 
     /**
      * Instantiates a new card choice screen
@@ -238,28 +238,4 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
         }
         return false;
     }
-}
-
-/**
- * A helper class for keeping track of card information and a rectangle
- */
-class CardRectangle {
-    protected final Rectangle rectangle;
-    protected final ProgrammingCard card;
-    protected boolean selected = false;
-
-    /**
-     * Instantiates a new card rectangle
-     * @param rectangle The rectangle of this card rectangle
-     * @param card The card of this card rectangle
-     */
-    CardRectangle(Rectangle rectangle, ProgrammingCard card) {
-        this.rectangle = rectangle;
-        this.card = card;
-    }
-
-    @Override
-    public String toString() {
-        return card.toString();
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java
new file mode 100644
index 0000000..8708421
--- /dev/null
+++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardRectangle.java
@@ -0,0 +1,29 @@
+package inf112.fiasko.roborally.gamewrapper.screens;
+
+import inf112.fiasko.roborally.objects.ProgrammingCard;
+
+import java.awt.*;
+
+/**
+ * A helper class for keeping track of card information and a rectangle
+ */
+public class CardRectangle {
+    protected final Rectangle rectangle;
+    protected final ProgrammingCard card;
+    protected boolean selected = false;
+
+    /**
+     * Instantiates a new card rectangle
+     * @param rectangle The rectangle of this card rectangle
+     * @param card The card of this card rectangle
+     */
+    CardRectangle(Rectangle rectangle, ProgrammingCard card) {
+        this.rectangle = rectangle;
+        this.card = card;
+    }
+
+    @Override
+    public String toString() {
+        return card.toString();
+    }
+}
\ No newline at end of file