From 4e7bb9dc4e60c2def60007c509bfeb5b31229362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Tue, 18 Aug 2009 09:42:46 +0000
Subject: [PATCH]

---
 .../java/com/mysema/query/serialization/BaseSerializer.java   | 4 ++--
 .../java/com/mysema/query/serialization/ToStringVisitor.java  | 4 ++--
 .../query/types/{AbstractVisitor.java => VisitorBase.java}    | 4 ++--
 .../java/com/mysema/query/hql/hibernate/AbstractHQLQuery.java | 1 -
 .../java/com/mysema/query/hql/jpa/AbstractJPAQLQuery.java     | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename querydsl-core/src/main/java/com/mysema/query/types/{AbstractVisitor.java => VisitorBase.java} (93%)

diff --git a/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java b/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
index d15323877..461aadb10 100644
--- a/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.mysema.commons.lang.Assert;
-import com.mysema.query.types.AbstractVisitor;
+import com.mysema.query.types.VisitorBase;
 import com.mysema.query.types.custom.Custom;
 import com.mysema.query.types.expr.EArrayConstructor;
 import com.mysema.query.types.expr.EConstant;
@@ -28,7 +28,7 @@ import com.mysema.query.types.path.PathType;
  * @version $Id$
  */
 public abstract class BaseSerializer<SubType extends BaseSerializer<SubType>>
-        extends AbstractVisitor<SubType> {
+        extends VisitorBase<SubType> {
 
     protected StringBuilder builder = new StringBuilder();
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/serialization/ToStringVisitor.java b/querydsl-core/src/main/java/com/mysema/query/serialization/ToStringVisitor.java
index 47334c136..08302a01f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/serialization/ToStringVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/serialization/ToStringVisitor.java
@@ -5,7 +5,7 @@
  */
 package com.mysema.query.serialization;
 
-import com.mysema.query.types.AbstractVisitor;
+import com.mysema.query.types.VisitorBase;
 import com.mysema.query.types.custom.Custom;
 import com.mysema.query.types.expr.EArrayConstructor;
 import com.mysema.query.types.expr.EConstant;
@@ -20,7 +20,7 @@ import com.mysema.query.types.path.Path;
  * @author tiwe
  * @version $Id$
  */
-public class ToStringVisitor extends AbstractVisitor<ToStringVisitor> {
+public class ToStringVisitor extends VisitorBase<ToStringVisitor> {
 
     private static OperationPatterns patterns = new OperationPatterns();
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/AbstractVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/VisitorBase.java
similarity index 93%
rename from querydsl-core/src/main/java/com/mysema/query/types/AbstractVisitor.java
rename to querydsl-core/src/main/java/com/mysema/query/types/VisitorBase.java
index 4a8002eed..6e0e0ec15 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/AbstractVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/VisitorBase.java
@@ -45,13 +45,13 @@ import com.mysema.query.types.path.PTime;
 import com.mysema.query.types.path.Path;
 
 /**
- * AbstractVisitor provides a base implementation of the Visitor class, where
+ * VisitorBase provides a base implementation of the Visitor class, where
  * invocations are dispatched to supertypes when available and visible.
  * 
  * @author tiwe
  * @version $Id$
  */
-public abstract class AbstractVisitor<SubType extends AbstractVisitor<SubType>>
+public abstract class VisitorBase<SubType extends VisitorBase<SubType>>
         extends Visitor<SubType> {
 
     @Override
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHQLQuery.java
index 8c6992ac5..ff1c91a58 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHQLQuery.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHQLQuery.java
@@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory;
 
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
-import com.mysema.query.functions.AggregationFunctions;
 import com.mysema.query.hql.HQLPatterns;
 import com.mysema.query.hql.HQLQueryBase;
 import com.mysema.query.types.expr.Expr;
diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQLQuery.java
index 7d0f8d973..74677cde8 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQLQuery.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQLQuery.java
@@ -18,7 +18,6 @@ import org.slf4j.LoggerFactory;
 
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
-import com.mysema.query.functions.AggregationFunctions;
 import com.mysema.query.hql.HQLPatterns;
 import com.mysema.query.hql.HQLQueryBase;
 import com.mysema.query.types.expr.Expr;