From d6b4eb06be870f2c18a5ee2fbb4318a48a073d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Mon, 17 Mar 2008 18:06:53 +0000
Subject: [PATCH] moved wrapForOps to HqlOps

---
 .../java/com/mysema/query/grammar/HqlOps.java | 21 ++++++++++++++-----
 .../mysema/query/grammar/HqlSerializer.java   | 20 ++++--------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java b/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java
index 11d4ffb3c..90d638007 100644
--- a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java
+++ b/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java
@@ -5,11 +5,7 @@
  */
 package com.mysema.query.grammar;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.query.grammar.Ops;
+import java.util.*;
 
 /**
  * Ops provides
@@ -18,7 +14,22 @@ import com.mysema.query.grammar.Ops;
  * @version $Id$
  */
 public class HqlOps extends Ops {
+    
+    public static final Set<Op<?>> wrapCollectionsForOp;
+    
+    static{
+        Set<Op<?>> ops = new HashSet<Op<?>>();
+        ops.add(Op.IN);
+        ops.add(Op.NOTIN);
+        ops.add(OpQuant.ALL);
+        ops.add(OpQuant.ANY);
+        ops.add(OpQuant.EXISTS);
+        ops.add(OpQuant.NOTEXISTS);
+        wrapCollectionsForOp = Collections.unmodifiableSet(ops);
+    }
+    
     private static final Map<Op<?>,String> patterns = new HashMap<Op<?>,String>();
+    
     private static final Map<Op<?>,Integer> precedence = new HashMap<Op<?>,Integer>();
     
     static{            
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java b/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java
index d243bf13f..e25b061eb 100644
--- a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java
+++ b/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java
@@ -5,12 +5,13 @@
  */
 package com.mysema.query.grammar;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import com.mysema.query.JoinExpression;
 import com.mysema.query.QueryBase;
 import com.mysema.query.grammar.HqlGrammar.*;
-import com.mysema.query.grammar.HqlOps.OpQuant;
 import com.mysema.query.grammar.Ops.Op;
 import com.mysema.query.grammar.Types.*;
 
@@ -21,19 +22,6 @@ import com.mysema.query.grammar.Types.*;
  * @version $Id$
  */
 public class HqlSerializer extends VisitorAdapter<HqlSerializer>{
-    
-    private static final Set<Op<?>> wrapForOp;
-    
-    static{
-        Set<Op<?>> ops = new HashSet<Op<?>>();
-        ops.add(Op.IN);
-        ops.add(Op.NOTIN);
-        ops.add(OpQuant.ALL);
-        ops.add(OpQuant.ANY);
-        ops.add(OpQuant.EXISTS);
-        ops.add(OpQuant.NOTEXISTS);
-        wrapForOp = Collections.unmodifiableSet(ops);
-    }
         
     private StringBuilder builder = new StringBuilder();
 
@@ -232,7 +220,7 @@ public class HqlSerializer extends VisitorAdapter<HqlSerializer>{
 
     private void visitOperation(Op<?> operator, Expr<?>... args) {
         boolean old = wrapElements;
-        wrapElements = wrapForOp.contains(operator);
+        wrapElements = HqlOps.wrapCollectionsForOp.contains(operator);
         String pattern = HqlOps.getPattern(operator);
         if (pattern == null)
             throw new IllegalArgumentException("Got no operation pattern for " + operator);