From 5b4fa7f88bb5976684e15a516629db4d63edc1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 28 Nov 2012 22:57:26 +0200
Subject: [PATCH] #299 renamed with to on

---
 .../java/com/mysema/query/jpa/AbstractJPQLSubQuery.java    | 4 ++--
 .../main/java/com/mysema/query/jpa/JPQLCommonQuery.java    | 2 +-
 .../src/main/java/com/mysema/query/jpa/JPQLQueryBase.java  | 4 ++--
 .../src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java | 7 ++-----
 .../src/test/java/com/mysema/query/jpa/ParsingTest.java    | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java
index 48b4f4f66..64557fd44 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java
@@ -186,8 +186,8 @@ public class AbstractJPQLSubQuery<Q extends AbstractJPQLSubQuery<Q>> extends Det
         return queryMixin.rightJoin(target, alias);
     }
 
-    public Q with(Predicate... conditions) {
-        return queryMixin.with(conditions);
+    public Q on(Predicate... conditions) {
+        return queryMixin.on(conditions);
     }
     
     public String toString() {
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java
index 034a89dda..78cb545ac 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java
@@ -344,6 +344,6 @@ public interface JPQLCommonQuery<Q extends JPQLCommonQuery<Q>>  extends Query<Q>
      * @param condition
      * @return
      */
-    Q with(Predicate... condition);
+    Q on(Predicate... condition);
 
 }
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java
index cbc673ba9..4795bf91b 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java
@@ -220,8 +220,8 @@ public abstract class JPQLQueryBase<Q extends JPQLQueryBase<Q>> extends Projecta
         return queryMixin.rightJoin(target, alias);
     }
     
-    public Q with(Predicate... conditions) {
-        return queryMixin.with(conditions);
+    public Q on(Predicate... conditions) {
+        return queryMixin.on(conditions);
     }
 
     protected void setConstants(Map<Object, String> constants) {
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java
index 1fb630cbf..70fb56227 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java
@@ -69,11 +69,8 @@ public class JPQLQueryMixin<T> extends QueryMixin<T> {
         return getSelf();
     }
 
-    public T with(Predicate... conditions){
-        for (Predicate condition : normalize(conditions, false)){
-            getMetadata().addJoinCondition(condition);
-        }
-        return getSelf();
+    public T on(Predicate... conditions){
+        return super.on(normalize(conditions, false));
     }
     
     @Override
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
index 958f44556..2ccf04cf6 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
@@ -524,7 +524,7 @@ public class ParsingTest extends AbstractQueryTest{
     @Test 
     @NoOpenJPA @NoBatooJPA
     public void Joins2() throws RecognitionException, TokenStreamException{
-        query().from(cat).join(cat.mate, mate).with(mate.name.eq("Bob")).parse();
+        query().from(cat).join(cat.mate, mate).on(mate.name.eq("Bob")).parse();
     }
 
     @Test