Updated the version. Fixed an issue where delete custom object fields prevented an object using them from being deleted.

Author: garybentley

build.xml

@@ -5,7 +5,7 @@
 <project default="run" basedir=".">
 
   <property name="projectName" value="QuollWriter" />
-  <property name="currVersion" value="2.6.13" />
+  <property name="currVersion" value="2.6.14" />
   <property name="thesaurusVersion" value="1.0" />
   <property name="buildDir" value="./build" />
   <property name="imgsDir" value="./imgs" />

data/default-ui-language-strings.json

@@ -3,7 +3,7 @@
     ":nativename" : "English",
     ":version" : 1,
     ":id" : ":English",
-    ":qwversion" : "2.6.13",
+    ":qwversion" : "2.6.14",
     ":created" : 0,
     ":email" : "gary@quollwriter.com",
     ":sections" :
@@ -5863,6 +5863,17 @@
                         "text" : "When using full screen mode, the normal ${objectnames.singular.project} window will be hidden."
                     }
                 }
+            },
+            "2.6.14" :
+            {
+                "items" :
+                {
+                    "bugs" :
+                    {
+                        "title" : "Bug fixes",
+                        "text" : "Removing custom object fields won't now prevent the parent object from being deleted."
+                    }
+                }
             }
         }
     },

data/whats-new.xml

@@ -1,5 +1,9 @@
 <whatsnew>
 
+    <version id="2.6.14">
+      <item id="bugs" onlyIfCurrentVersion="true" />
+    </version>
+
     <version id="2.6.13">
       <item id="bugs" onlyIfCurrentVersion="true" />
     </version>

src/com/quollwriter/db/ObjectManager.java

@@ -1389,6 +1389,25 @@ public void deleteObject (DataObject d,
 
     }
 
+    private void deleteAllUserConfigurableObjectFieldsForObject (UserConfigurableObject obj,
+                                                                 Connection             conn)
+                                                          throws GeneralException
+    {
+
+        UserConfigurableObjectFieldDataHandler dh = (UserConfigurableObjectFieldDataHandler) this.getHandler (UserConfigurableObjectField.class); //this.handlers.get (d.getClass ().getName ());
+
+        if (dh == null)
+        {
+
+            throw new GeneralException ("Class is not supported.");
+
+        }
+ 
+        dh.deleteAllFieldsForObject (obj,
+                                     conn);
+
+    }
+
     public void deleteObject (DataObject d,
                               boolean    deleteChildObjects,
                               Connection conn)
@@ -1440,6 +1459,9 @@ public void deleteObject (DataObject d,
                 this.deleteObjects (o.getFields (),
                                     conn);
 
+                this.deleteAllUserConfigurableObjectFieldsForObject (o,
+                                                                     conn);
+
             }
 
             dh.deleteObject (d,

src/com/quollwriter/db/UserConfigurableObjectFieldDataHandler.java

@@ -12,7 +12,7 @@ public class UserConfigurableObjectFieldDataHandler implements DataHandler<UserC
 {
 
     private static final String STD_SELECT_PREFIX = "SELECT dbkey, userobjecttypefielddbkey, value, name, description, markup, lastmodified, datecreated, properties, id, version FROM userobjectfield_v ";
-    
+
     private ObjectManager objectManager = null;
 
     public UserConfigurableObjectFieldDataHandler (ObjectManager om)
@@ -22,6 +22,51 @@ public UserConfigurableObjectFieldDataHandler (ObjectManager om)
 
     }
 
+    public void deleteAllFieldsForObject (UserConfigurableObject obj,
+                                          Connection             conn)
+    {
+
+        List<UserConfigurableObjectField> ret = new ArrayList ();
+
+        try
+        {
+
+            List params = new ArrayList ();
+            params.add (obj.getKey ());
+
+            ResultSet rs = this.objectManager.executeQuery ("SELECT dbkey FROM userobjectfield_v WHERE namedobjectdbkey = ?",
+                                                            params,
+                                                            conn);
+ 
+            // Create a fake field.
+            UserConfigurableObjectType _t = new UserConfigurableObjectType ();
+            _t.setAssetObjectType (true);
+            _t.setKey (1l);
+            TextUserConfigurableObjectTypeField _tf = new TextUserConfigurableObjectTypeField ();
+            _tf.setUserConfigurableObjectType (_t);
+
+            while (rs.next ())
+            {
+
+                UserConfigurableObjectField _f = new UserConfigurableObjectField (_tf);
+
+                _f.setKey (rs.getLong (1));
+
+                this.objectManager.deleteObject (_f,
+                                                 true,
+                                                 conn);
+
+            }
+
+        } catch (Exception e) {
+
+            Environment.logError ("Unable to delete object fields: " + obj.getKey (),
+                                  e);
+
+        }
+
+    }
+
     private UserConfigurableObjectField getUserConfigurableObjectField (ResultSet              rs,
                                                                         UserConfigurableObject parent,
                                                                         boolean                loadChildObjects)
@@ -34,37 +79,37 @@ private UserConfigurableObjectField getUserConfigurableObjectField (ResultSet
             int ind = 1;
 
             long key = rs.getLong (ind++);
-            
+
             long typekey = rs.getLong (ind++);
-            
+
             UserConfigurableObjectTypeField tf = (UserConfigurableObjectTypeField) Environment.getUserConfigurableObjectTypeField (typekey);
 
             if (tf == null)
             {
-                
+
                 // This isn't an error, the field may have been removed without the requesting project knowing about
                 // the deletion.
                 return null;
-                                                                                                                      
+
             }
-    
+
             UserConfigurableObjectField f = new UserConfigurableObjectField (tf);
-                
+
             f.setKey (key);
 
             String v = rs.getString (ind++);
-            
+
             if (v != null)
             {
-            
+
                 f.setValue (tf.getViewEditHandler (parent,
                                                    f,
                                                    null).stringToValue (v));
 
             }
-            
+
             f.setName (rs.getString (ind++));
-            
+
             f.setDescription (new StringWithMarkup (rs.getString (ind++),
                                                     rs.getString (ind++)));
             f.setLastModified (rs.getTimestamp (ind++));
@@ -73,7 +118,7 @@ private UserConfigurableObjectField getUserConfigurableObjectField (ResultSet
             f.setId (rs.getString (ind++));
             f.setVersion (rs.getString (ind++));
             f.setParent (parent);
-            
+
             return f;
 
         } catch (Exception e)
@@ -115,11 +160,11 @@ public List<UserConfigurableObjectField> getObjects (UserConfigurableObject pare
 
                 if (f != null)
                 {
-                    
-                    ret.add (f);                    
-                                                                                     
+
+                    ret.add (f);
+
                 }
-                
+
             }
 
             try
@@ -139,7 +184,7 @@ public List<UserConfigurableObjectField> getObjects (UserConfigurableObject pare
                                         e);
 
         }
-        
+
         return ret;
 
     }
