Revision: 3651
Author: [email protected]
Date: Mon Jun 28 12:01:29 2010
Log: Corrected a change to the parent pointer of ColumnValueCount in the
new value maker. The parent is now restricted to being only
ColumnProfileResult objects.
Also added a missing " to the save file.
http://code.google.com/p/power-architect/source/detail?r=3651
Modified:
/trunk/regress/ca/sqlpower/architect/util/ArchitectNewValueMaker.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/util/ArchitectNewValueMaker.java
Mon Jun 28 11:21:31 2010
+++ /trunk/regress/ca/sqlpower/architect/util/ArchitectNewValueMaker.java
Mon Jun 28 12:01:29 2010
@@ -103,7 +103,8 @@
return cpr;
} else if (valueType == ColumnValueCount.class) {
ColumnValueCount cvc = new ColumnValueCount(Integer.MAX_VALUE,
2, 42, false);
- getRootObject().addChild(cvc, 0);
+ ColumnProfileResult cpr = (ColumnProfileResult)
makeNewValue(ColumnProfileResult.class, null, "parent of column value
count");
+ cpr.addChild(cvc, 0);
return cvc;
} else if (valueType == ArchitectSwingProject.class || valueType
== ArchitectProject.class ||
valueType == ArchitectSwingProject.class) {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Mon Jun 28 11:21:31 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Mon Jun 28 12:01:29 2010
@@ -1252,7 +1252,7 @@
"\" percent=\"" + //$NON-NLS-1$
count.getPercent() +
"\" otherValues=\"" +
- Boolean.toString(count.isOtherValues())
+ "/>" ); //$NON-NLS-1$
+ Boolean.toString(count.isOtherValues())
+ "\"/>" ); //$NON-NLS-1$
}
}
ioo.indent--;