Compare commits

...

2 Commits

7 changed files with 78 additions and 12 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<<<<<<< HEAD <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<!-- JRE System Library --> <!-- JRE System Library -->
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes> <attributes>
@ -46,14 +46,40 @@
<!-- Output Folder --> <!-- Output Folder -->
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
=======
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="module" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="lib" path="src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java"/> <classpathentry kind="lib" path="src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342 </classpathentry>
</classpath> </classpath>

View File

@ -1,4 +1,4 @@
package domain; package de.hs_mannheim.informatik.mvn.domain;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -20,8 +20,9 @@ import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import gui.GameGUI; import de.hs_mannheim.informatik.mvn.gui.GameGUI;
import gui.MenuGUI; import de.hs_mannheim.informatik.mvn.gui.MenuGUI;
public class HitoriMain extends JFrame implements ActionListener{ public class HitoriMain extends JFrame implements ActionListener{

View File

@ -1,15 +1,15 @@
package de.hs_mannheim.informatik.mvn.domain; package de.hs_mannheim.informatik.mvn.domain;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.lang.System.Logger;
import java.util.Scanner; import java.util.Scanner;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class LogHighscores { public class LogHighscores {
private static final Logger logger = LogManager.getLogger(LogHighscores.class); //private static final Logger logger = LogManager.getLogger(LogHighscores.class);
public static void newRecord(String path, String username, String time) throws FileNotFoundException { public static void newRecord(String path, String username, String time) throws FileNotFoundException {
String timePart = time.substring("Zeit: ".length()).trim(); String timePart = time.substring("Zeit: ".length()).trim();
@ -26,7 +26,10 @@ public class LogHighscores {
sc.nextLine(); sc.nextLine();
} }
sc.close(); sc.close();
/*
=======
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) { try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) {
String eintrag = timePart + " " + username; String eintrag = timePart + " " + username;
logger.info("Neuer Eintrag: {}", eintrag); logger.info("Neuer Eintrag: {}", eintrag);
@ -36,5 +39,6 @@ public class LogHighscores {
} catch (IOException e) { } catch (IOException e) {
logger.error("Fehler beim Schreiben in die Datei: " + filepath, e); logger.error("Fehler beim Schreiben in die Datei: " + filepath, e);
} }
*/
} }
} }

View File

@ -1,4 +1,9 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.Color; import java.awt.Color;
@ -18,7 +23,12 @@ import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
import de.hs_mannheim.informatik.mvn.domain.LogHighscores;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class GameGUI extends JFrame implements ActionListener { public class GameGUI extends JFrame implements ActionListener {

View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
@ -16,7 +20,11 @@ import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class HighscoreGUI extends JFrame implements ActionListener { public class HighscoreGUI extends JFrame implements ActionListener {

View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
@ -13,7 +17,11 @@ import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class MenuGUI extends JFrame implements ActionListener { public class MenuGUI extends JFrame implements ActionListener {

View File

@ -1,4 +1,8 @@
package java.de.hs_mannheim.informatik.mvn.test; package de.hs_mannheim.informatik.mvn.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -10,6 +14,11 @@ import org.junit.jupiter.api.Test;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.Arrays; import java.util.Arrays;
import org.junit.jupiter.api.Test;
import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
import de.hs_mannheim.informatik.mvn.gui.GameGUI;
class HitoriTest{ class HitoriTest{
@Test @Test