[power-architect] r3294 committed - The profile settings are now added as a proper child and the parent of...

[codesite-noreply]

Revision: 3294
Author: thomasobrie...@gmail.com
Date: Fri Feb 12 10:54:03 2010
Log: The profile settings are now added as a proper child and the parent of  
the profile settings is now being set correctly.
http://code.google.com/p/power-architect/source/detail?r=3294
Modified:
 /trunk/src/ca/sqlpower/architect/profile/ProfileManagerImpl.java

=======================================
--- /trunk/src/ca/sqlpower/architect/profile/ProfileManagerImpl.java	Fri  
Feb 12 07:43:48 2010
+++ /trunk/src/ca/sqlpower/architect/profile/ProfileManagerImpl.java	Fri  
Feb 12 10:54:03 2010
@@ -38,6 +38,7 @@
 import ca.sqlpower.object.AbstractSPObject;
 import ca.sqlpower.object.SPObject;
 import ca.sqlpower.object.annotation.Accessor;
+import ca.sqlpower.object.annotation.Constructor;
 import ca.sqlpower.object.annotation.Mutator;
 import ca.sqlpower.object.annotation.NonBound;
 import ca.sqlpower.object.annotation.NonProperty;
@@ -195,6 +196,11 @@
             return tpr;
         }
     }
+
+    @Constructor
+    public ProfileManagerImpl() {
+        defaultProfileSettings.setParent(this);
+    }

     @Transient @Mutator
     public void setUserPrompterFactory(ArchitectSession session) {
@@ -321,7 +327,15 @@
     /* docs inherited from interface */
     @NonProperty
     public void setDefaultProfileSettings(ProfileSettings settings) {
+        ProfileSettings oldSettings = defaultProfileSettings;
         defaultProfileSettings = settings;
+        defaultProfileSettings.setParent(this);
+        if (oldSettings != null) {
+            fireChildRemoved(ProfileSettings.class, oldSettings, 0);
+        }
+        if (settings != null) {
+            fireChildAdded(ProfileSettings.class, settings, 0);
+        }
     }

     /* docs inherited from interface */
@@ -431,6 +445,16 @@
             throw new IllegalArgumentException("Child must be of type  
TableProfileResult");
         }
     }
+
+    @Override
+    protected void addChildImpl(SPObject child, int index) {
+        if (child instanceof ProfileSettings) {
+            setDefaultProfileSettings((ProfileSettings) child);
+        } else if (child instanceof TableProfileResult) {
+            //XXX make a new add method that can add one result.
+            addResults(Collections.singletonList((TableProfileResult)  
child));
+        }
+    }

     public boolean allowsChildren() {
         return true;
@@ -440,7 +464,11 @@
         if (childType.isAssignableFrom(ProfileSettings.class)) {
             return 0;
         } else if (childType.isAssignableFrom(TableProfileResult.class)) {
-            return 1;
+            if (defaultProfileSettings != null) {
+                return 1;
+            } else {
+                return 0;
+            }
         } else {
             throw new IllegalArgumentException();
         }