Changed all default editor to the treeView version

Users should now be able to edit all existing data
rexc159 · Mar 8, 2018 · 6975b34 · 6975b34
1 parent 1fac3b3
commit 6975b34
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/src/StellarisDK/FileClasses/Component/Component.java b/src/StellarisDK/FileClasses/Component/Component.java
@@ -10,11 +10,6 @@ public Component() {
         ui = new CompUI(this);
     }
 
-    public Component(int type) {
-        super();
-        ui = new CompUI(this);
-    }
-
     public Component(String input) {
         super(input);
         ui = new CompUI(this);
@@ -48,7 +43,7 @@ public void setType(int type){
 
     @Override
     public Component createNew() {
-        return new Component(0);
+        return new Component();
     }
 
     public String getGroup() {

diff --git a/src/StellarisDK/FileClasses/Event.java b/src/StellarisDK/FileClasses/Event.java
@@ -8,6 +8,7 @@ public class Event extends GenericData {
 
     public Event() {
         super();
+        this.type = "event";
         ui = new EventUI(this);
     }
 

diff --git a/src/StellarisDK/GUI/CompUI.java b/src/StellarisDK/GUI/CompUI.java
@@ -19,7 +19,7 @@ public class CompUI extends AbstractUI {
     TreeView treeView;
 
     public CompUI(Component obj) {
-        init("FXML/treeUI.fxml");
+        init("FXML/default.fxml");
         window.setText("Component Editor");
 //        loadCompSize();
         this.obj = obj;

diff --git a/src/StellarisDK/GUI/FXML/default.fxml b/src/StellarisDK/GUI/FXML/default.fxml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.layout.*?>
 <AnchorPane fx:id="main" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Label text="Editor Under Construction :(" />
+      <Label layoutY="4.0" text="Editor Under Construction :(" />
+      <TreeView fx:id="treeView" layoutY="25.0" maxWidth="1.7976931348623157E308" prefHeight="400.0" prefWidth="350.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
+      <Button id="btn_save" fx:id="btn_save" layoutX="197.0" layoutY="425.0" mnemonicParsing="false" text="Save" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="5.0" />
    </children>
 </AnchorPane>
diff --git a/src/StellarisDK/GUI/FXML/eventFX.fxml b/src/StellarisDK/GUI/FXML/eventFX.fxml
diff --git a/src/StellarisDK/GUI/FXML/treeUI.fxml b/src/StellarisDK/GUI/FXML/treeUI.fxml
diff --git a/src/StellarisDK/GUI/ModDescUI.java b/src/StellarisDK/GUI/ModDescUI.java
@@ -40,7 +40,7 @@ public void handle(ListView.EditEvent event) {
                         if (event.getClickCount() == 2) {
                             Node cell = event.getPickResult().getIntersectedNode();
                             if (cell instanceof ListView || ((ListCell) cell).getItem() == null) {
-                                ((ListView) node).getItems().add(((ListView) node).getItems().size(), new String());
+                                ((ListView) node).getItems().add(((ListView) node).getItems().size());
                             }
                         }
                     });

diff --git a/src/StellarisDK/GUI/guiController.java b/src/StellarisDK/GUI/guiController.java
@@ -189,9 +189,7 @@ private ContextMenu createCM(TreeCell cell) {
         });
         MenuItem delete = new MenuItem("Delete");
         delete.setOnAction(event -> {
-            if (cell.getTreeItem().getValue() instanceof GenericData) {
-                cell.getTreeItem().getParent().getChildren().remove(cell.getTreeItem());
-            } else if (cell.getTreeItem().getValue().toString().contains(".txt")) {
+            if(cell.getItem().toString().contains(".txt") || cell.getTreeItem().getParent().getValue().toString().contains(".txt")){
                 cell.getTreeItem().getParent().getChildren().remove(cell.getTreeItem());
             }
         });
@@ -226,7 +224,7 @@ private TreeItem createNew(String type) {
             case "component_sets":
                 return new TreeItem<>(new CompSet());
             case "component_templates":
-                return new TreeItem<>(new Component(0));
+                return new TreeItem<>(new Component());
             case "country_types":
             case "defines":
             case "deposits":
@@ -289,7 +287,9 @@ private TreeItem createNew(String type) {
             case "tradition_categories":
             case "traditions":
             case "traits":
+                break;
             case "events":
+                return new TreeItem<>(new Event());
             case "localisation":
         }
         return new TreeItem<>("Not Implemented");