Changes to ensure that the asset types are imported from the project-info db and that duplicates aren't created.

Author: garybentley

src/main/java/com/quollwriter/Environment.java

@@ -4457,18 +4457,18 @@ public static void updateUserConfigurableObjectType (UserConfigurableObjectType
 
     }
 */
-/*
+
     public static void addUserConfigurableObjectType (UserConfigurableObjectType type)
                                                throws GeneralException
     {
-
+/*
         if (type.getKey () == null)
         {
 
             Environment.projectInfoManager.saveObject (type);
 
         }
-
+*/
         Environment.userConfigObjTypes.add (type);
 
         // Need to now update the column/field state and save again since the field keys are now
@@ -4479,7 +4479,7 @@ public static void addUserConfigurableObjectType (UserConfigurableObjectType typ
         // TODO type.addPropertyChangedListener (Environment.userConfigurableObjectTypeNameListener);
 
         String id = type.getObjectTypeId ();
-
+/*
         if (!type.isLegacyObjectType ())
         {
 
@@ -4496,9 +4496,9 @@ public static void addUserConfigurableObjectType (UserConfigurableObjectType typ
                                           ProjectEvent.Type.userobjecttype,
                                           ProjectEvent.Action._new,
                                           type);
-
-    }
 */
+    }
+
 /*
     public static void removeUserConfigurableObjectTypeField (UserConfigurableObjectTypeField field)
                                                        throws GeneralException

src/main/java/com/quollwriter/db/ProjectDataHandler.java

@@ -745,9 +745,19 @@ private void initUserConfigurableObjectTypes (Connection conn,
 
         }
 
+        this.initUserConfigurableObjectTypesFromEnvironment (conn,
+                                                             project);
+
         if (project.getUserConfigurableObjectType (Chapter.OBJECT_TYPE) == null)
         {
 
+            // Init the legacy object types.
+            this.initLegacyObjectTypes (conn,
+                                        project);
+
+            this.objectManager.saveObject (project,
+                                           conn);
+/*
             // Can we init from the environment types?
             if (Environment.getUserConfigurableObjectType (Chapter.OBJECT_TYPE) != null)
             {
@@ -757,15 +767,8 @@ private void initUserConfigurableObjectTypes (Connection conn,
 
             } else {
 
-                // Init the legacy object types.
-                this.initLegacyObjectTypes (conn,
-                                            project);
-
-                this.objectManager.saveObject (project,
-                                               conn);
-
             }
-
+*/
         }
 
     }
@@ -775,6 +778,28 @@ private void initUserConfigurableObjectTypesFromEnvironment (Connection conn,
                                                           throws Exception
     {
 
+        Map<Long, Long> mappings = new HashMap<> ();
+
+        try
+        {
+
+            mappings = (Map<Long, Long>) JSONDecoder.decode (project.getProperty ("userConfigObjTypesEnvToProjKeyMap"));
+System.out.println ("GOT MAPPINGS: " + mappings);
+        } catch (Exception e) {
+
+            // Ignore
+
+        }
+
+        if (mappings == null)
+        {
+
+            mappings = new HashMap<> ();
+
+        }
+
+        Map<Long, Long> tkmappings = mappings;
+
         // This means we don't have the user config types set up.
         Map<UserConfigurableObjectType, UserConfigurableObjectType> tmappings = new HashMap<> ();
 
@@ -788,6 +813,14 @@ private void initUserConfigurableObjectTypesFromEnvironment (Connection conn,
         for (UserConfigurableObjectType t : objTypes)
         {
 
+            if (tkmappings.containsKey (t.getKey () + ""))
+            {
+
+                System.out.println ("ALREADY GOT: " + t.getKey () + ", " + t.getName ());
+                continue;
+
+            }
+System.out.println ("ADDING: " + t.getKey () + ", " + t.getName ());
             UserConfigurableObjectType nt = new UserConfigurableObjectType (project);
             nt.setName (t.getName ());
             nt.setDescription (t.getDescription ());
@@ -933,7 +966,7 @@ private void initUserConfigurableObjectTypesFromEnvironment (Connection conn,
         }
 
         // Map the type keys
-        Map<Long, Long> tkmappings = new HashMap<> ();
+        //Map<Long, Long> tkmappings = new HashMap<> ();
 
         // k -> env key
         // v -> proj key

src/main/java/com/quollwriter/db/UserConfigurableObjectTypeDataHandler.java

@@ -102,7 +102,7 @@ private UserConfigurableObjectType getUserConfigurableObjectType (ResultSet rs,
             } else {
 
                 // Keep this around, needed so we can get the environment type.
-                //Environment.addUserConfigurableObjectType (t);
+                Environment.addUserConfigurableObjectType (t);
 
             }