svn commit: r1235800 - in /cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor: ObjEntityTab.java dbentity/DbEntityRelationshipTab.java

[ol...@apache.org]

Author: oltka
Date: Wed Jan 25 16:09:10 2012
New Revision: 1235800

URL: http://svn.apache.org/viewvc?rev=1235800&view=rev
Log:
CAY-1459 Modeler: DbEntities from other DataMaps under same domain are not displayed

Modified:
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
    cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java?rev=1235800&r1=1235799&r2=1235800&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java Wed Jan 25 16:09:10 2012
@@ -44,6 +44,7 @@ import org.apache.cayenne.configuration.
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.event.EntityEvent;
@@ -459,8 +460,9 @@ public class ObjEntityTab extends JPanel
         excludeDefaultListeners.setSelected(entity.isExcludingDefaultListeners());
 
         // init DbEntities
+        EntityResolver resolver = mediator.getEntityResolver();
         DataMap map = mediator.getCurrentDataMap();
-        Object[] dbEntities = map.getDbEntities().toArray();
+        Object[] dbEntities = resolver.getDbEntities().toArray();
         Arrays.sort(dbEntities, Comparators.getDataMapChildrenComparator());
 
         DefaultComboBoxModel dbModel = new DefaultComboBoxModel(dbEntities);
@@ -470,7 +472,7 @@ public class ObjEntityTab extends JPanel
         dbEntityCombo.setEnabled(entity.getSuperClassName() == null);
 
         // toggle visibilty and editability rules
-
+        
         toggleClientFieldsVisible(map.isClientSupported());
         toggleEnabled(entity.getSuperEntityName() == null, !entity.isServerOnly());
 

Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java?rev=1235800&r1=1235799&r2=1235800&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java Wed Jan 25 16:09:10 2012
@@ -42,10 +42,10 @@ import javax.swing.event.TableModelListe
 import javax.swing.table.TableColumn;
 
 import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.event.DbEntityListener;
 import org.apache.cayenne.map.event.DbRelationshipListener;
 import org.apache.cayenne.map.event.EntityEvent;
@@ -382,8 +382,8 @@ public class DbEntityRelationshipTab ext
      * Creates a list of DbEntities.
      */
     private ComboBoxModel createComboModel(Entity entity) {
-        DataMap map = entity.getDataMap();
-        Object[] objects = map.getDbEntities().toArray();
+        EntityResolver resolver = mediator.getEntityResolver();
+        Object[] objects = resolver.getDbEntities().toArray();
         return new DefaultComboBoxModel(objects);
     }