diff --git a/bin/coursework/Main.class b/bin/coursework/Main.class index bd8e82f3de7abd33e65466a9ef376d862e3b6e08..7830df1d45c823fed8ad31465aa8df7bbcfe4d74 100644 Binary files a/bin/coursework/Main.class and b/bin/coursework/Main.class differ diff --git a/mathdokuCage.txt b/mathdokuCage.txt new file mode 100644 index 0000000000000000000000000000000000000000..6db4b916c980a4511611ff780330fba7f6c9114b --- /dev/null +++ b/mathdokuCage.txt @@ -0,0 +1,15 @@ +11+ 1,7 +2÷ 2,3 +20x 4,10 +6x 5,6,12,18 +3- 8,9 +3÷ 11,17 +240x 13,14,19,20 +6x 15,16 +6x 21,27 +7+ 22,28,29 +30x 23,24 +6x 25,26 +9+ 30,36 +8+ 31,32,33 +2÷ 34,35 \ No newline at end of file diff --git a/src/coursework/Main.java b/src/coursework/Main.java index 06dabe9a3ad52a52b76ca451c17efd0a47fe417b..656035c77a7801652a483eea42525f77cbbb0b1e 100644 --- a/src/coursework/Main.java +++ b/src/coursework/Main.java @@ -1,5 +1,10 @@ package coursework; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; + import javafx.application.*; import javafx.event.EventHandler; import javafx.geometry.Insets; @@ -132,8 +137,19 @@ public class Main extends Application { topHBox.getChildren().addAll(loadGameFileButton, showMistakesButton, loadGameTextInputButton); + final String PATH = "C:\\Java Eclipse Workspace\\Programming II Coursework\\mathdokuCage.txt"; loadGameFileButton.setOnAction(e -> { - + try { + BufferedReader file = new BufferedReader(new FileReader(PATH)); + String line; + while ((line = file.readLine()) != null) { + System.out.println(line); + } + } catch (FileNotFoundException e1) { + e1.printStackTrace(); + } catch (IOException e2) { + e2.printStackTrace(); + } }); return topHBox; @@ -193,11 +209,11 @@ public class Main extends Application { private void setupCages() { new Cage(new int[] {0,6},11,"+"); - new Cage(new int[] {1,2},2,"/"); + new Cage(new int[] {1,2},2,"�"); new Cage(new int[] {3,9},20,"x"); new Cage(new int[] {7,8},3,"-"); new Cage(new int[] {4,5,11,17},6,"x"); - new Cage(new int[] {10, 16},3,"/"); + new Cage(new int[] {10, 16},3,"�"); new Cage(new int[] {12,13,18,19},240,"x"); new Cage(new int[] {14,15},6,"x"); new Cage(new int[] {24,25},6,"x"); @@ -205,7 +221,7 @@ public class Main extends Application { new Cage(new int[] {21,27,28},7,"+"); new Cage(new int[] {22,23},30,"x"); new Cage(new int[] {30,31,32},8,"+"); - new Cage(new int[] {33,34},2,"/"); + new Cage(new int[] {33,34},2,"�"); new Cage(new int[] {29,35},9,"+"); }