3010293
/
PR2-Gruppenprojekt
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 3010293:b2d94176da46de47514a852e6fbb84fed92c5147
Branches Tags
3010293:main
3010293:gui
3010293:domainBranch
..
compare: 3010293:15dab1e2b216c70c296840fbf16efc309c9504cf
Branches Tags
3010293:main
3010293:gui
3010293:domainBranch

No commits in common. "b2d94176da46de47514a852e6fbb84fed92c5147" and "15dab1e2b216c70c296840fbf16efc309c9504cf" have entirely different histories.
b2d94176da ... 15dab1e2b2

7 changed files with 12 additions and 78 deletions
Show Stats Expand all files Collapse all files

34
PR2Projekt/.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<<<<<<< HEAD
<!-- JRE System Library -->
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
@ -46,40 +46,14 @@
<!-- Output Folder -->
<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">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="module" value="true"/>
</attributes>
</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="lib" path="src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java"/>
<classpathentry kind="output" path="bin"/>
</classpathentry>
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
</classpath>

7
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java
View File

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

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

10
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
View File

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

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
View File

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

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
View File

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

11
PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java → PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
View File

@ -1,8 +1,4 @@
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;
package java.de.hs_mannheim.informatik.mvn.test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
@ -14,11 +10,6 @@ import org.junit.jupiter.api.Test;
import java.io.FileNotFoundException;
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{
@Test