You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2008/11/18 09:54:44 UTC
svn commit: r718522 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main: java/org/apache/cayenne/modeler/dialog/objentity/ resources/org/apache/cayenne/modeler/

Author: andrey
Date: Tue Nov 18 00:54:43 2008
New Revision: 718522

URL: http://svn.apache.org/viewvc?rev=718522&view=rev
Log:
CAY-1077 ObjRelationship Mapping Dialog Improvements
Button name change

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetController.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetDialog.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetController.java?rev=718522&r1=718521&r2=718522&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetController.java Tue Nov 18 00:54:43 2008
@@ -33,7 +33,7 @@
  * Controller of a dialog to select source, target and cardinality for DbRelationship  
  */
 public class DbRelationshipTargetController extends BasicController {
-    public static final String SAVE_CONTROL = "cayenne.modeler.mapObjRelationship.save.button";
+    public static final String CONTINUE_CONTROL = "cayenne.modeler.mapObjRelationship.continue.button";
     public static final String CANCEL_CONTROL = "cayenne.modeler.mapObjRelationship.cancel.button";
     
     public static final String TOMANY_CONTROL = "cayenne.modeler.mapObjRelationship.tomany.checkbox";
@@ -59,7 +59,7 @@
         if (control.matchesID(CANCEL_CONTROL)) {
             shutdown();
         }
-        else if (control.matchesID(SAVE_CONTROL)) {
+        else if (control.matchesID(CONTINUE_CONTROL)) {
             save();
         }
     }

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetDialog.java?rev=718522&r1=718521&r2=718522&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetDialog.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetDialog.java Tue Nov 18 00:54:43 2008
@@ -53,7 +53,7 @@
     protected void init(DbEntity source1, DbEntity source2) {
         // create widgets
         SButton saveButton = new SButton(new SAction(
-                DbRelationshipTargetController.SAVE_CONTROL));
+                DbRelationshipTargetController.CONTINUE_CONTROL));
         saveButton.setEnabled(true);
 
         SButton cancelButton = new SButton(new SAction(

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties?rev=718522&r1=718521&r2=718522&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/cayennemodeler-strings.properties Tue Nov 18 00:54:43 2008
@@ -94,6 +94,8 @@
 cayenne.modeler.mapObjRelationship.save.button.ShortDescription = Done
 cayenne.modeler.mapObjRelationship.cancel.button = Cancel
 cayenne.modeler.mapObjRelationship.cancel.button.ShortDescription = Cancel
+cayenne.modeler.mapObjRelationship.continue.button = Continue
+cayenne.modeler.mapObjRelationship.continue.button.ShortDescription = Continue
 
 cayenne.modeler.mapObjRelationship.newrel.button = New DbRelationship
 cayenne.modeler.mapObjRelationship.newrel.button.ShortDescription = New DbRelationship