From d3cb2550cefb79023af4a29142317a0219d05365 Mon Sep 17 00:00:00 2001 From: beratkocak Date: Sun, 22 Dec 2024 18:57:40 +0100 Subject: [PATCH] trying something --- PR2Projekt/pom.xml | 2 +- .../informatik/mvn/domain/LogHighscores.java | 4 ++-- .../informatik/mvn/gui/GameGUI.java | 13 +++++------ .../informatik/mvn/gui/HighscoreGUI.java | 23 ++++++++++--------- .../informatik/mvn/gui/MenuGUI.java | 21 +++++++++-------- .../informatik/mvn/test/HitoriTest.java | 22 +++++++++--------- 6 files changed, 44 insertions(+), 41 deletions(-) diff --git a/PR2Projekt/pom.xml b/PR2Projekt/pom.xml index fe7a4d4..fd43d06 100644 --- a/PR2Projekt/pom.xml +++ b/PR2Projekt/pom.xml @@ -61,7 +61,7 @@ -src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain +src.main.java diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java index 557685f..9c804f3 100644 --- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java +++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java @@ -1,4 +1,4 @@ -package src.main.java.de.hs_mannheim.informatik.mvn.domain; +package de.hs_mannheim.informatik.mvn.domain; import java.io.BufferedWriter; import java.io.FileNotFoundException; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class LogHighscores { - private static final Logger logger = LogManager.getLogger(LogHighscore.class); + private static final Logger logger = LogManager.getLogger(LogHighscores.class); public static void newRecord(String path, String username, String time) throws FileNotFoundException { String timePart = time.substring("Zeit: ".length()).trim(); diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java index 4b6f384..22fb8e0 100644 --- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java +++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java @@ -1,4 +1,4 @@ -package src.test.java.de.hs_mannheim.informatik.mvn.gui; +package de.hs_mannheim.informatik.mvn.gui; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -19,8 +19,7 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.SwingUtilities; -import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain; -import src.main.java.de.hs_mannheim.informatik.mvn.domain.LogHighscores; +import de.hs_mannheim.informatik.mvn.domain.*; public class GameGUI extends JFrame implements ActionListener { @@ -41,7 +40,7 @@ public class GameGUI extends JFrame implements ActionListener { b.setFocusPainted(false); b.setBackground(Color.WHITE); gameGrid.add(b); - String[] pos = HitoriMain.getCords(i,j); + String[] pos = HitoriMain2.getCords(i,j); b.addActionListener(e -> {paintButton(cl, main, b, pos, colors , madeMoves);}); } } @@ -58,7 +57,7 @@ public class GameGUI extends JFrame implements ActionListener { b1.addActionListener(e -> {backOneStep(cl, main, madeMoves, buttons, colors, gameGrid);}); JButton b2 = new JButton("Zurücksetzen"); b2.addActionListener(e -> {try { - HitoriMain.totalResetButton(cl, main, buttons, colors, madeMoves, data); + HitoriMain2.totalResetButton(cl, main, buttons, colors, madeMoves, data); } catch (FileNotFoundException e1) { e1.printStackTrace(); }}); @@ -71,7 +70,7 @@ public class GameGUI extends JFrame implements ActionListener { topGrid.add(timeLabel); topGrid.revalidate(); topGrid.repaint(); - boolean isOkay = HitoriMain.abgabeMöglich(path, data, colors); + boolean isOkay = HitoriMain2.abgabeMöglich(path, data, colors); levelFinished[0] = isOkay; Timer timer = new Timer(); startTimer(); @@ -96,7 +95,7 @@ public class GameGUI extends JFrame implements ActionListener { b3.addActionListener(e -> { try { - levelFinished[0] = HitoriMain.abgabeMöglich(path, data, colors); + levelFinished[0] = HitoriMain2.abgabeMöglich(path, data, colors); System.out.println("0000: " + levelFinished[0]); } catch (FileNotFoundException e1) { e1.printStackTrace(); diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java index c3fdd82..e796613 100644 --- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java +++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java @@ -1,4 +1,4 @@ -package src.test.java.de.hs_mannheim.informatik.mvn.gui; +package de.hs_mannheim.informatik.mvn.gui; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -16,7 +16,7 @@ import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain; +import de.hs_mannheim.informatik.mvn.domain.*; public class HighscoreGUI extends JFrame implements ActionListener { @@ -38,12 +38,12 @@ public class HighscoreGUI extends JFrame implements ActionListener { b0.addActionListener(e -> { int j = count[0]; String[] paths = { - "resources/Hitori_Highscores/Hitori4x4_leicht.txt", - "resources/Hitori_Highscores/Hitori5x5leicht.txt", - "resources/Hitori_Highscores/Hitori8x8leicht.txt", - "resources/Hitori_Highscores/Hitori8x8medium.txt", - "resources/Hitori_Highscores/Hitori10x10medium.txt", - "resources/Hitori_Highscores/Hitori15x15_medium.txt" + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori5x5leicht.txt", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori8x8leicht.txt", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori8x8medium.txt", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori10x10medium.txt", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori15x15_medium.txt" }; try { showHighscores(cl, main, paths[j]); @@ -69,21 +69,22 @@ public class HighscoreGUI extends JFrame implements ActionListener { } public static void showHighscores(CardLayout cl, JPanel main, String path) throws FileNotFoundException, IOException{ - HitoriMain.sortByTime(path); + HitoriMain2.sortByTime(path); JPanel mainPanel = new JPanel(new BorderLayout()); File file = new File(path); int i = 0; try (Scanner scanner = new Scanner(file)) { while (scanner.hasNextLine()) { - scanner.nextLine(); + if(scanner.nextLine() != "") { i++; + } } } catch (FileNotFoundException e) { e.printStackTrace(); } JPanel highscorePanel = new JPanel(new GridLayout(i,1,10,10)); if(i>0){ - ArrayList lines = HitoriMain.readFromFile(path); + ArrayList lines = HitoriMain2.readFromFile(path); for(String s: lines){ JLabel text = new JLabel(s); highscorePanel.add(text); diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java index 78f3e4c..12b4bcc 100644 --- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java +++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java @@ -1,4 +1,4 @@ -package src.test.java.de.hs_mannheim.informatik.mvn.gui; +package de.hs_mannheim.informatik.mvn.gui; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -13,7 +13,7 @@ import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain; +import de.hs_mannheim.informatik.mvn.domain.*; public class MenuGUI extends JFrame implements ActionListener { @@ -42,13 +42,16 @@ public class MenuGUI extends JFrame implements ActionListener { String currentDirectory = Paths.get("").toAbsolutePath().toString(); System.out.println("Current Working Directory: " + currentDirectory); String[] paths = { - "resources/Hitori_Spielfelder/Hitori4x4_leicht.csv", - "resources/Hitori_Spielfelder/Hitori5x5leicht.csv", - "resources/Hitori_Spielfelder/Hitori8x8leicht.csv", - "resources/Hitori_Spielfelder/Hitori8x8medium.csv", - "resources/Hitori_Spielfelder/Hitori10x10medium.csv", - "resources/Hitori_Spielfelder/Hitori15x15_medium.csv" + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori5x5leicht.csv", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori8x8leicht.csv", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori8x8medium.csv", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori10x10medium.csv", + "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori15x15_medium.csv" }; + // /Users/beratkocak/git/PR2Projekt/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn + + for (String path : paths) { File file = new File(path); if (file.exists()) { @@ -62,7 +65,7 @@ public class MenuGUI extends JFrame implements ActionListener { filepath[0] = paths[j]; filepath[1] = num[0]; try{ - HitoriMain.ablauf(cl, main, filepath); + HitoriMain2.ablauf(cl, main, filepath); } catch (FileNotFoundException s){ System.out.println("Fehler: " + s.getMessage()); } diff --git a/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java b/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java index fd69167..cd990e2 100644 --- a/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java +++ b/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java @@ -1,9 +1,9 @@ -package src.test.java.de.hs_mannheim.informatik.mvn.test; +package java.de.hs_mannheim.informatik.mvn.test; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; -import src.java.main.de.hs_mannheim.informatik.domain.HitoriMain; -import src.java.main.de.hs_mannheim.informatik.gui.GameGUI; +import de.hs_mannheim.informatik.mvn.domain.HitoriMain2; +import de.hs_mannheim.informatik.mvn.gui.GameGUI; import java.io.FileNotFoundException; import java.util.Arrays; @@ -16,7 +16,7 @@ class HitoriTest{ {"W", "W", "W"}, {"W", "W", "W"} }; - assertTrue(Arrays.deepEquals(array3x3, HitoriMain.makeColorArray(3))); + assertTrue(Arrays.deepEquals(array3x3, HitoriMain2.makeColorArray(3))); } @Test @@ -25,7 +25,7 @@ class HitoriTest{ {"W", "W", "W"}, {"W", "W", "W"}, }; - assertFalse(Arrays.deepEquals(array3x2, HitoriMain.makeColorArray(3))); + assertFalse(Arrays.deepEquals(array3x2, HitoriMain2.makeColorArray(3))); } @Test @@ -47,7 +47,7 @@ class HitoriTest{ {"B", "W", "W", "B"}}; String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Highscores/Hitori4x4_leicht.txt"; try { - assertFalse(HitoriMain.abgabeMöglich(path, data, colors)); + assertFalse(HitoriMain2.abgabeMöglich(path, data, colors)); } catch (FileNotFoundException e) { e.printStackTrace(); } @@ -67,7 +67,7 @@ class HitoriTest{ {"B", "W", "W", "B"}}; String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori4x4_leicht.csv"; try { - assertTrue(HitoriMain.abgabeMöglich(path, data, colors)); + assertTrue(HitoriMain2.abgabeMöglich(path, data, colors)); } catch (FileNotFoundException e) { e.printStackTrace(); } @@ -89,7 +89,7 @@ class HitoriTest{ {"W", "B", "W", "W", "W"}}; String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv"; try { - assertFalse(HitoriMain.abgabeMöglich(path, data, colors)); + assertFalse(HitoriMain2.abgabeMöglich(path, data, colors)); } catch (FileNotFoundException e) { e.printStackTrace(); } @@ -111,7 +111,7 @@ class HitoriTest{ {"B", "W", "W", "W", "B"}}; String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv"; try { - assertTrue(HitoriMain.abgabeMöglich(path, data, colors)); + assertTrue(HitoriMain2.abgabeMöglich(path, data, colors)); } catch (FileNotFoundException e) { e.printStackTrace(); } @@ -120,12 +120,12 @@ class HitoriTest{ @Test void test8() { String[] array = {"3", "4"}; - assertFalse(Arrays.deepEquals(array, HitoriMain.getCords(3, 3))); + assertFalse(Arrays.deepEquals(array, HitoriMain2.getCords(3, 3))); } @Test void test9() { String[] array = {"3", "4"}; - assertTrue(Arrays.deepEquals(array, HitoriMain.getCords(3, 4))); + assertTrue(Arrays.deepEquals(array, HitoriMain2.getCords(3, 4))); } }