Begin changing from map to set in observable config

speedment · Nov 21, 2015 · 348f578 · 348f578
1 parent fa87666
commit 348f578
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/src/main/java/com/speedment/internal/core/config/ChildHolderImpl.java b/src/main/java/com/speedment/internal/core/config/ChildHolderImpl.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;

diff --git a/src/main/java/com/speedment/internal/gui/config/AbstractParentProperty.java b/src/main/java/com/speedment/internal/gui/config/AbstractParentProperty.java
@@ -27,9 +27,10 @@
 import static java.util.Objects.requireNonNull;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
 import static javafx.collections.FXCollections.observableMap;
-import javafx.collections.ObservableMap;
+import javafx.collections.ObservableSet;
 
 /**
  *
@@ -51,6 +52,12 @@ public AbstractParentProperty(Speedment speedment, THIS prototype) {
     public final ChildHolder<CHILD> getChildren() {
         throw new UnsupportedOperationException("This method should not be used.");
     }
+
+    public final CHILD prepare(CHILD child) {
+        child.setParent(this);
+        child.setName(child.getInterfaceMainClass().getSimpleName() + "_" + child.hashCode());
+        return child;
+    }
 
     @Override
     public Stream<Node> traverse() {
@@ -88,15 +95,15 @@ protected IllegalArgumentException noChildWithNameException(Class<?> childType,
         );
     }
 
-    protected <CHILD extends Child<?>, THIS extends Node & Parent<? super CHILD>> ObservableMap<String, CHILD> copyChildrenFrom(THIS prototype, Class<CHILD> childType, BiFunction<Speedment, CHILD, CHILD> wrapper) {
+    protected <CHILD extends Child<?>, THIS extends Node & Parent<? super CHILD>> ObservableSet<CHILD> copyChildrenFrom(THIS prototype, Class<CHILD> childType, BiFunction<Speedment, CHILD, CHILD> wrapper) {
-        return observableMap(MapStream
+        return observableSet(
-            .fromValues(prototype.streamOf(childType), Node::getName)
+            prototype.streamOf(childType)
-            .mapValue(child -> {
+                .map(child -> {
-                final CHILD newChild = wrapper.apply(getSpeedment(), child);
+                    final CHILD newChild = wrapper.apply(getSpeedment(), child);
-                newChild.setParent(this);
+                    newChild.setParent(this);
-                return newChild;
+                    return newChild;
-            })
+                })
-            .toConcurrentNavigableMap()
+                .collect(toSet())
         );
     }
 }
diff --git a/src/main/java/com/speedment/internal/gui/config/DbmsProperty.java b/src/main/java/com/speedment/internal/gui/config/DbmsProperty.java
@@ -26,6 +26,7 @@
 import com.speedment.internal.core.config.utils.ConfigUtil;
 import com.speedment.stream.MapStream;
 import groovy.lang.Closure;
+import static java.util.Collections.newSetFromMap;
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -37,15 +38,15 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import static javafx.collections.FXCollections.observableMap;
-import javafx.collections.ObservableMap;
+import javafx.collections.ObservableSet;
 
 /**
  *
  * @author Emil Forslund
  */
 public final class DbmsProperty extends AbstractParentProperty<Dbms, Schema> implements Dbms, ChildHelper<Dbms, Project> {
 
-    private final ObservableMap<String, Schema> schemaChildren;
+    private final ObservableSet<Schema> schemaChildren;
     private final StringProperty ipAddress;
     private final IntegerProperty port;
     private final StringProperty username;
@@ -57,7 +58,7 @@ public final class DbmsProperty extends AbstractParentProperty<Dbms, Schema> imp
 
     public DbmsProperty(Speedment speedment) {
         super(speedment);
-        schemaChildren = observableMap(new ConcurrentSkipListMap<>());
+        schemaChildren = observableMap(newSetFromMap(new ConcurrentSkipListMap<>()));
         ipAddress      = new SimpleStringProperty();
         port           = new SimpleIntegerProperty();
         username       = new SimpleStringProperty();

diff --git a/src/main/java/com/speedment/internal/newgui/util/UISession.java b/src/main/java/com/speedment/internal/newgui/util/UISession.java
@@ -18,18 +18,21 @@
 
 import com.speedment.Speedment;
 import com.speedment.internal.gui.config.ProjectProperty;
+import java.io.File;
 import javafx.event.EventHandler;
 import javafx.stage.Stage;
-import static java.util.Objects.requireNonNull;
 import javafx.application.Application;
 import javafx.event.Event;
+import static java.util.Objects.requireNonNull;
 
 /**
  *
  * @author Emil Forslund
  */
 public final class UISession {
 
+    public final static File DEFAULT_GROOVY_LOCATION = new File("src/main/groovy/speedment.groovy");
+
     private final Speedment speedment;
     private final Application application;
     private final Stage stage;