svn commit: r734493 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db: MergerOptions.java MergerTokenSelectorController.java

[andrey]

Author: andrey
Date: Wed Jan 14 11:47:05 2009
New Revision: 734493

URL: http://svn.apache.org/viewvc?rev=734493&view=rev
Log:
CAY-1169 Weird behavior when adding entity via merging
2,3,4,5

Modified:
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java?rev=734493&r1=734492&r2=734493&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
 Wed Jan 14 11:47:05 2009
@@ -196,7 +196,10 @@
 
         while (it.hasNext()) {
             MergerToken token = it.next();
-            token.execute(context);
+            
+            if (token.getDirection() == MergeDirection.TO_DB) {
+                token.execute(context);
+            }
             // buf.append(token.createSql(adapter)).append(lineEnd);
         }
 

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java?rev=734493&r1=734492&r2=734493&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
 Wed Jan 14 11:47:05 2009
@@ -199,6 +199,11 @@
         if (excludedTokens.remove(token)) {
             excludedTokens.add(reverse);
         }
+        
+        /**
+         * Repaint, so that "Operation" column updates properly
+         */
+        view.getTokens().repaint();
     }
 
     public void checkAllAction() {