Revision: 4054
Author: [email protected]
Date: Thu Apr 21 09:02:00 2011
Log: Fixed the error message to properly report the column name that
cannot be removed instead of giving the relationship name that is being
successfully removed.
http://code.google.com/p/power-architect/source/detail?r=4054
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
Tue Aug 10 14:52:03 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
Thu Apr 21 09:02:00 2011
@@ -161,7 +161,7 @@
}
} catch (LockedColumnException ex) {
int decision =
JOptionPane.showConfirmDialog(getPlaypen(),
-
Messages.getString("DeleteSelectedAction.couldNotDeleteColumnContinueConfirmation",
o.getName(), ex.getLockingRelationship().toString()), //$NON-NLS-1$
+
Messages.getString("DeleteSelectedAction.couldNotDeleteColumnContinueConfirmation",
ex.getCol().getName(), ex.getLockingRelationship().toString()),
//$NON-NLS-1$
Messages.getString("DeleteSelectedAction.couldNotDeleteColumnDialogTitle"),
//$NON-NLS-1$
JOptionPane.YES_NO_OPTION);
if (decision == JOptionPane.NO_OPTION) {
