From 60a8c900d2d5e415f8885b3b1aced16a7e127546 Mon Sep 17 00:00:00 2001
From: Manolo Carrasco <manolo@apache.org>
Date: Wed, 2 Mar 2011 15:38:56 +0000
Subject: [PATCH] deferred generators do not use private constructors

---
 .../gwt/query/client/plugins/Events.java      |  1 +
 .../gwt/query/client/plugins/GQueryQueue.java |  1 -
 .../query/rebind/SelectorGeneratorBase.java   | 32 +++++++------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Events.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Events.java
index 364d3492..84e35f80 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Events.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Events.java
@@ -126,6 +126,7 @@ public class Events extends GQuery {
    * Example: fire(Event.ONCLICK | Event.ONFOCUS)
    * Example: fire(Event.ONKEYDOWN. 'a');
    */
+  @SuppressWarnings("deprecation")
   public Events trigger(int eventbits, int... keys) {
     if ((eventbits | Event.ONBLUR) == Event.ONBLUR)
       dispatchEvent(document.createBlurEvent());
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
index 52b1587f..0d96f928 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryQueue.java
@@ -135,7 +135,6 @@ public abstract class GQueryQueue<T extends GQueryQueue<?>> extends GQuery {
   }
   
   private void stop(Element elem, boolean clear) {
-    Function ff = null;
     Queue<?> q = queue(elem, null);
     if (q != null) {
       Object f = q.peek();
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/SelectorGeneratorBase.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/SelectorGeneratorBase.java
index 8f362b54..ae1ad643 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/SelectorGeneratorBase.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/SelectorGeneratorBase.java
@@ -73,7 +73,6 @@ public abstract class SelectorGeneratorBase extends Generator {
 
     JParameter[] params = method.getParameters();
 
-    sw.indent();
     String retType = method.getReturnType()
         .getParameterizedQualifiedSourceName();
     sw.print("public final " + retType + " " + method.getName());
@@ -113,7 +112,6 @@ public abstract class SelectorGeneratorBase extends Generator {
     }
     sw.outdent();
     sw.println("}");
-    sw.outdent();
   }
 
   protected void debug(String s) {
@@ -162,7 +160,7 @@ public abstract class SelectorGeneratorBase extends Generator {
     if ("NodeList".equals(method.getReturnType().getSimpleSourceName())) {
       return expr;
     } else {
-      return "new GQuery(" + expr + ")";
+      return "GQuery.$(" + expr + ")";
     }
   }
 
@@ -170,18 +168,16 @@ public abstract class SelectorGeneratorBase extends Generator {
     if ("GQuery".equals(method.getReturnType().getSimpleSourceName())) {
       return expr;
     } else {
-      return "new GQuery(" + expr + ")";
+      return "GQuery.$(" + expr + ")";
     }
   }
 
   // used by benchmark harness
   private void genGetAllMethod(SourceWriter sw, JMethod[] methods,
       TreeLogger treeLogger) {
-    sw.println("public DeferredSelector[] getAllSelectors() {");
+    sw.println("public DeferredSelector[] getAllSelectors() {return ds;}");
+    sw.println("private final DeferredSelector[] ds = new DeferredSelector[] {");
     sw.indent();
-    sw.println("DeferredSelector[] ds = new DeferredSelector[" + (methods.length)
-        + "];");
-    int i = 0;
     for (JMethod m : methods) {
       Selector selectorAnnotation = m.getAnnotation(Selector.class);
       if (selectorAnnotation == null) {
@@ -189,26 +185,20 @@ public abstract class SelectorGeneratorBase extends Generator {
       }
       String selector = selectorAnnotation.value();
 
-      sw.println("ds[" + i + "]=new DeferredSelector() {");
+      sw.println("new DeferredSelector() {");
       sw.indent();
       sw
           .println("public String getSelector() { return \"" + selector
               + "\"; }");
       sw
-          .println("public NodeList<Element> runSelector(Node ctx) { return "
-              + ("NodeList".equals(m.getReturnType().getSimpleSourceName()) ? (m
-                  .getName() + (m.getParameters().length == 0 ? "(); "
-                  : "(ctx); "))
-                  : "eval"
-                      + (m.getParameters().length == 0 ? "(null).get(); "
-                          : "(ctx).get(); ")) + "}");
-
-      i++;
+          .println("public NodeList<Element> runSelector(Node ctx) { return " + 
+                 (m.getName() + (m.getParameters().length == 0 ? "()" : "(ctx)")) + 
+                 ("NodeList".equals(m.getReturnType().getSimpleSourceName()) ? "" : ".get()") + ";}"
+              ) ;
       sw.outdent();
-      sw.println("};");
+      sw.println("},");
     }
-    sw.println("return ds;");
     sw.outdent();
-    sw.println("}");
+    sw.println("};");
   }
 }
-- 
2.39.5