Change project structure, embed resources into jar and remove libraries from source control

1 files changed, 10 insertions, 9 deletions

diff --git a/src/devmenu/LevelList.java b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
index f9b4207..8d5e0cb 100644..100755
--- a/src/devmenu/LevelList.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
@@ -1,17 +1,18 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
-import gui.Driver;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import net.sowgro.npehero.Driver;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import main.Level;
-import main.LevelController;
+import net.sowgro.npehero.main.Level;
+import net.sowgro.npehero.main.LevelController;
 
 public class LevelList 
 {
@@ -33,9 +34,9 @@ public class LevelList
         levels.getColumns().add(artistCol);
         levels.getColumns().add(validCol);
 
-        titleCol.setCellValueFactory(new PropertyValueFactory<Level, String>("title"));
-        artistCol.setCellValueFactory(new PropertyValueFactory<Level, String>("artist"));
-        validCol.setCellValueFactory(new PropertyValueFactory<Level, Boolean>("valid"));
+        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getTitle()));
+        artistCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getArtist()));
+        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid()));
 
         levels.setItems(LevelController.getLevelList());
 
@@ -44,7 +45,7 @@ public class LevelList
         edit.setOnAction(e -> new LevelEditor(levels.getSelectionModel().getSelectedItem()));
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> gui.Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem()));
+        remove.setOnAction(e -> Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem()));
 
         Button refresh = new Button("Refresh");
         refresh.setOnAction(e -> {