Преглед на файлове

renaming files + adding ui stuff

Noah Vogt преди 3 години
родител
ревизия
9dc851abca
променени са 6 файла, в които са добавени 86 реда и са изтрити 17 реда
  1. 0 0
      src/cards/Karte.java
  2. 1 17
      src/cards/KartenDeck.java
  3. 26 0
      src/cards/MischMaschine.java
  4. 0 0
      src/game/Karten.java
  5. 15 0
      src/ui/Launcher.java
  6. 44 0
      src/ui/MainWindow.java

+ 0 - 0
cards/Karte.java → src/cards/Karte.java


+ 1 - 17
cards/KartenDeck.java → src/cards/KartenDeck.java

@@ -6,7 +6,7 @@ public class KartenDeck {
     private static final int MIN_DECK_SIZE = 0;
     private static final int MAX_DECK_SIZE = 52;
 
-    private ArrayList<Karte> kartenListe = new ArrayList<Karte>();
+    protected ArrayList<Karte> kartenListe = new ArrayList<Karte>();
 
     public KartenDeck() {
     }
@@ -71,20 +71,4 @@ public class KartenDeck {
     public void appendKarte(Karte karte) {
         this.kartenListe.add(karte);
     }
-
-    public static void main(String[] args) {
-        KartenDeck kartenDeck = new KartenDeck();
-        kartenDeck.generateFullDeck();
-        kartenDeck.print();
-        System.out.println(kartenDeck.getDeckSize());
-        kartenDeck.removeKarte(new Karte(Karte.Farbe.PIK, 10));
-        kartenDeck.removeKarte(new Karte(Karte.Farbe.PIK, 10));
-        System.out.println(kartenDeck.getDeckSize());
-        // kartenDeck.removeKarte(karo7);
-        // System.out.println(kartenDeck.getDeckSize());
-        for (Karte.Farbe farbe : Karte.Farbe.values()) {
-            System.out.println(farbe);
-        }
-
-    }
 }

+ 26 - 0
src/cards/MischMaschine.java

@@ -0,0 +1,26 @@
+package cards;
+
+import java.util.Collections;
+
+public class MischMaschine extends KartenDeck {
+    public void mischen() {
+        Collections.shuffle(this.kartenListe);
+    }
+
+    public static void main(String[] args) {
+        MischMaschine kartenDeck = new MischMaschine();
+        kartenDeck.generateFullDeck();
+        kartenDeck.mischen();
+        kartenDeck.print();
+        System.out.println(kartenDeck.getDeckSize());
+        kartenDeck.removeKarte(new Karte(Karte.Farbe.PIK, 10));
+        //kartenDeck.removeKarte(new Karte(Karte.Farbe.PIK, 10));
+        System.out.println(kartenDeck.getDeckSize());
+        // kartenDeck.removeKarte(karo7);
+        // System.out.println(kartenDeck.getDeckSize());
+        for (Karte.Farbe farbe : Karte.Farbe.values()) {
+            System.out.println(farbe);
+        }
+
+    }
+}

+ 0 - 0
game/Karten.java → src/game/Karten.java


+ 15 - 0
src/ui/Launcher.java

@@ -0,0 +1,15 @@
+package ui;
+
+import javax.swing.SwingUtilities;
+
+public class Launcher {
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                MainWindow main = new MainWindow();
+                main.show();
+            }
+        });
+    }
+}

+ 44 - 0
src/ui/MainWindow.java

@@ -0,0 +1,44 @@
+package ui;
+
+import java.awt.*;
+
+import javax.swing.*;
+
+public class MainWindow {
+    private JFrame frame;
+
+    public MainWindow() {
+        initialize();
+    }
+
+	private void initialize() {
+		frame = new JFrame();
+        frame.setTitle("ayyy");
+        frame.setLayout(new BorderLayout(10, 5));
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.setSize(800, 500);
+        /* center window if floating window management mode */
+        frame.setLocationRelativeTo(null);
+
+        BorderLayout borderLayout = new BorderLayout();
+        borderLayout.setHgap(10);
+        borderLayout.setVgap(10);
+        frame.setLayout(borderLayout);
+
+        frame.setResizable(false);
+        frame.setVisible(true);
+
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout(FlowLayout.CENTER, 10, 5));
+        panel.setBackground(Color.RED);
+        //panel.setPreferredSize(new Dimension(200,50));
+
+        Button button = new Button("TITLE");
+        panel.add(button);
+
+        frame.add(panel, BorderLayout.SOUTH);
+	}
+
+    public void show() {
+    }
+}