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

fixed merge conf

main
Berat Kocak 2024-12-22 19:41:58 +01:00
parent b4a7429374
commit 15dab1e2b2
5 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PR2Projekt/pom.xml
View File

@ -61,11 +61,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<<<<<<< HEAD
<mainClass>src.main.java</mainClass>
=======
<mainClass>src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain</mainClass>
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
</transformer>
</transformers>
</configuration>

6
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
View File

@ -1,8 +1,4 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.domain;
=======
package src.main.java.de.hs_mannheim.informatik.mvn.domain;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.io.BufferedWriter;
import java.io.FileNotFoundException;
@ -30,7 +26,7 @@ public class LogHighscores {
sc.nextLine();
}
sc.close();
try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) {
String eintrag = timePart + " " + username;
logger.info("Neuer Eintrag: {}", eintrag);

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 src.test.java.de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
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.*;
=======
import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
import src.main.java.de.hs_mannheim.informatik.mvn.domain.LogHighscores;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
public class GameGUI 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 src.test.java.de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
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.*;
=======
import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
public class MenuGUI extends JFrame implements ActionListener {

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

@ -1,18 +1,12 @@
<<<<<<< HEAD
package java.de.hs_mannheim.informatik.mvn.test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import de.hs_mannheim.informatik.mvn.domain.HitoriMain2;
import de.hs_mannheim.informatik.mvn.gui.GameGUI;
=======
package src.test.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;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.io.FileNotFoundException;
import java.util.Arrays;