Revision: 4028
Author: [email protected]
Date: Tue Dec 7 12:24:04 2010
Log: Fixed the compare with current menu item on schemas. The action was
retrieving its compare panel from the session but the session never set it
ever.
http://code.google.com/p/power-architect/source/detail?r=4028
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Fri Dec 3 14:51:45 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue Dec 7 12:24:04 2010
@@ -195,7 +195,6 @@
private BiMap<ArchitectSwingSession, StackedTab> sessionTabs =
HashBiMap.create();
private Navigator navigatorDialog;
- private CompareDMDialog compareDMDialog = null;
private int oldWidth;
private int oldHeight;
@@ -1549,10 +1548,6 @@
return createNonIdentifyingRelationshipAction;
}
- public CompareDMDialog getCompareDMDialog() {
- return compareDMDialog;
- }
-
public ReverseRelationshipAction getReverseRelationshipAction() {
return reverseRelationshipAction;
}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Thu Nov
25 15:22:26 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Tue Dec
7 12:24:04 2010
@@ -867,9 +867,10 @@
db = (SQLDatabase)getValue(DATABASE);
}
-
session.getArchitectFrame().getCompareDMDialog().setVisible(true);
+ CompareDMDialog compareDialog = new CompareDMDialog(session);
+ compareDialog.setVisible(true);
//sets to the right settings
-
session.getArchitectFrame().getCompareDMDialog().compareCurrentWithOrig(schema,catalog,
db);
+ compareDialog.compareCurrentWithOrig(schema,catalog, db);
}
}
