[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb ERDList.java,1.10,1.11

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

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

Modified Files:
	ERDList.java 
Log Message:
more flexibility when using createObjectAction in ERDList

Index: ERDList.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERDList.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ERDList.java	15 Dec 2003 16:20:22 -0000	1.10
--- ERDList.java	16 Dec 2003 13:19:21 -0000	1.11
***************
*** 41,54 ****
  
      public WOComponent createObjectAction() {
          String editRelationshipConfigurationName = (String)valueForBinding("editRelationshipConfigurationName");
          if(editRelationshipConfigurationName != null && editRelationshipConfigurationName.length() > 0) {
!             EditRelationshipPageInterface epi = (EditRelationshipPageInterface)D2W.factory().pageForConfigurationNamed(editRelationshipConfigurationName, session());
!             epi.setMasterObjectAndRelationshipKey(object(), key());
!             epi.setNextPage(context().page());
!             return (WOComponent)epi;
          } else {
              ERXEOControlUtilities.createAndAddObjectToRelationship(object().editingContext(), object(), key(), (String)valueForBinding("destinationEntityName"), null);
          }
!         return context().page();
      }
      // we will get asked quite a lot of times, so caching is in order
--- 41,63 ----
  
      public WOComponent createObjectAction() {
+         WOComponent nextPage = context().page();
          String editRelationshipConfigurationName = (String)valueForBinding("editRelationshipConfigurationName");
          if(editRelationshipConfigurationName != null && editRelationshipConfigurationName.length() > 0) {
!             nextPage = D2W.factory().pageForConfigurationNamed(editRelationshipConfigurationName, session());
!             if(nextPage instanceof EditRelationshipPageInterface) {
!                 EditRelationshipPageInterface epi = (EditRelationshipPageInterface)nextPage;
!                 epi.setMasterObjectAndRelationshipKey(object(), key());
!                 epi.setNextPage(context().page());
!             } else if(nextPage instanceof EditPageInterface) {
!                 EOEnterpriseObject object = ERD2WUtilities.localInstanceFromObjectWithD2WContext(object(), d2wContext());
!                 EOEnterpriseObject eo = ERXEOControlUtilities.createAndAddObjectToRelationship(object.editingContext(), object, key(), (String)valueForBinding("destinationEntityName"), null);
!                 EditPageInterface epi = (EditPageInterface)nextPage;
!                 epi.setObject(eo);
!                 epi.setNextPage(context().page());
!             }
          } else {
              ERXEOControlUtilities.createAndAddObjectToRelationship(object().editingContext(), object(), key(), (String)valueForBinding("destinationEntityName"), null);
          }
!         return nextPage;
      }
      // we will get asked quite a lot of times, so caching is in order