Revision: 3482
Author: [email protected]
Date: Fri Apr 30 11:38:47 2010
Log: NEW - bug 2783: Relationship properties mapping dialog has
disappearing mappings.
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=2783
Cleaning up needs to be done before actually committing the relationship
changes otherwise listeners will still be attached
to the underlying relationship which caused mappings to be removed and not
added back.
http://code.google.com/p/power-architect/source/detail?r=3482
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
Thu Apr 29 08:28:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
Fri Apr 30 11:38:47 2010
@@ -413,15 +413,10 @@
public boolean applyChanges() {
try {
+ cleanup();
updateRelationshipFromMappings();
- } catch (SQLObjectException e) {
+ } catch (Exception e) {
throw new RuntimeException(e);
- } finally {
- try {
- cleanup();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
}
return true;
}