Fix bug with duplicated schemas

src/main/java/com/speedment/code/TranslatorDecorator.java

@@ -18,7 +18,8 @@
 
 import com.speedment.annotation.Api;
 import com.speedment.config.db.trait.HasMainInterface;
-import com.speedment.internal.codegen.lang.models.File;
+import com.speedment.config.db.trait.HasName;
+import com.speedment.internal.core.code.JavaClassTranslator;
 
 /**
  *
@@ -28,6 +29,6 @@
  */
 @Api(version = "2.3")
 @FunctionalInterface
-public interface TranslatorDecorator<T extends HasMainInterface> {
-    void apply(Translator<T, File> translator);
+public interface TranslatorDecorator<T extends HasName & HasMainInterface> {
+    void apply(JavaClassTranslator<T> translator);
 }

src/main/java/com/speedment/component/CodeGenerationComponent.java

@@ -22,6 +22,7 @@
 import com.speedment.code.TranslatorDecorator;
 import com.speedment.code.TranslatorKey;
 import com.speedment.config.db.trait.HasMainInterface;
+import com.speedment.config.db.trait.HasName;
 import com.speedment.exception.SpeedmentException;
 import com.speedment.internal.codegen.base.Generator;
 import com.speedment.internal.codegen.lang.models.File;
@@ -71,7 +72,7 @@ default Class<CodeGenerationComponent> getComponentClass() {
      * @param constructor to use when producing Translators of the specified
      * type
      */
-    default <T extends HasMainInterface> void put(Class<T> clazz, TranslatorKey<T> tKey, TranslatorConstructor<T> constructor) {
+    default <T extends HasName & HasMainInterface> void put(Class<T> clazz, TranslatorKey<T> tKey, TranslatorConstructor<T> constructor) {
         put(clazz, tKey.getKey(), constructor);
     }
 
@@ -86,7 +87,7 @@ default <T extends HasMainInterface> void put(Class<T> clazz, TranslatorKey<T> t
      * @param constructor to use when producing Translators of the specified
      * type
      */
-    <T extends HasMainInterface> void put(Class<T> clazz, String key, TranslatorConstructor<T> constructor);
+    <T extends HasName & HasMainInterface> void put(Class<T> clazz, String key, TranslatorConstructor<T> constructor);
 
     /**
      * Adds a new {@code TranslatorDecorator} for the given class/key pair.
@@ -96,7 +97,7 @@ default <T extends HasMainInterface> void put(Class<T> clazz, TranslatorKey<T> t
      * @param tKey translatorKey to use
      * @param decorator the new decorator
      */
-    default <T extends HasMainInterface> void add(Class<T> clazz, TranslatorKey<T> tKey, TranslatorDecorator<T> decorator) {
+    default <T extends HasName & HasMainInterface> void add(Class<T> clazz, TranslatorKey<T> tKey, TranslatorDecorator<T> decorator) {
         add(clazz, tKey.getKey(), decorator);
     }
 
@@ -108,7 +109,7 @@ default <T extends HasMainInterface> void add(Class<T> clazz, TranslatorKey<T> t
      * @param key key to use
      * @param decorator the new decorator
      */
-    <T extends HasMainInterface> void add(Class<T> clazz, String key, TranslatorDecorator<T> decorator);
+    <T extends HasName & HasMainInterface> void add(Class<T> clazz, String key, TranslatorDecorator<T> decorator);
 
     /**
      * Removes the {@code TranslatorConstructor} for the given class/key pair.
@@ -117,7 +118,7 @@ default <T extends HasMainInterface> void add(Class<T> clazz, TranslatorKey<T> t
      * @param clazz CLass of the Document
      * @param tKey translatorKey to use
      */
-    default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T> tKey) {
+    default <T extends HasName & HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T> tKey) {
         remove(clazz, tKey.getKey());
     }
 
@@ -128,7 +129,7 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * @param clazz CLass of the Document
      * @param key key to use
      */
-    <T extends HasMainInterface> void remove(Class<T> clazz, String key);
+    <T extends HasName & HasMainInterface> void remove(Class<T> clazz, String key);
 
     /**
      * Returns a Stream of newly created {@code Translator Translators} for the
@@ -140,7 +141,7 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * @return a Stream of newly created {@code Translator Translators} for the
      * given Document
      */
-    <T extends HasMainInterface> Stream<? extends Translator<T, File>> translators(T document);
+    <T extends HasName & HasMainInterface> Stream<? extends Translator<T, File>> translators(T document);
 
     /**
      * Returns a Stream of newly created {@code Translator Translators} for the
@@ -154,7 +155,7 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * given Document
      * @throws SpeedmentException if the specified translator did not exist
      */
-    default <T extends HasMainInterface> Translator<T, File>
+    default <T extends HasName & HasMainInterface> Translator<T, File>
             findTranslator(T document, TranslatorKey<T> hasKey) throws SpeedmentException {
         return CodeGenerationComponent.this.findTranslator(document, hasKey.getKey());
     }
@@ -171,7 +172,7 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * Document
      * @throws SpeedmentException if the specified translator did not exist
      */
-    <T extends HasMainInterface> Translator<T, File> findTranslator(T document, String key) throws SpeedmentException;
+    <T extends HasName & HasMainInterface> Translator<T, File> findTranslator(T document, String key) throws SpeedmentException;
 
     /**
      * Returns the current {@link JavaLanguageNamer} used by Speedment.

src/main/java/com/speedment/internal/core/code/EntityAndManagerTranslator.java

@@ -27,7 +27,6 @@
 import com.speedment.config.db.Table;
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
-import static java.util.Objects.requireNonNull;
 
 /**
  *

src/main/java/com/speedment/internal/core/code/JavaClassTranslator.java

@@ -25,8 +25,6 @@
 import com.speedment.internal.util.JavaLanguageNamer;
 import static com.speedment.internal.util.document.DocumentUtil.relativeName;
 import static java.util.Objects.requireNonNull;
-import static com.speedment.internal.util.document.DocumentUtil.relativeName;
-import static java.util.Objects.requireNonNull;
 
 /**
  * A more specific {@link Translator} that results in a CodeGen {@link File}.

src/main/java/com/speedment/internal/core/platform/component/impl/CodeGenerationComponentImpl.java

@@ -25,10 +25,12 @@
 import com.speedment.config.db.Project;
 import com.speedment.config.db.Table;
 import com.speedment.config.db.trait.HasMainInterface;
+import com.speedment.config.db.trait.HasName;
 import com.speedment.exception.SpeedmentException;
 import com.speedment.internal.codegen.base.Generator;
 import com.speedment.internal.codegen.java.JavaGenerator;
 import com.speedment.internal.codegen.lang.models.File;
+import com.speedment.internal.core.code.JavaClassTranslator;
 import com.speedment.internal.core.code.entity.EntityImplTranslator;
 import com.speedment.internal.core.code.entity.EntityTranslator;
 import com.speedment.internal.core.code.lifecycle.SpeedmentApplicationMetadataTranslator;
@@ -53,7 +55,7 @@ public final class CodeGenerationComponentImpl extends Apache2AbstractComponent
     private final Map<Class<? extends HasMainInterface>, Map<String, TranslatorSettings<?>>> map;
     private Supplier<? extends JavaLanguageNamer> javaLanguageSupplier;
 
-    private final static class TranslatorSettings<T extends HasMainInterface> {
+    private final static class TranslatorSettings<T extends HasName & HasMainInterface> {
 
         private final String key;
         private final List<TranslatorDecorator<T>> decorators;
@@ -80,8 +82,11 @@ public List<TranslatorDecorator<T>> decorators() {
             return decorators;
         }
 
-        public Translator<T, File> createDecorated(Speedment speedment, Generator generator, T document) {
-            final Translator<T, File> translator = getConstructor().apply(speedment, generator, document);
+        public JavaClassTranslator<T> createDecorated(Speedment speedment, Generator generator, T document) {
+            @SuppressWarnings("unchecked")
+            final JavaClassTranslator<T> translator = (JavaClassTranslator<T>) 
+                getConstructor().apply(speedment, generator, document);
+
             decorators.stream().forEachOrdered(dec -> dec.apply(translator));
             return translator;
         }
@@ -111,38 +116,38 @@ public void setGenerator(Generator generator) {
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T extends HasMainInterface> void put(Class<T> clazz, String key, TranslatorConstructor<T> constructor) {
+    public <T extends HasName & HasMainInterface> void put(Class<T> clazz, String key, TranslatorConstructor<T> constructor) {
         aquireTranslatorSettings(clazz, key).setConstructor(constructor);
     }
 
     @Override
-    public <T extends HasMainInterface> void add(Class<T> clazz, String key, TranslatorDecorator<T> decorator) {
+    public <T extends HasName & HasMainInterface> void add(Class<T> clazz, String key, TranslatorDecorator<T> decorator) {
         aquireTranslatorSettings(clazz, key).decorators().add(decorator);
     }
 
     @Override
-    public <T extends HasMainInterface> void remove(Class<T> clazz, String key) {
+    public <T extends HasName & HasMainInterface> void remove(Class<T> clazz, String key) {
         aquireTranslatorSettings(clazz, key).setConstructor(null);
     }
 
-    private <T extends HasMainInterface> TranslatorSettings<T> aquireTranslatorSettings(Class<T> clazz, String key) {
+    private <T extends HasName & HasMainInterface> TranslatorSettings<T> aquireTranslatorSettings(Class<T> clazz, String key) {
         return (TranslatorSettings<T>) map.computeIfAbsent(clazz, s -> new ConcurrentHashMap<>()).computeIfAbsent(key, TranslatorSettings::new);
     }
 
     @Override
-    public <T extends HasMainInterface> Stream<? extends Translator<T, File>> translators(T document) {
+    public <T extends HasName & HasMainInterface> Stream<? extends Translator<T, File>> translators(T document) {
         return translators(document, s -> true);
     }
 
     @Override
-    public <T extends HasMainInterface> Translator<T, File> findTranslator(T document, String key) {
+    public <T extends HasName & HasMainInterface> Translator<T, File> findTranslator(T document, String key) {
         return translators(document, key::equals)
                 .findAny()
                 .orElseThrow(noTranslatorFound(document, key));
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends HasMainInterface> Stream<? extends Translator<T, File>>
+    private <T extends HasName & HasMainInterface> Stream<? extends Translator<T, File>>
             translators(T document, Predicate<String> nameFilter) {
 
         return MapStream.of(map)

src/main/java/com/speedment/internal/ui/UISession.java

@@ -74,6 +74,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.SplitPane;
 import static com.speedment.internal.util.TextUtil.alignRight;
+import com.speedment.internal.util.document.DocumentUtil;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -484,9 +485,9 @@ private void showPasswordDialog(DbmsProperty dbms) {
     public <DOC extends DocumentProperty> boolean loadFromDatabase(DbmsProperty dbms, String schemaName) {
         try {
             dbms.schemasProperty().clear();
-            
-            final Project newProject = new ProjectImpl(dbms.getParent().get().getData());
-            final Dbms newDbms = newProject.dbmses().filter(d -> d.getName().equals(dbms.getName())).findAny().get();
+
+            final Project newProject = DocumentUtil.deepCopy(project, ProjectImpl::new);
+            final Dbms newDbms = newProject.dbmses().findAny().get();
 
             final DbmsHandler dh = speedment.getDbmsHandlerComponent().make(newDbms);
             dh.readSchemaMetadata(schemaName::equalsIgnoreCase);

src/main/java/com/speedment/internal/ui/controller/ConnectController.java

@@ -43,7 +43,6 @@
 import static com.speedment.internal.ui.controller.ToolbarController.ICON_SIZE;
 import static javafx.beans.binding.Bindings.createBooleanBinding;
 import static com.speedment.internal.ui.UISession.ReuseStage.USE_EXISTING_STAGE;
-import com.speedment.internal.ui.config.ProjectProperty;
 import de.jensd.fx.glyphs.GlyphsDude;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import static java.util.Objects.requireNonNull;

src/main/java/com/speedment/internal/util/document/DocumentUtil.java

@@ -190,7 +190,48 @@ public static Supplier<NoSuchElementException> newNoSuchElementExceptionFor(Docu
                 + ")"
         );
     }
+
+    public static <DOC extends Document> DOC deepCopy(Document document, Function<Map<String, Object>, DOC> constructor) {
+        return constructor.apply(deepCopyMap(document.getData()));
+    }
+
+    private static <K, V> Map<K, V> deepCopyMap(Map<K, V> original) {
+        final Map<K, V> copy = new ConcurrentHashMap<>();
+
+        MapStream.of(original)
+            .mapValue(DocumentUtil::deepCopyObject)
+            .forEachOrdered(copy::put);
+
+        return copy;
+    }
+
+    private static <V> List<V> deepCopyList(List<V> original) {
+        final List<V> copy = new CopyOnWriteArrayList<>();
+
+        original.stream()
+            .map(DocumentUtil::deepCopyObject)
+            .forEachOrdered(copy::add);
+
+        return copy;
+    }
 
+    private static <V> V deepCopyObject(V original) {
+        if (String.class.isAssignableFrom(original.getClass())
+        ||  Number.class.isAssignableFrom(original.getClass())
+        ||  Boolean.class.isAssignableFrom(original.getClass())
+        ||  Enum.class.isAssignableFrom(original.getClass())) {
+            return original;
+        } else if (List.class.isAssignableFrom(original.getClass())) {
+            return (V) deepCopyList((List<?>) original);
+        } else if (Map.class.isAssignableFrom(original.getClass())) {
+            return (V) deepCopyMap((Map<?, ?>) original);
+        } else {
+            throw new UnsupportedOperationException(
+                "Can't deep copy unknown type '" + original.getClass() + "'."
+            );
+        }
+    }
+
     private static final Function<Object, Object> VALUE_MAPPER = o -> {
         if (o instanceof List) {
             return "[" + ((List) o).size() + "]";