@@ -201,57 +246,57 @@ public void createObject (UserConfigurableObjectField t,
 
         if (t.getParent () == null)
         {
-            
+
             throw new GeneralException ("The parent user configurable object must be specified for the field: " +
                                         t);
-            
+
         }
-    
+
         if (t.getUserConfigurableObjectTypeField () == null)
         {
-            
+
             throw new GeneralException ("The object type field must be specified for field: " +
                                         t);
-            
-        }            
-    
+
+        }
+
         List params = new ArrayList ();
         params.add (t.getKey ());
         params.add (t.getUserConfigurableObjectTypeField ().getKey ());
         params.add (t.getParent ().getKey ());
-                
+
         params.add (t.getUserConfigurableObjectTypeField ().getViewEditHandler (t.getParentObject (),
                                                                                 t,
                                                                                 null).valueToString (t.getValue ()));
-                
+
         this.objectManager.executeStatement ("INSERT INTO userobjectfield (dbkey, userobjecttypefielddbkey, namedobjectdbkey, value) VALUES (?, ?, ?, ?)",
                                              params,
                                              conn);
 
     }
 
     public void deleteObject (UserConfigurableObjectField t,
-                              boolean                     deleteChildObjects,                              
+                              boolean                     deleteChildObjects,
                               Connection                  conn)
                        throws GeneralException
     {
 
         Set<String> filesToDelete = new HashSet ();
-        
+
         for (String fn : t.getProjectFileNames ())
         {
-            
+
             if (fn == null)
             {
-                
+
                 continue;
-                
+
             }
-            
+
             filesToDelete.add (fn);
-                
+
         }
-            
+
         List params = new ArrayList ();
         params.add (t.getKey ());
 
@@ -261,9 +306,9 @@ public void deleteObject (UserConfigurableObjectField t,
 
         for (String fn : filesToDelete)
         {
-            
+
             this.objectManager.getProject ().deleteFile (fn);
-            
+
         }
 
     }
@@ -275,18 +320,18 @@ public void updateObject (UserConfigurableObjectField t,
 
         List params = new ArrayList ();
 
-        
+
         String val = t.getUserConfigurableObjectTypeField ().getViewEditHandler (t.getParentObject (),
                                                                                  t,
                                                                                  null).valueToString (t.getValue ());
         params.add (val);
-        
+
         params.add (t.getKey ());
 
         this.objectManager.executeStatement ("UPDATE userobjectfield SET value = ? WHERE dbkey = ?",
                                              params,
                                              conn);
-                                             
+
     }
 
 }