Programmiermethoden_und_-werkzeuge
/
2022-2-WS_group_project_MiniGameProject
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactoring: Formating Code

master
Leon Montag 2 years ago
parent
8e80ee7ad4
commit
3e6c043e22
7 changed files with 141 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/Gui/ActionHandler.java
  2. 2
      src/main/java/Gui/StartGameGui.java
  3. 94
      src/main/java/Gui/gui.java
  4. 74
      src/main/java/game/runGame.java
  5. 27
      src/test/java/Gui/guiTest.java
  6. 61
      src/test/java/game/runGameTest.java
  7. 2
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

1
src/main/java/Gui/ActionHandler.java
View File

@ -3,7 +3,6 @@ package Gui;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class ActionHandler implements ActionListener {
public void actionPerformed(ActionEvent e) {

2
src/main/java/Gui/StartGameGui.java
View File

@ -5,7 +5,6 @@ import java.awt.event.ActionListener;
import game.runGame;
public class StartGameGui implements ActionListener {
@Override
@ -13,6 +12,7 @@ public class StartGameGui implements ActionListener {
gui.Panel.setVisible(false);
startGame();
}
public void startGame() {
GameGuiInterface Gui = new GameGui();
Gui.createGui();

94
src/main/java/Gui/gui.java
View File

@ -11,57 +11,57 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
public class gui implements GuiInterface {
public static JFrame Frame;
public static JButton StartBtn, CloseBtn;
public static JPanel Panel;
public static JLabel Label;
public static int width = 800, height = 600;
public static JFrame Frame;
public static JButton StartBtn, CloseBtn;
public static JPanel Panel;
public static JLabel Label;
public static int width = 800, height = 600;
@Override
public void StartMainMenu() {
createFrame();
createButtons();
createPanel();
}
@Override
public void createFrame(){
Frame = new JFrame("MiniGames");
Frame.setSize(width,height);
Frame.setLocationRelativeTo(null);
Frame.setResizable(false);
Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
}
@Override
public void StartMainMenu() {
createFrame();
createButtons();
createPanel();
}
@Override
public void createButtons() {
StartBtn = new JButton("Starte Spiel");
StartBtn.addActionListener(new StartGameGui());
CloseBtn = new JButton("Schließen");
CloseBtn.addActionListener(new ActionHandler());
@Override
public void createFrame() {
Frame = new JFrame("MiniGames");
Frame.setSize(width, height);
Frame.setLocationRelativeTo(null);
Frame.setResizable(false);
Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
}
@Override
public void createButtons() {
StartBtn = new JButton("Starte Spiel");
StartBtn.addActionListener(new StartGameGui());
CloseBtn = new JButton("Schließen");
CloseBtn.addActionListener(new ActionHandler());
}
@Override
public void createPanel() {
Panel = new JPanel();
Panel.setSize(width,height);
Panel.setLayout(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.ipadx = 300;
gbc.ipady = 100;
gbc.insets = new Insets(20, 0, 0, 0);
Label = new JLabel("MiniGames");
Label.setHorizontalAlignment(JLabel.CENTER);
Label.setFont(new Font("Serif", Font.BOLD, 28));
Panel.add(Label,gbc);
Panel.add(StartBtn,gbc);
Panel.add(CloseBtn,gbc);
Frame.add(Panel);
Frame.setVisible(true);
Panel.setVisible(true);
}
}
@Override
public void createPanel() {
Panel = new JPanel();
Panel.setSize(width, height);
Panel.setLayout(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.ipadx = 300;
gbc.ipady = 100;
gbc.insets = new Insets(20, 0, 0, 0);
Label = new JLabel("MiniGames");
Label.setHorizontalAlignment(JLabel.CENTER);
Label.setFont(new Font("Serif", Font.BOLD, 28));
Panel.add(Label, gbc);
Panel.add(StartBtn, gbc);
Panel.add(CloseBtn, gbc);
Frame.add(Panel);
Frame.setVisible(true);
Panel.setVisible(true);
}
}

74
src/main/java/game/runGame.java
View File

@ -8,58 +8,60 @@ import Gui.GameGui;
public class runGame {
public static String QuestionsPath = "QandA/Questions.txt";
public static String AnswersPath = "QandA/Answers.txt";
public static int lines = CountFileLines(QuestionsPath);
public static String[] arrQuestions = readFile(QuestionsPath);
public static String[] arrAnswers = readFile(AnswersPath);
public static String[] splitAns;
public static String AnswersPath = "QandA/Answers.txt";
public static int lines = CountFileLines(QuestionsPath);
public static String[] arrQuestions = readFile(QuestionsPath);
public static String[] arrAnswers = readFile(AnswersPath);
public static String[] splitAns;
public void run(int i) {
public void run(int i) {
splitAns = SplitAnswers(arrAnswers, i);
GameGui.QuestionLabel.setText(arrQuestions[i]);
GameGui.AnswersBtn1.setText(splitAns[0]);
GameGui.AnswersBtn2.setText(splitAns[1]);
GameGui.AnswersBtn3.setText(splitAns[2]);
GameGui.AnswersBtn4.setText(splitAns[3]);
GameGui.questionNr++;
}
public static int CountFileLines(String Path) {
GameGui.QuestionLabel.setText(arrQuestions[i]);
GameGui.AnswersBtn1.setText(splitAns[0]);
GameGui.AnswersBtn2.setText(splitAns[1]);
GameGui.AnswersBtn3.setText(splitAns[2]);
GameGui.AnswersBtn4.setText(splitAns[3]);
GameGui.questionNr++;
}
public static int CountFileLines(String Path) {
int Numlines = 0;
try {
BufferedReader reader = new BufferedReader(new FileReader(Path));
while (reader.readLine() != null) {
Numlines++;
}
reader.close();
} catch (IOException e) {
e.printStackTrace();
}
try {
BufferedReader reader = new BufferedReader(new FileReader(Path));
while (reader.readLine() != null) {
Numlines++;
}
reader.close();
} catch (IOException e) {
e.printStackTrace();
}
return Numlines + 1;
return Numlines+1;
}
}
public static String[] readFile(String Path) {
public static String[] readFile(String Path) {
BufferedReader reader;
String[] Arr = new String[lines];
try {
reader = new BufferedReader(new FileReader(Path));
String line = reader.readLine();
int i = 0;
while (line != null) {
Arr[i] = line;
line = reader.readLine();
i++;
}
reader.close();
while (line != null) {
Arr[i] = line;
line = reader.readLine();
i++;
}
reader.close();
} catch (IOException e) {
e.printStackTrace();
}
return Arr;
}
public static String[] SplitAnswers(String[] data2, int i) {
String[] parts = data2[i].split(",");
return parts;
}
String[] parts = data2[i].split(",");
return parts;
}
}

27
src/test/java/Gui/guiTest.java
View File

@ -15,40 +15,39 @@ class guiTest {
@Test
void testCreateFrame() {
//arrange
// arrange
int FrameWitdh = 800;
int FrameHeight = 600;
//act
// act
assertEquals(FrameWitdh, gui.Frame.getWidth());
assertEquals(FrameHeight, gui.Frame.getHeight());
assertEquals(FrameHeight, gui.Frame.getHeight());
}
@Test
public void testCreateButtons() {
//arrange
// arrange
String Start = "Starte Spiel";
String Close = "Schließen";
//act
// act
String StartTarget = gui.StartBtn.getText();
String CloseTarget = gui.CloseBtn.getText();
//assert
assertEquals(Start,StartTarget);
assertEquals(Close,CloseTarget);
// assert
assertEquals(Start, StartTarget);
assertEquals(Close, CloseTarget);
}
@Test
public void testCreatePanel() {
//arrange
// arrange
int NumPanels = 3;
//act
// act
int TargetNumPanels = gui.Panel.getComponents().length;
//assert
assertEquals(NumPanels,TargetNumPanels);
// assert
assertEquals(NumPanels, TargetNumPanels);
}
}

61
src/test/java/game/runGameTest.java
View File

@ -17,57 +17,56 @@ class runGameTest {
@Test
public void testCountFileLinesWithThreeLines() {
//arrange
// arrange
int numLines = 0;
File file;
File file;
try {
file = File.createTempFile("temp", ".txt");
FileWriter writer = new FileWriter(file);
writer.write("Zeile 1\n");
writer.write("Zeile 2\n");
writer.write("Zeile 3\n");
writer.close();
//act
numLines = runGame.CountFileLines(file.getAbsolutePath());
FileWriter writer = new FileWriter(file);
writer.write("Zeile 1\n");
writer.write("Zeile 2\n");
writer.write("Zeile 3\n");
writer.close();
// act
numLines = runGame.CountFileLines(file.getAbsolutePath());
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
//assert
assertEquals(4, numLines);
// assert
assertEquals(4, numLines);
}
@Test
public void testReadFile(){
File file;
public void testReadFile() {
File file;
try {
file = File.createTempFile("temp", ".txt");
FileWriter writer = new FileWriter(file);
writer.write("Zeile 1\n");
writer.write("Zeile 2\n");
writer.write("Zeile 3\n");
writer.close();
String[] lines = runGame.readFile(file.getAbsolutePath());
assertEquals("Zeile 1", lines[0]);
assertEquals("Zeile 2", lines[1]);
assertEquals("Zeile 3", lines[2]);
FileWriter writer = new FileWriter(file);
writer.write("Zeile 1\n");
writer.write("Zeile 2\n");
writer.write("Zeile 3\n");
writer.close();
String[] lines = runGame.readFile(file.getAbsolutePath());
assertEquals("Zeile 1", lines[0]);
assertEquals("Zeile 2", lines[1]);
assertEquals("Zeile 3", lines[2]);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
@Test
public void testSplitAnswers() {
String[] StringToSplit = {"Das,ist,ein,Test", "1,2,3,4"};
String[] parts = runGame.SplitAnswers(StringToSplit, 1);
assertEquals(4, parts.length);
assertEquals("1", parts[0]);
assertEquals("2", parts[1]);
assertEquals("3", parts[2]);
assertEquals("4", parts[3]);
String[] StringToSplit = { "Das,ist,ein,Test", "1,2,3,4" };
String[] parts = runGame.SplitAnswers(StringToSplit, 1);
assertEquals(4, parts.length);
assertEquals("1", parts[0]);
assertEquals("2", parts[1]);
assertEquals("3", parts[2]);
assertEquals("4", parts[3]);
}
}

2
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@ -1,6 +1,8 @@
C:\Users\Leon\MiniGameProject\src\main\java\Gui\ActionHandler.java
C:\Users\Leon\MiniGameProject\src\main\java\Gui\GameGuiInterface.java
C:\Users\Leon\MiniGameProject\src\main\java\Gui\gui.java
C:\Users\Leon\MiniGameProject\src\main\java\game\runGame.java
C:\Users\Leon\MiniGameProject\src\main\java\main.java
C:\Users\Leon\MiniGameProject\src\main\java\Gui\StartGameGui.java
C:\Users\Leon\MiniGameProject\src\main\java\Gui\GameGui.java
C:\Users\Leon\MiniGameProject\src\main\java\Gui\GuiInterface.java
Write Preview
Loading…
Cancel
Save