Author: aadamchik
Date: Sun Jun 5 14:40:03 2011
New Revision: 1132423
URL: http://svn.apache.org/viewvc?rev=1132423&view=rev
Log:
CAY-1561 Modeler trivial bug
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1132423&r1=1132422&r2=1132423&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Jun 5
14:40:03 2011
@@ -137,6 +137,7 @@ CAY-1505 Callbacks: POST_UPDATE is calle
CAY-1506 Reserverd words mapping in WHERE clause
CAY-1518 cgen: duplicate callback methods
CAY-1557 Vertical inheritance is broken for subclasses with more than one
flattened attribute
+CAY-1561 Modeler trivial bug NullPointerException on remove
CAY-1567 BaseQueryMetadata.setPrefetches() causes a shared lock
CAY-1578 unicode character types on MS SQL 2008 server aren't recognized.
Modified:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java?rev=1132423&r1=1132422&r2=1132423&view=diff
==============================================================================
---
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
(original)
+++
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
Sun Jun 5 14:40:03 2011
@@ -62,9 +62,9 @@ public class ConfirmRemoveDialog {
dialog.setVisible(true);
Object selectedValue = pane.getValue();
- shouldDelete = selectedValue.equals(JOptionPane.YES_OPTION);
+ shouldDelete =
selectedValue==null?false:selectedValue.equals(JOptionPane.YES_OPTION);
- // If the user clicks "no", we'll just ignore whatever's in the
checkbox because
+ // If the user clicks "no" or window close button, we'll just ignore
whatever's in the checkbox because
// it's non-sensical.
if (shouldDelete) {
Preferences pref = Application.getInstance().getPreferencesNode(
