[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc JoinedDataObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc
In directory jcorp2.servlets.net:/tmp/cvs-serv31162/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc

Modified Files:
	JoinedDataObject.java 
Log Message:
remove 'do not use' comment, and this.<static> references


Index: JoinedDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** JoinedDataObject.java	3 Apr 2004 21:22:09 -0000	1.27
--- JoinedDataObject.java	1 Jun 2004 18:01:27 -0000	1.28
***************
*** 101,105 ****
  
  /**
-  * Not yet completed: do not use in your own code yet.
   * DataObject for use with 1:1 joins between database objects.
   * This class provides a multi-dbobject view of the underlying databases.  It
--- 101,104 ----
***************
*** 117,121 ****
   * very last relation or all the relations.</p>
   * @author Michael Rimov
-  * @version $Revision$ on  $Date$
   */
  public class JoinedDataObject implements DataObject, Defineable, Securable, NestableDataObject {
--- 116,119 ----
***************
*** 309,321 ****
                  if (this.getMetaData() == null) {
                      JoinedDataObjectMetaData metadata = constructMetadata();
!                     this.definitions.put(this.getDefinitionName(),metadata);
                      initializeXML(metadata);
                  }
  
!                 this.myDataObjects = ((JoinedDataObjectMetaData)this
                                        .getMetaData()).createNestedDataObjects();
              } catch (Throwable t) {
!                 if (this.definitions.containsKey(this.getDefinitionName())) {
!                     this.definitions.remove(this.getDefinitionName());
                  }
                  log.error("Error initializing data object", t);
--- 307,319 ----
                  if (this.getMetaData() == null) {
                      JoinedDataObjectMetaData metadata = constructMetadata();
!                     definitions.put(getDefinitionName(),metadata);
                      initializeXML(metadata);
                  }
  
!                 myDataObjects = ((JoinedDataObjectMetaData)this
                                        .getMetaData()).createNestedDataObjects();
              } catch (Throwable t) {
!                 if (definitions.containsKey(getDefinitionName())) {
!                     definitions.remove(getDefinitionName());
                  }
                  log.error("Error initializing data object", t);
***************
*** 348,354 ****
          synchronized (JoinedDataObject.class) {
              try {
!                 if (this.getMetaData() == null) {
                      JoinedDataObjectMetaData metadata = constructMetadata();
!                     this.definitions.put(definitionName,metadata);
                      initializeFromJoinedDigesterBean(digesterBean,metadata);
                  }
--- 346,352 ----
          synchronized (JoinedDataObject.class) {
              try {
!                 if (getMetaData() == null) {
                      JoinedDataObjectMetaData metadata = constructMetadata();
!                     definitions.put(definitionName,metadata);
                      initializeFromJoinedDigesterBean(digesterBean,metadata);
                  }
***************
*** 357,362 ****
                                        .getMetaData()).createNestedDataObjects();
              } catch (Throwable t) {
!                 if (this.definitions.containsKey(this.getDefinitionName())) {
!                     this.definitions.remove(this.getDefinitionName());
                  }
                  log.error("Error initializing data object", t);
--- 355,360 ----
                                        .getMetaData()).createNestedDataObjects();
              } catch (Throwable t) {
!                 if (definitions.containsKey(this.getDefinitionName())) {
!                     definitions.remove(this.getDefinitionName());
                  }
                  log.error("Error initializing data object", t);
***************
*** 402,415 ****
              try {
                  String joinType = oneRelation.getJoinType();
!                 int joinValue = this.UNSPECIFIED_JOIN;
  
                  if ("inner".equalsIgnoreCase(joinType)) {
!                     joinValue = this.INNER_JOIN;
  
                  } else if ("left".equalsIgnoreCase(joinType)) {
!                     joinValue = this.LEFT_JOIN;
  
                  } else if ("right".equalsIgnoreCase(joinType)) {
!                     joinValue = this.RIGHT_JOIN;
                  }
  
--- 400,413 ----
              try {
                  String joinType = oneRelation.getJoinType();
!                 int joinValue = UNSPECIFIED_JOIN;
  
                  if ("inner".equalsIgnoreCase(joinType)) {
!                     joinValue = INNER_JOIN;
  
                  } else if ("left".equalsIgnoreCase(joinType)) {
!                     joinValue = LEFT_JOIN;
  
                  } else if ("right".equalsIgnoreCase(joinType)) {
!                     joinValue = RIGHT_JOIN;
                  }
  
***************
*** 804,808 ****
       */
      public DataObjectMetaData getMetaData() {
!         return (DataObjectMetaData) this.definitions.get(this.getDefinitionName());
      }
  
--- 802,806 ----
       */
      public DataObjectMetaData getMetaData() {
!         return (DataObjectMetaData) definitions.get(this.getDefinitionName());
      }