svn commit: r1357459 - in /cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: dialog/ResolveDbRelationshipDialog.java util/combo/ComboBoxCellEditor.java

[johnthuss]

Author: johnthuss
Date: Thu Jul  5 04:57:06 2012
New Revision: 1357459

URL: http://svn.apache.org/viewvc?rev=1357459&view=rev
Log:
CAY-1719 Modeler - Obj Attribute Java Type editor won't focus sometimes

Modified:
    
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
    
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java

Modified: 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java?rev=1357459&r1=1357458&r2=1357459&view=diff
==============================================================================
--- 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
 (original)
+++ 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
 Thu Jul  5 04:57:06 2012
@@ -282,6 +282,7 @@ public class ResolveDbRelationshipDialog
     }
 
     private void save() {
+        stopEditing();
 
         // extract names...
         String sourceEntityName = name.getText();

Modified: 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java?rev=1357459&r1=1357458&r2=1357459&view=diff
==============================================================================
--- 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java
 (original)
+++ 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java
 Thu Jul  5 04:57:06 2012
@@ -55,6 +55,8 @@ public class ComboBoxCellEditor extends 
         
         //  Editing should be stopped when textfield loses its focus
         //  otherwise the value may get lost (e.g. see CAY-1104)
+        //  LATER: this turned out to be the wrong fix, so I commented 
+        //  out the code in focusLost to fix CAY-1719 and fixed CAY-1104 
differently.
         this.comboBox.getEditor().getEditorComponent().addFocusListener(this);
 
         // remove the editor's border - the cell itself already has one
@@ -113,7 +115,7 @@ public class ComboBoxCellEditor extends 
 
     public void focusLost(FocusEvent e) {
         if (e.getOppositeComponent() != null) {
-            stopCellEditing();
+            stopCellEditing(); // Commented out to fix CAY-1719
         }
     }
 }