aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAidan Ross <aross02@fairport.org>2023-05-25 11:12:56 -0400
committerAidan Ross <aross02@fairport.org>2023-05-25 11:12:56 -0400
commite08eadf079316e46dd7bf42db9bb311db968c91a (patch)
tree0168effa3d05610a0fe9ec00bcae148c6617aba4 /src/main
parent414d5128c379916a50a015210e6d7caced1825f5 (diff)
downloadNPEhero-e08eadf079316e46dd7bf42db9bb311db968c91a.tar.gz
NPEhero-e08eadf079316e46dd7bf42db9bb311db968c91a.tar.bz2
NPEhero-e08eadf079316e46dd7bf42db9bb311db968c91a.zip
These are zachs changes to level controller
Diffstat (limited to 'src/main')
-rw-r--r--src/main/Level.java9
-rw-r--r--src/main/LevelController.java8
2 files changed, 11 insertions, 6 deletions
diff --git a/src/main/Level.java b/src/main/Level.java
index ee60d47..8909e5b 100644
--- a/src/main/Level.java
+++ b/src/main/Level.java
@@ -35,11 +35,11 @@ public class Level
}
//all below is required for table view
- public Level() throws ParseException
+ public Level()
{
JSONParser jsonParser = new JSONParser(); //parser to read the file
- try(FileReader reader = new FileReader(".json"))
+ try(FileReader reader = new FileReader("metadata.json"))
{
Object obj = jsonParser.parse(reader);
@@ -61,7 +61,10 @@ public class Level
catch (IOException e)
{
e.printStackTrace();
- }
+ } catch (ParseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
public String getTitle() {
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index 3e10ed3..4ba34e1 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -1,5 +1,7 @@
package main;
+import org.json.simple.parser.ParseException;
+
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.image.Image;
@@ -28,16 +30,16 @@ public class LevelController
Difficulty d5 = new Difficulty();
d5.title = "Impossible";
- Level testLevel = new Level("test level class","testArtist");
+ Level testLevel = new Level();
//testLevel.setTitle("test level class");
testLevel.desc = "this level is being used to test the LevelController class";
- //testLevel.setAritst("testArtist");
+ //testLevel.setArtist("testArtist");
testLevel.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
testLevel.diffList.add(d1);
testLevel.diffList.add(d2);
levelList.add(testLevel);
- Level testLevel2 = new Level("another one", "testArtist2");
+ Level testLevel2 = new Level();
//testLevel2.setTitle("another one");
testLevel2.desc = "it can say something else too";
//testLevel2.setAritst("testArtist2");