Revision: 3820
Author: [email protected]
Date: Fri Jul 30 10:06:06 2010
Log: Fixed a bug from my last commit where the folder names of tables were
coming out empty. Now the DomainCategorySnapshot has toString implemented
so its name appears correctly in the DBTree.
The listener for domain snapshots are also being added to their system
original as well.
http://code.google.com/p/power-architect/source/detail?r=3820
Modified:
/trunk/src/main/java/ca/sqlpower/architect/SPObjectSnapshotHierarchyListener.java
/trunk/src/main/java/ca/sqlpower/architect/enterprise/DomainCategorySnapshot.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/SPObjectSnapshotHierarchyListener.java
Thu Jul 29 11:37:29 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/SPObjectSnapshotHierarchyListener.java
Fri Jul 30 10:06:06 2010
@@ -95,7 +95,7 @@
for (DomainCategory category :
session.getSystemWorkspace().getDomainCategories()) {
boolean typeFound = false;
for (UserDefinedSQLType systemType :
category.getChildren(UserDefinedSQLType.class)) {
- if
(systemType.getUUID().equals(upstreamSnapshotType.getUUID())) {
+ if
(systemType.getUUID().equals(snapshot.getOriginalUUID())) {
systemType.addSPListener(new
SPObjectSnapshotUpdateListener(snapshot));
typeFound = true;
break;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/DomainCategorySnapshot.java
Fri Jul 16 07:15:45 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/DomainCategorySnapshot.java
Fri Jul 30 10:06:06 2010
@@ -67,4 +67,9 @@
public DomainCategory getSPObject() {
return spObject;
}
-}
+
+ @Override
+ public String toString() {
+ return getName();
+ }
+}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
Fri Jul 30 09:40:47 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
Fri Jul 30 10:06:06 2010
@@ -76,7 +76,6 @@
public static final ImageIcon UNIQUE_INDEX_ICON = new
ImageIcon(DBTreeCellRenderer.class.getResource("icons/Index_unique16.png"));
public static final ImageIcon COLUMN_ICON = new
ImageIcon(DBTreeCellRenderer.class.getResource("icons/Column16.png"));
public static final ImageIcon ERROR_BADGE = new
ImageIcon(DBTreeCellRenderer.class.getResource("/icons/parts/noAccess.png"));
- //XXX Wrong icon! for testing currently
public static final ImageIcon REFRESH_ICON = new
ImageIcon(DBTreeCellRenderer.class.getResource("/icons/arrow_refresh16.png"));
private final List<IconFilter> iconFilterChain = new
ArrayList<IconFilter>();
@@ -150,35 +149,31 @@
tagColumn((col).getColumn());
}
setIcon(COLUMN_ICON);
- } else if (value instanceof UserDefinedSQLTypeSnapshot &&
- !((UserDefinedSQLTypeSnapshot) value).isDomainSnapshot()) {
+ } else if (value instanceof UserDefinedSQLTypeSnapshot) {
UserDefinedSQLTypeSnapshot snapshot =
(UserDefinedSQLTypeSnapshot) value;
setText(snapshot.getSPObject().getName());
+ if (!((UserDefinedSQLTypeSnapshot) value).isDomainSnapshot()) {
+ setIcon(SQLTypeTreeCellRenderer.TYPE_ICON);
+ } else {
+ setIcon(SQLTypeTreeCellRenderer.DOMAIN_ICON);
+ }
if (snapshot.isObsolete()) {
final BufferedImage bufferedImage =
new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-
+
Graphics2D g = bufferedImage.createGraphics();
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BILINEAR);
g.drawImage(REFRESH_ICON.getImage(), 8, 8, 8, 8, new
Color(0xffffffff, true), null);
g.dispose();
-
setIcon(ComposedIcon.getInstance(SQLTypeTreeCellRenderer.TYPE_ICON,
+ setIcon(ComposedIcon.getInstance(getIcon(),
new ImageIcon(bufferedImage)));
- } else {
- setIcon(SQLTypeTreeCellRenderer.TYPE_ICON);
- }
- } else if (value instanceof UserDefinedSQLTypeSnapshot &&
- ((UserDefinedSQLTypeSnapshot) value).isDomainSnapshot()) {
- setText(((UserDefinedSQLTypeSnapshot)
value).getSPObject().getName());
- setIcon(SQLTypeTreeCellRenderer.DOMAIN_ICON);
+ }
} else if (tree.getModel() instanceof DBTreeModel &&
value == ((DBTreeModel)
tree.getModel()).getSnapshotContainer()) {
setText("Types");
setIcon(null);
- } else if (value instanceof SPObject) {
- setText(((SPObject) value).getName());
} else {
setIcon(null);
}
