make some constructor private

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index e018f1d89fdd8c2086707a04a0dae3426e2a940f..8b67f3b78922fad6cff7ffa4ccb01c414e2ff1c4 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -544,26 +544,26 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
 \r
   private GQuery previousObject;\r
 \r
-  public GQuery() {\r
+  private GQuery() {\r
   }\r
 \r
-  public GQuery(Element element) {\r
+  private GQuery(Element element) {\r
     if (element != null) {\r
       elements = JSArray.create(element);\r
     }\r
   }\r
 \r
-  public GQuery(GQuery gq) {\r
+  protected GQuery(GQuery gq) {\r
     this(gq == null ? null : gq.get());\r
   }\r
 \r
-  public GQuery(JSArray elements) {\r
+  private GQuery(JSArray elements) {\r
     if (elements != null) {\r
       this.elements = elements;\r
     }\r
   }\r
 \r
-  public GQuery(NodeList<Element> list) {\r
+  private GQuery(NodeList<Element> list) {\r
     if (list != null) {\r
       elements = list;\r
     }\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/ClipAnimation.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/ClipAnimation.java
index 88146a6596cc8619bdfc13de59115c2e76eacce0..437c16ac0374abb9645b4b36b0b77f1d9974b403 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/ClipAnimation.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/ClipAnimation.java
@@ -68,7 +68,7 @@ public class ClipAnimation extends Animation {
     this.direction = d;\r
     this.funcs = funcs;\r
     e = elem;\r
-    g = new Effects(e);\r
+    g = GQuery.$(e).as(Effects.Effects);\r
   }\r
 \r
   @Override\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
index 935e2f86c7ad995565564488931ea34978f1f2b5..ffa8b6ddeb4a802e835a331469ca879b03d86cc0 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Effects.java
@@ -17,10 +17,8 @@ package com.google.gwt.query.client.plugins;
 \r
 import com.google.gwt.animation.client.Animation;\r
 import com.google.gwt.dom.client.Element;\r
-import com.google.gwt.dom.client.NodeList;\r
 import com.google.gwt.query.client.Function;\r
 import com.google.gwt.query.client.GQuery;\r
-import com.google.gwt.query.client.JSArray;\r
 import com.google.gwt.query.client.Properties;\r
 import com.google.gwt.query.client.plugins.ClipAnimation.Action;\r
 import com.google.gwt.query.client.plugins.ClipAnimation.Direction;\r
@@ -52,22 +50,10 @@ public class Effects extends GQueryQueue<Effects>  {
     });\r
   }\r
 \r
-  public Effects(final Element element) {\r
-    super(element);\r
-  }\r
-\r
-  public Effects(GQuery gq) {\r
+  protected Effects(GQuery gq) {\r
     super(gq);\r
   }\r
 \r
-  public Effects(final JSArray elements) {\r
-    super(elements);\r
-  }\r
-\r
-  public Effects(final NodeList<Element> list) {\r
-    super(list);\r
-  }\r
-\r
   /**\r
    * The animate() method allows us to create animation effects on any numeric CSS property. \r
    * The only required parameter is a map of CSS properties. \r

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 8ead39ebe7b3876584e6bedf0ed2762a9fbd3c03..364d34923eb9c866008ea0289da0c5d160c8b5ff 100644 (file)
--- 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
@@ -17,10 +17,8 @@ package com.google.gwt.query.client.plugins;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
-import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.query.client.GQuery;
-import com.google.gwt.query.client.JSArray;
 import com.google.gwt.user.client.Event;
 
 /**
@@ -33,23 +31,14 @@ public class Events extends GQuery {
   static {
     GQuery.registerPlugin(Events.class, new Plugin<Events>() {
       public Events init(GQuery gq) {
-        return new Events(gq.get());
+        return new Events(gq);
       }
     });
   }
 
-  public Events(Element element) {
-    super(element);
+  public Events(GQuery gq) {
+    super(gq);
   }
-
-  public Events(JSArray elements) {
-    super(elements);
-  }
-
-  public Events(NodeList<Element> list) {
-    super(list);
-  }
-  
   /**
    * Binds a set of handlers to a particular Event for each matched element.
    * 

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 84798f26338de31c8970245ed0f98e8508f355ab..52b1587fe864445a4c3160f77bc8c462a13d6cdd 100644 (file)
--- 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
@@ -15,14 +15,12 @@
  */
 package com.google.gwt.query.client.plugins;
 
-import java.util.LinkedList;
-import java.util.Queue;
-
 import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.query.client.GQuery;
-import com.google.gwt.query.client.JSArray;
+
+import java.util.LinkedList;
+import java.util.Queue;
 
 /**
  * Class used in plugins which need a queue system.
@@ -31,22 +29,10 @@ public abstract class GQueryQueue<T extends GQueryQueue<?>> extends GQuery {
   
   private static final String QUEUE_DATA_PREFIX = "GQueryQueue_";
 
-  public GQueryQueue(Element element) {
-    super(element);
-  }
-
-  public GQueryQueue(GQuery gq) {
+  protected GQueryQueue(GQuery gq) {
     super(gq);
   }
 
-  public GQueryQueue(JSArray elements) {
-    super(elements);
-  }
-
-  public GQueryQueue(NodeList<Element> list) {
-    super(list);
-  }
-
   /**
    * Removes a queued function from the front of the queue and executes it.
    */

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryUi.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryUi.java
index 93c5df3b64c74ce0feb9388e4a84667dceb95ca4..2cfa32a24468fe9fea2bb1b6068393f0b482fbbb 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryUi.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/GQueryUi.java
@@ -17,12 +17,10 @@ package com.google.gwt.query.client.plugins;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.event.shared.HasHandlers;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.query.client.GQuery;
-import com.google.gwt.query.client.JSArray;
 import com.google.gwt.query.client.Predicate;
 
 /**
@@ -162,8 +160,8 @@ public class GQueryUi extends GQuery {
           }
         });
       }
-      return scrollParent.length() > 0 ? new GQuery(scrollParent.get(0))
-          : GQuery.$(getViewportElement());
+      return scrollParent.length() > 0 ? $(scrollParent.get(0))
+          : $(getViewportElement());
 
     }
 
@@ -228,25 +226,10 @@ public class GQueryUi extends GQuery {
 
   private GQueryUiImpl impl = GWT.create(GQueryUiImpl.class);
 
-  public GQueryUi() {
-    super();
-  }
-
-  public GQueryUi(Element element) {
-    super(element);
-  }
-
-  public GQueryUi(GQuery gq) {
+  protected GQueryUi(GQuery gq) {
     super(gq);
   }
 
-  public GQueryUi(JSArray elements) {
-    super(elements);
-  }
-
-  public GQueryUi(NodeList<Element> list) {
-    super(list);
-  }
 
   /**
    * Return the immediate scrolling parent.

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/MousePlugin.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/MousePlugin.java
index d99eddac81e4bd1109d5c2494e72f4db611a0a94..69232a891dcf02e534c3dcec3578ed64a221844d 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/MousePlugin.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/MousePlugin.java
@@ -18,11 +18,8 @@ package com.google.gwt.query.client.plugins;
 import com.google.gwt.core.client.Duration;\r
 import com.google.gwt.dom.client.Element;\r
 import com.google.gwt.dom.client.NativeEvent;\r
-import com.google.gwt.dom.client.NodeList;\r
 import com.google.gwt.query.client.Function;\r
 import com.google.gwt.query.client.GQuery;\r
-import com.google.gwt.query.client.JSArray;\r
-import com.google.gwt.query.client.plugins.Events;\r
 \r
 /**\r
  * Base class for all plug-in that need to handle some mouse interactions.\r
@@ -36,22 +33,10 @@ public abstract class MousePlugin extends GQueryUi {
   private MouseOptions options;\r
   private boolean preventClickEvent = false;\r
 \r
-  public MousePlugin(Element element) {\r
-    super(element);\r
-  }\r
-\r
-  public MousePlugin(GQuery gq) {\r
+  protected MousePlugin(GQuery gq) {\r
     super(gq);\r
   }\r
 \r
-  public MousePlugin(JSArray elements) {\r
-    super(elements);\r
-  }\r
-\r
-  public MousePlugin(NodeList<Element> list) {\r
-    super(list);\r
-  }\r
-\r
   protected void destroyMouseHandler() {\r
     as(Events.Events)\r
         .unbind(Event.ONMOUSEDOWN | Event.ONCLICK, getPluginName());\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Widgets.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Widgets.java
index ad3b2e0bdbb7fca10d089681af303267eec83f81..047127a2a7589be7264121f8f6f338f55ae68f52 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Widgets.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/Widgets.java
@@ -16,9 +16,7 @@
 package com.google.gwt.query.client.plugins;\r
 \r
 import com.google.gwt.dom.client.Element;\r
-import com.google.gwt.dom.client.NodeList;\r
 import com.google.gwt.query.client.GQuery;\r
-import com.google.gwt.query.client.JSArray;\r
 import com.google.gwt.user.client.ui.Button;\r
 import com.google.gwt.user.client.ui.HTML;\r
 import com.google.gwt.user.client.ui.TextBox;\r
@@ -38,23 +36,11 @@ public class Widgets extends GQueryQueue<Widgets>  {
       }\r
     });\r
   }\r
-\r
-  public Widgets(final Element element) {\r
-    super(element);\r
-  }\r
-\r
-  public Widgets(GQuery gq) {\r
+  \r
+  protected Widgets(GQuery gq) {\r
     super(gq);\r
   }\r
 \r
-  public Widgets(final JSArray elements) {\r
-    super(elements);\r
-  }\r
-\r
-  public Widgets(final NodeList<Element> list) {\r
-    super(list);\r
-  }\r
-  \r
   @SuppressWarnings("unchecked")\r
   @Override\r
   // TODO: consider more widgets\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/widgets/Widgets.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/widgets/Widgets.java
index c2c260c6cec04d33b42f75ad4d169836015094ad..f250b20f1ede8fe543f404c475e18249d2483626 100755 (executable)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/widgets/Widgets.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/widgets/Widgets.java
@@ -16,9 +16,7 @@
 package com.google.gwt.query.client.plugins.widgets;\r
 \r
 import com.google.gwt.dom.client.Element;\r
-import com.google.gwt.dom.client.NodeList;\r
 import com.google.gwt.query.client.GQuery;\r
-import com.google.gwt.query.client.JSArray;\r
 import com.google.gwt.query.client.plugins.GQueryQueue;\r
 import com.google.gwt.query.client.plugins.Plugin;\r
 import com.google.gwt.query.client.plugins.widgets.widgetfactory.ButtonWidgetFactory;\r
@@ -31,6 +29,9 @@ import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.TabPanel;\r
 import com.google.gwt.user.client.ui.Widget;\r
 \r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
 /**\r
  * Widgets plugin for Gwt Query.\r
  */\r
@@ -46,23 +47,10 @@ public class Widgets extends GQueryQueue<Widgets> {
     });\r
   }\r
 \r
-  public Widgets(final Element element) {\r
-    super(element);\r
-  }\r
-\r
-  public Widgets(GQuery gq) {\r
+  protected Widgets(GQuery gq) {\r
     super(gq);\r
   }\r
 \r
-  public Widgets(final JSArray elements) {\r
-    super(elements);\r
-  }\r
-\r
-  public Widgets(final NodeList<Element> list) {\r
-    super(list);\r
-  }\r
-\r
-\r
   /**\r
    * Create an return a {@link TabPanel} widget with the first selected\r
    * elements. Each div element will create a tab and the first h3 element\r
@@ -141,16 +129,16 @@ public class Widgets extends GQueryQueue<Widgets> {
 \r
   /**\r
    * Try to create a widget using the given factory and the given options for\r
-   * each element of the query.\r
-   * Returns a new gquery set of elements with the new widgets created.\r
+   * each element of the query. Returns a new gquery set of elements with the\r
+   * new widgets created.\r
    */\r
   public <W extends Widget, O extends WidgetOptions> Widgets widgets(\r
       WidgetFactory<W, O> factory, O options) {\r
-    JSArray result = JSArray.create();\r
+    List<Element> result = new ArrayList<Element>();\r
     for (Element e : elements()) {\r
-      result.addNode(widget(e, factory, options).getElement());\r
+      result.add(widget(e, factory, options).getElement());\r
     }\r
-    return new Widgets(result);\r
+    return $(result).as(Widgets);\r
   }\r
 \r
   /**\r