From 2cfe17028bd4c905c330957ee730c8677547c22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 3 Apr 2008 21:04:00 +0000
Subject: [PATCH] fixed compilation errors

---
 querydsl-core/pom.xml                              |  1 +
 .../src/main/java/com/mysema/query/Query.java      | 12 +++++++-----
 .../src/main/java/com/mysema/query/QueryBase.java  | 14 ++++++++------
 .../com/mysema/query/grammar/types/Factory.java    |  8 ++++----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index 2b80fec80..3948d190f 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -12,6 +12,7 @@
 
   <groupId>com.mysema.querydsl</groupId>
   <artifactId>querydsl-core</artifactId>
+  <name>querydsl core</name>
   <packaging>jar</packaging>
 
   <dependencies>
diff --git a/querydsl-core/src/main/java/com/mysema/query/Query.java b/querydsl-core/src/main/java/com/mysema/query/Query.java
index 113900670..7f54af093 100644
--- a/querydsl-core/src/main/java/com/mysema/query/Query.java
+++ b/querydsl-core/src/main/java/com/mysema/query/Query.java
@@ -8,6 +8,8 @@ package com.mysema.query;
 import com.mysema.query.grammar.OrderSpecifier;
 import com.mysema.query.grammar.types.Expr;
 
+import static com.mysema.query.grammar.types.Expr.*;
+
 /**
  * Query provides a the query interface of the fluent query DSL
  *
@@ -16,11 +18,11 @@ import com.mysema.query.grammar.types.Expr;
  */
 public interface Query<A extends Query<A>>{
     A select(Expr<?>... o);
-    A from(Expr.Entity<?>... o);  
-    @Deprecated A innerJoin(Expr.Entity<?> o);
-    @Deprecated A join(Expr.Entity<?> o);
-    @Deprecated A fullJoin(Expr.Entity<?> o);
-    @Deprecated A leftJoin(Expr.Entity<?> o);
+    A from(Entity<?>... o);  
+    @Deprecated A innerJoin(Entity<?> o);
+    @Deprecated A join(Entity<?> o);
+    @Deprecated A fullJoin(Entity<?> o);
+    @Deprecated A leftJoin(Entity<?> o);
     @Deprecated A with(Expr.Boolean... o);
     A where(Expr.Boolean... o);
     A groupBy(Expr<?>... o);
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryBase.java b/querydsl-core/src/main/java/com/mysema/query/QueryBase.java
index 39d1665bc..cfa0092c5 100644
--- a/querydsl-core/src/main/java/com/mysema/query/QueryBase.java
+++ b/querydsl-core/src/main/java/com/mysema/query/QueryBase.java
@@ -11,6 +11,8 @@ import java.util.List;
 
 import com.mysema.query.grammar.OrderSpecifier;
 import com.mysema.query.grammar.types.Expr;
+import static com.mysema.query.grammar.types.Expr.*;
+
 /**
  * QueryBase provides a basic implementation of the Query interface
  *
@@ -38,8 +40,8 @@ public class QueryBase<A extends QueryBase<A>> implements Query<A> {
     
     private final Metadata metadata = new Metadata();
     
-    public A from(Expr.Entity<?>... o) {
-        for (Expr.Entity<?> expr : o){
+    public A from(Entity<?>... o) {
+        for (Entity<?> expr : o){
             joins.add(new JoinExpression(JoinType.DEFAULT,expr));
         }
         return (A) this;
@@ -55,22 +57,22 @@ public class QueryBase<A extends QueryBase<A>> implements Query<A> {
         return (A) this;
     }
     
-    public A innerJoin(Expr.Entity<?> o) {
+    public A innerJoin(Entity<?> o) {
         joins.add(new JoinExpression(JoinType.INNERJOIN,o));
         return (A) this;
     }
     
-    public A fullJoin(Expr.Entity<?> o) {
+    public A fullJoin(Entity<?> o) {
         joins.add(new JoinExpression(JoinType.FULLJOIN,o));
         return (A) this;
     }
  
-    public A join(Expr.Entity<?> o) {
+    public A join(Entity<?> o) {
         joins.add(new JoinExpression(JoinType.JOIN,o));
         return (A) this;
     }
  
-    public A leftJoin(Expr.Entity<?> o) {
+    public A leftJoin(Entity<?> o) {
         joins.add(new JoinExpression(JoinType.LEFTJOIN,o));
         return (A) this;
     }
diff --git a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java
index 81e2c41f7..c83ee3579 100644
--- a/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java
+++ b/querydsl-core/src/main/java/com/mysema/query/grammar/types/Factory.java
@@ -15,16 +15,16 @@ import com.mysema.query.grammar.Ops.Op;
  */
 public class Factory {
     
+    public static void checkArg(String name, Object obj) {
+        if (obj == null) throw new IllegalArgumentException(name + " was null");        
+    }
+    
     public static final Expr.Boolean createBoolean(Op<Boolean> operator, Expr<?>... args) {
         checkArg("operator",operator);
         checkArg("args",args);
         return new Operation.Boolean(operator, args);
     }
     
-    public static void checkArg(String name, Object obj) {
-        if (obj == null) throw new IllegalArgumentException(name + " was null");        
-    }
-    
     public static final <OP, RT extends Comparable<RT>> Expr.Comparable<RT> createComparable(Op<OP> operator, Expr<?>... args) {
         checkArg("operator",operator);
         checkArg("args",args);