Risolta issue del commit precedente ed aggiunta piccola miglioria gra…

…fica.
teamunivr · Mar 5, 2018 · bec3c8f · bec3c8f
1 parent a4c1631
commit bec3c8f
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/it/teamunivr/powerstrips/view/PreferenceController.java b/src/it/teamunivr/powerstrips/view/PreferenceController.java
@@ -39,6 +39,15 @@ private boolean setTreeView() {
         root = new TreeItem<>();
         Map<String, ArrayList<String>> itemMap;
 
+        MenuItem addType = new MenuItem("Aggiungi Tipologia");
+        addType.setOnAction(t -> root.getChildren().add(new TreeItem<>("Nuova Tipologia")));
+
+        treeView.setContextMenu(new ContextMenu(addType));
+        treeView.setRoot(root);
+        treeView.setShowRoot(false);
+        treeView.setCellFactory(p -> new CustomTextFieldTreeCell());
+        treeView.setEditable(true);
+
         try {
             itemMap = Config.getInstance().getLoanableItems();
         } catch (ParseException e) {
@@ -57,17 +66,6 @@ private boolean setTreeView() {
             root.getChildren().add(tmp);
         }
 
-        MenuItem addType = new MenuItem("Aggiungi Tipologia");
-
-        addType.setOnAction(t -> root.getChildren().add(new TreeItem<>("Nuova Tipologia")));
-
-        treeView.setRoot(root);
-        treeView.setShowRoot(false);
-        treeView.setCellFactory(p -> new CustomTextFieldTreeCell());
-        treeView.setEditable(true);
-
-        treeView.setContextMenu(new ContextMenu(addType));
-
         return true;
     }
 
@@ -215,10 +213,13 @@ public String fromString(String string) {
             addTypeMenuItem.setOnAction(t -> root.getChildren().add(new TreeItem<>("Nuova Tipologia")));
 
             addIDMenuItem.setOnAction(t -> {
-                if (getTreeItem().getParent() == root)
-                    getTreeItem().getChildren().add(new TreeItem<>("Nuovo ID"));
+                TreeItem<String> newItem = new TreeItem<>("Nuovo ID");
+                if (getTreeItem().getParent() == root) {
+                    getTreeItem().setExpanded(true);
+                }
                 else if (getTreeItem().getParent() != null) {
-                    getTreeItem().getParent().getChildren().add(new TreeItem<>("Nuovo ID"));
+                    getTreeItem().getParent().setExpanded(true);
+                    getTreeItem().getParent().getChildren().add(newItem);
                 }
             });