Revision: 3740
Author: mo.jeff
Date: Thu Jul 15 08:20:30 2010
Log: Changed the order returned by getChildren to match allowedChildTypes.
Also added a note above where allowedChildTypes gets defined.
http://code.google.com/p/power-architect/source/detail?r=3740
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingProject.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java Wed
Jul 14 16:06:30 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java Thu
Jul 15 08:20:30 2010
@@ -63,6 +63,8 @@
/**
* Defines an absolute ordering of the child types of this class.
+ *
+ * IMPORTANT!: When changing this, ensure you maintain the order
specified by {...@link #getChildren()}
*/
@SuppressWarnings("unchecked")
public static final List<Class<? extends SPObject>> allowedChildTypes
= Collections
@@ -312,6 +314,9 @@
public List<SPObject> getChildren() {
List<SPObject> allChildren = new ArrayList<SPObject>();
// When changing this, ensure you maintain the order specified by
allowedChildTypes
+ allChildren.addAll(sqlTypes);
+ allChildren.addAll(domainCategories);
+ allChildren.addAll(sqlTypeSnapshots);
allChildren.add(rootObject);
if (profileManager != null) {
allChildren.add(profileManager);
@@ -319,9 +324,6 @@
allChildren.add(projectSettings);
allChildren.addAll(users);
allChildren.addAll(groups);
- allChildren.addAll(sqlTypes);
- allChildren.addAll(domainCategories);
- allChildren.addAll(sqlTypeSnapshots);
return allChildren;
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingProject.java
Wed Jul 14 16:06:30 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingProject.java
Thu Jul 15 08:20:30 2010
@@ -70,6 +70,8 @@
/**
* Defines an absolute ordering of the child types of this class.
+ *
+ * IMPORTANT!: When changing this, ensure you maintain the order
specified by {...@link #getChildren()}
*/
@SuppressWarnings("unchecked")
public static final List<Class<? extends SPObject>> allowedChildTypes
= Collections
@@ -251,6 +253,9 @@
public List<SPObject> getChildren() {
List<SPObject> allChildren = new ArrayList<SPObject>();
// When changing this, ensure you maintain the order specified by
allowedChildTypes
+ allChildren.addAll(getSqlTypes());
+ allChildren.addAll(getDomainCategories());
+ allChildren.addAll(getSqlTypeSnapshots());
allChildren.add(getRootObject());
allChildren.add(olapRootObject);
if (playPenContentPane != null) {
@@ -266,9 +271,6 @@
//TODO make specific getters for these types.
allChildren.addAll(getUsers());
allChildren.addAll(getGroups());
- allChildren.addAll(getSqlTypes());
- allChildren.addAll(getDomainCategories());
- allChildren.addAll(getSqlTypeSnapshots());
return allChildren;
}
