diff --git a/manualtest/game/JTableTest.java b/manualtest/game/JTableTest.java index 52170258d1e23be52b3a32074517685b309bea30..e8b6209a262828099a6b524677fab3e6b03d78fb 100644 --- a/manualtest/game/JTableTest.java +++ b/manualtest/game/JTableTest.java @@ -9,7 +9,12 @@ public class JTableTest { public static void main(String[] args) { GameModel testModel = new GameModel(10, 10); - testModel.setValueAt(true, 0, 0); + testModel.setValueAt(true, 4, 4); + testModel.setValueAt(true, 4, 5); + testModel.setValueAt(true, 4, 6); + testModel.setValueAt(true, 5, 3); + testModel.setValueAt(true, 5, 4); + testModel.setValueAt(true, 5, 5 ); JFrame testFrame = new JFrame(); testFrame.setLayout(new BorderLayout()); testFrame.add(new JTable(testModel)); diff --git a/manualtest/game/StartWindowTest.java b/manualtest/game/StartWindowTest.java index 2917cd49e1dd5d561c14dcf99bec73bde57b6f8c..7ab092fca6942cd23ba90ee049fe94f369e816a1 100644 --- a/manualtest/game/StartWindowTest.java +++ b/manualtest/game/StartWindowTest.java @@ -8,5 +8,9 @@ public class StartWindowTest { public static void main(String[] args) { JFrame startWindowFrame = new StartWindow(); startWindowFrame.setVisible(true); + + StartModel start = new StartModel(); + start.loadFromFile(); } + } diff --git a/src/game/GameBoardSaver.java b/src/game/GameBoardSaver.java new file mode 100644 index 0000000000000000000000000000000000000000..7152d37fe1b5288a8395266e8a3aab85a0af7f02 --- /dev/null +++ b/src/game/GameBoardSaver.java @@ -0,0 +1,5 @@ +package game; + +public class GameBoardSaver { + //TODO JFileChooser +} diff --git a/src/game/StartModel.java b/src/game/StartModel.java new file mode 100644 index 0000000000000000000000000000000000000000..30ef2d04c10d98005c25944064cd7b1751734a1d --- /dev/null +++ b/src/game/StartModel.java @@ -0,0 +1,23 @@ +package game; + +import javax.swing.*; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileNameExtensionFilter; + +public class StartModel { + private JFrame startFrame; + private JFileChooser fileChooser; + GameModel game; + GameBoard board; + + public StartModel(){ + startFrame = new StartWindow(); + fileChooser = new JFileChooser(); + FileFilter filter = new FileNameExtensionFilter("JSON File (.json)", "json"); + fileChooser.setFileFilter(filter); + } + + public void loadFromFile(){ + int returnVal = fileChooser.showOpenDialog(startFrame); + } +}