svn commit: r410349 - in /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor: ObjEntityRelationshipTab.java ObjRelationshipTableModel.java

[aadamchik]

Author: aadamchik
Date: Tue May 30 12:15:42 2006
New Revision: 410349

URL: http://svn.apache.org/viewvc?rev=410349&view=rev
Log:
CAY-326 - displaying read only status of relationships

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java?rev=410349&r1=410348&r2=410349&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjEntityRelationshipTab.java
 Tue May 30 12:15:42 2006
@@ -399,7 +399,7 @@
         editor.setClickCountToStart(1);
         col.setCellEditor(editor);
 
-        col = 
table.getColumnModel().getColumn(ObjRelationshipTableModel.REL_CARDINALITY);
+        col = 
table.getColumnModel().getColumn(ObjRelationshipTableModel.REL_SEMANTICS);
         col.setMinWidth(150);
 
         col = 
table.getColumnModel().getColumn(ObjRelationshipTableModel.REL_DELETERULE);
@@ -462,7 +462,7 @@
                 int column) {
 
             // center cardinality column
-            int align = column == ObjRelationshipTableModel.REL_CARDINALITY
+            int align = column == ObjRelationshipTableModel.REL_SEMANTICS
                     ? JLabel.CENTER
                     : JLabel.LEFT;
             super.setHorizontalAlignment(align);

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java?rev=410349&r1=410348&r2=410349&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/ObjRelationshipTableModel.java
 Tue May 30 12:15:42 2006
@@ -81,7 +81,7 @@
     // Columns
     static final int REL_NAME = 0;
     static final int REL_TARGET = 1;
-    static final int REL_CARDINALITY = 2;
+    static final int REL_SEMANTICS = 2;
     static final int REL_DELETERULE = 3;
     static final int REL_LOCKING = 4;
 
@@ -125,8 +125,8 @@
                 return "Target";
             case REL_LOCKING :
                 return "Used for Locking";
-            case REL_CARDINALITY :
-                return "Cardinality";
+            case REL_SEMANTICS :
+                return "Semantics";
             case REL_DELETERULE :
                 return "Delete Rule";
 
@@ -153,22 +153,26 @@
     }
 
     public Object getValueAt(int row, int column) {
-        ObjRelationship rel = getRelationship(row);
+        ObjRelationship relationship = getRelationship(row);
 
         if (column == REL_NAME) {
-            return rel.getName();
+            return relationship.getName();
         }
         else if (column == REL_TARGET) {
-            return rel.getTargetEntity();
+            return relationship.getTargetEntity();
         }
         else if (column == REL_LOCKING) {
-            return rel.isUsedForLocking() ? Boolean.TRUE : Boolean.FALSE;
+            return relationship.isUsedForLocking() ? Boolean.TRUE : 
Boolean.FALSE;
         }
-        else if (column == REL_CARDINALITY) {
-            return rel.isToMany() ? "to many" : "to one";
+        else if (column == REL_SEMANTICS) {
+            String semantics = relationship.isToMany() ? "to many" : "to one";
+            if(relationship.isReadOnly()) {
+                semantics += ", read-only";
+            }
+            return semantics;
         }
         else if (column == REL_DELETERULE) {
-            return DeleteRule.deleteRuleName(rel.getDeleteRule());
+            return DeleteRule.deleteRuleName(relationship.getDeleteRule());
         }
         else {
             return null;
@@ -236,7 +240,7 @@
     }
 
     public boolean isCellEditable(int row, int col) {
-        return !isInherited(row) && col != REL_CARDINALITY;
+        return !isInherited(row) && col != REL_SEMANTICS;
     }
 
     final class RelationshipComparator implements Comparator {