Author: tfischer
Date: Sun Oct 26 08:07:13 2014
New Revision: 1634276

URL: http://svn.apache.org/r1634276
Log:
Improved and fixed javadoc

Modified:
    
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java

Modified: 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1634276&r1=1634275&r2=1634276&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
 (original)
+++ 
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
 Sun Oct 26 08:07:13 2014
@@ -605,7 +605,7 @@ public class Criteria implements Seriali
     /**
      * Adds a join to the criteria, E.g. to create the condition
      * <p>
-     * PROJECT LEFT JOIN FOO ON PROJECT.PROJECT_ID=FOO.PROJECT_ID
+     * PROJECT LEFT JOIN FOO ON PROJECT.PROJECT_ID<>FOO.PROJECT_ID
      * <p> use <p>
      * <code>
      * criteria.addJoin(
@@ -639,17 +639,19 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds a join to the criteria, E.g. to create the condition
+     * Adds a join to the criteria.
+     * For creating standard joins, please use addJoin(Column, Column, 
(SqlEnum, ) JoinType)
      * <p>
-     * PROJECT LEFT JOIN FOO ON PROJECT.PROJECT_ID=FOO.PROJECT_ID
+     * PROJECT LEFT JOIN FOO ON (PROJECT.PROJECT_ID=FOO.PROJECT_ID OR 
PROJECT.PROJECT_ID==FOO.PROJECT2_ID)
      * <p> use <p>
      * <code>
      * criteria.addJoin(
      *     ProjectPeer.TABLE_NAME,
      *     FooPeer.TABLE_NAME,
      *     new Criterion(ProjectPeer.PROJECT_ID,
-     *         FooPeer.PROJECT_ID,
-     *         Criteria.NOT_EQUAL)
+     *         FooPeer.PROJECT_ID)
+     *       .or(Criterion(ProjectPeer.PROJECT_ID,
+     *         FooPeer.PROJECT"_ID))
      *     Criteria.LEFT_JOIN);
      * </code>
      *



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to