From 38f46612229ec40ea624934e596d24590836ca9b Mon Sep 17 00:00:00 2001
From: steyer <steyer10@gmail.com>
Date: Mon, 2 Dec 2019 19:10:58 +0100
Subject: [PATCH] =?UTF-8?q?F=C3=A9lk=C3=A9sz=20StartWindow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manualtest/game/StartWindowTest.java | 2 +-
src/game/StartMenuButtonsListener.java | 10 +++++
src/game/StartModel.java | 16 ++++---
src/game/StartWindow.java | 5 +++
test/game/GameLogicTest.java | 59 ++++++++++++--------------
test/game/JsonTest.java | 3 --
6 files changed, 55 insertions(+), 40 deletions(-)
create mode 100644 src/game/StartMenuButtonsListener.java
diff --git a/manualtest/game/StartWindowTest.java b/manualtest/game/StartWindowTest.java
index 7ab092f..1c21654 100644
--- a/manualtest/game/StartWindowTest.java
+++ b/manualtest/game/StartWindowTest.java
@@ -10,7 +10,7 @@ public class StartWindowTest {
startWindowFrame.setVisible(true);
StartModel start = new StartModel();
- start.loadFromFile();
+ //start.loadFromFile();
}
}
diff --git a/src/game/StartMenuButtonsListener.java b/src/game/StartMenuButtonsListener.java
new file mode 100644
index 0000000..80550c3
--- /dev/null
+++ b/src/game/StartMenuButtonsListener.java
@@ -0,0 +1,10 @@
+package game;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class StartMenuButtonsListener implements ActionListener {
+ public void actionPerformed(ActionEvent e) {
+
+ }
+}
diff --git a/src/game/StartModel.java b/src/game/StartModel.java
index 16b98d1..a3d7048 100644
--- a/src/game/StartModel.java
+++ b/src/game/StartModel.java
@@ -1,17 +1,17 @@
package game;
-import javax.json.Json;
-import javax.json.JsonWriter;
import javax.swing.*;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.File;
+import java.io.FileNotFoundException;
public class StartModel {
- private JFrame startFrame;
+ //TODO megoldás a gomb listener-ekre
+ private StartWindow startFrame;
private JFileChooser fileChooser;
- GameModel game;
- GameBoard board;
+ private GameModel game;
+ private GameBoard board;
public StartModel(){
startFrame = new StartWindow();
@@ -24,6 +24,12 @@ public class StartModel {
int returnVal = fileChooser.showOpenDialog(startFrame);
if (returnVal == JFileChooser.APPROVE_OPTION) {
File selected = fileChooser.getSelectedFile();
+ try {
+ board = GameBoardJson.loadFromFile(selected);
+ startFrame.setTextFieldMessage(selected.getName() + "loaded.");
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
}
}
}
diff --git a/src/game/StartWindow.java b/src/game/StartWindow.java
index c80173f..d833d85 100644
--- a/src/game/StartWindow.java
+++ b/src/game/StartWindow.java
@@ -14,6 +14,7 @@ public class StartWindow extends JFrame {
setDefaultCloseOperation(EXIT_ON_CLOSE);
loadFileTextField = new JTextField("No file loaded.");
+ loadFileTextField.setEditable(false);
add(loadFileTextField);
JButton loadButton = new JButton("Load");
@@ -29,4 +30,8 @@ public class StartWindow extends JFrame {
}
+
+ public void setTextFieldMessage (String message){
+ loadFileTextField.setText(message);
+ }
}
diff --git a/test/game/GameLogicTest.java b/test/game/GameLogicTest.java
index 437381e..d10e875 100644
--- a/test/game/GameLogicTest.java
+++ b/test/game/GameLogicTest.java
@@ -1,40 +1,37 @@
package game;
-//import static junit.framework.Assert.assertFalse;
-//import static junit.framework.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class GameLogicTest {
-
- private GameModel testModel;
-
- @BeforeEach
- void setUp() throws Exception {
- testModel = new GameModel(5,5);
- }
-
- @Test
- void testStep1() {
- testModel.setValueAt(true, 0, 1); //-+ -> ++
- testModel.setValueAt(true, 1, 0); //++ -> ++
- testModel.setValueAt(true, 1, 1);
-
- testModel.step();
-
- assertTrue((boolean) testModel.getValueAt(0, 0));
- assertTrue((boolean) testModel.getValueAt(0, 1));
- assertTrue((boolean) testModel.getValueAt(1, 0));
- assertTrue((boolean) testModel.getValueAt(1, 1));
-
- testModel.step();
-
- assertTrue((boolean) testModel.getValueAt(0, 0));
- assertTrue((boolean) testModel.getValueAt(0, 1));
- assertTrue((boolean) testModel.getValueAt(1, 0));
- assertTrue((boolean) testModel.getValueAt(1, 1));
- }
+
+ private GameModel testModel;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ testModel = new GameModel(5,5);
+ }
+
+ @Test
+ void testStep1() {
+ testModel.setValueAt(true, 0, 1); //-+ -> ++
+ testModel.setValueAt(true, 1, 0); //++ -> ++
+ testModel.setValueAt(true, 1, 1);
+
+ testModel.step();
+
+ assertTrue((boolean) testModel.getValueAt(0, 0));
+ assertTrue((boolean) testModel.getValueAt(0, 1));
+ assertTrue((boolean) testModel.getValueAt(1, 0));
+ assertTrue((boolean) testModel.getValueAt(1, 1));
+
+ testModel.step();
+
+ assertTrue((boolean) testModel.getValueAt(0, 0));
+ assertTrue((boolean) testModel.getValueAt(0, 1));
+ assertTrue((boolean) testModel.getValueAt(1, 0));
+ assertTrue((boolean) testModel.getValueAt(1, 1));
+ }
}
diff --git a/test/game/JsonTest.java b/test/game/JsonTest.java
index 4e5e8f7..80d73fc 100644
--- a/test/game/JsonTest.java
+++ b/test/game/JsonTest.java
@@ -2,11 +2,8 @@ package game;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.*;
-import junit.framework.Assert.*;
-
import javax.swing.*;
import java.io.File;
import java.io.FileNotFoundException;
--
GitLab