[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb ERDDefaultsEmbeddedAssignment.java,1.6,1.7

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb
In directory usw-pr-cvs1:/tmp/cvs-serv9900

Modified Files:
	ERDDefaultsEmbeddedAssignment.java 
Log Message:
working with smartRelationship...

Index: ERDDefaultsEmbeddedAssignment.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERDDefaultsEmbeddedAssignment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERDDefaultsEmbeddedAssignment.java	18 Jul 2002 16:47:01 -0000	1.6
--- ERDDefaultsEmbeddedAssignment.java	30 Jul 2002 17:41:59 -0000	1.7
***************
*** 119,148 ****
       *		off of the object in the context.
       */
!      // CHECKME: Should just be able to use 'smartRelationship.destinationEntity.name'
      public Object defaultEmbeddedEntityName(D2WContext c) {
!         Object result = null;
!         Object rawObject=c.valueForKey("object");
!         String propertyKey=c.propertyKey();
!         if (rawObject!=null && rawObject instanceof EOEnterpriseObject && propertyKey != null) {
!             EOEnterpriseObject object=(EOEnterpriseObject)rawObject;
!             EOEnterpriseObject lastEO=object;
!             if (propertyKey.indexOf(".")!=-1) {
!                 String partialKeyPath=KeyValuePath.keyPathWithoutLastProperty(propertyKey);
!                 Object rawLastEO=object.valueForKeyPath(partialKeyPath);
!                 lastEO=rawLastEO instanceof EOEnterpriseObject ? (EOEnterpriseObject)rawLastEO : null;
              }
!             if (lastEO!=null) {
!                 // FIXME: Should be using the model group from the ec of the lastEO.
!                 EOEntity entity=EOModelGroup.defaultGroup().entityNamed(lastEO.entityName());
!                 String lastKey=KeyValuePath.lastPropertyKeyInKeyPath(propertyKey);
!                 result=entity.relationshipNamed(lastKey);
              }
!         } 
!         if (result==null) {
!             result=c.relationship();
!             log.warn(propertyKey + "-" + rawObject);
          }
-         if (result != null)
-             result = ((EORelationship)result).destinationEntity().name();
          return result;
      }
--- 119,150 ----
       *		off of the object in the context.
       */
!     // CHECKME: Should just be able to use 'smartRelationship.destinationEntity.name'
      public Object defaultEmbeddedEntityName(D2WContext c) {
!         Object result = c.valueForKeyPath("smartRelationship.destinationEntity.name");
!         if(result == null) {
!             Object rawObject=c.valueForKey("object");
!             String propertyKey=c.propertyKey();
!             if (rawObject!=null && rawObject instanceof EOEnterpriseObject && propertyKey != null) {
!                 EOEnterpriseObject object=(EOEnterpriseObject)rawObject;
!                 EOEnterpriseObject lastEO=object;
!                 if (propertyKey.indexOf(".")!=-1) {
!                     String partialKeyPath=KeyValuePath.keyPathWithoutLastProperty(propertyKey);
!                     Object rawLastEO=object.valueForKeyPath(partialKeyPath);
!                     lastEO=rawLastEO instanceof EOEnterpriseObject ? (EOEnterpriseObject)rawLastEO : null;
!                 }
!                 if (lastEO!=null) {
!                     // FIXME: Should be using the model group from the ec of the lastEO.
!                     EOEntity entity=EOModelGroup.defaultGroup().entityNamed(lastEO.entityName());
!                     String lastKey=KeyValuePath.lastPropertyKeyInKeyPath(propertyKey);
!                     result=entity.relationshipNamed(lastKey);
!                 }
              }
!             if (result==null) {
!                 result=c.relationship();
!                 log.warn(propertyKey + "-" + rawObject);
              }
!             if (result != null)
!                 result = ((EORelationship)result).destinationEntity().name();
          }
          return result;
      }
***************
*** 156,160 ****
       */
      public String defaultEmbeddedListPageConfiguration(D2WContext c) {
!         return "ListEmbedded" + c.valueForKey("embeddedEntityName");
      }
  
--- 158,164 ----
       */
      public String defaultEmbeddedListPageConfiguration(D2WContext c) {
!         String result = "ListEmbedded" + c.valueForKey("embeddedEntityName");
!         log.debug(result);
!         return result;
      }