checkstyle fix in GQuery class. Moved or method to utils class

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java
index 6be21c5ed294553a8aeae3497a7eebf1e92eb1be..fd08305758a968ea3735a72f91f1044277597f01 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQUtils.java
@@ -87,6 +87,20 @@ public class GQUtils {
     GQuery.$("#" + id).remove();
     gp.append(gs.attr("src", url).attr("type", "text/javascript").attr("id", id));
   }
+  
+  /**
+   * Return the element which is truth in the double scope. 
+   */
+  public static native double or(double s1, double s2) /*-{
+    return s1 || s2;
+  }-*/;
+  
+  /**
+   * Return the element which is truth in the javascript scope.
+   */
+  public static native <T> T or(T s1, T s2) /*-{
+    return s1 || s2;
+  }-*/;
 
   /**
    * Check if a number is true in the javascript scope. 

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 b19c1eae6570b59d3e58658bee6a42d8eabf554f..6e7e505b83e7fba70b0f62f5183061901c5a5741 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
@@ -48,8 +48,6 @@ import com.google.gwt.user.client.Window;
  */\r
 public class GQuery implements Lazy<GQuery, LazyGQuery> {\r
 \r
-  private static final String OLD_DATA_PREFIX = "old-";\r
-\r
   /**\r
    * A POJO used to store the top/left CSS positioning values of an element.\r
    */\r
@@ -71,6 +69,9 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     }\r
   }\r
 \r
+  /**\r
+   * A class to store data in an element\r
+   */\r
   protected static final class DataCache extends JavaScriptObject {\r
 \r
     protected DataCache() {\r
@@ -142,25 +143,29 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       this[id]=obj;\r
     }-*/;\r
   }\r
-  \r
-  public static final Document document = Document.get();\r
+\r
   public static final BodyElement body = Document.get().getBody();\r
   \r
+  public static final Document document = Document.get();\r
   public static boolean fxOff = false;\r
-\r
+  \r
   public static Class<GQuery> GQUERY = GQuery.class;\r
 \r
   public static final Element window = window();\r
 \r
   private static DataCache dataCache = null;\r
 \r
+  private static SelectorEngine engine;\r
+\r
   private static final int FUNC_PREPEND = 0, FUNC_APPEND = 1, FUNC_AFTER = 2,\r
       FUNC_BEFORE = 3;\r
 \r
+  private static final String OLD_DATA_PREFIX = "old-";\r
+\r
   private static JsMap<Class<? extends GQuery>, Plugin<? extends GQuery>>\r
-      plugins;\r
+      plugins;;\r
 \r
-  private static DocumentStyleImpl styleImpl = GWT.create(DocumentStyleImpl.class);;\r
+  private static DocumentStyleImpl styleImpl = GWT.create(DocumentStyleImpl.class);\r
 \r
   private static Element windowData = null;\r
 \r
@@ -179,17 +184,17 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   }\r
 \r
   /**\r
-   * Wrap a GQuery around an existing node.\r
+   * Wrap a GQuery around an event's target element.\r
    */\r
-  public static GQuery $(Node n) {\r
-    return new GQuery(JSArray.create(n));\r
+  public static GQuery $(Event event) {\r
+    return $((Element) event.getCurrentEventTarget().cast());\r
   }\r
 \r
   /**\r
-   * Wrap a GQuery around an event's target element.\r
+   * Wrap a GQuery around an existing node.\r
    */\r
-  public static GQuery $(Event event) {\r
-    return $((Element)event.getCurrentEventTarget().cast());\r
+  public static GQuery $(Node n) {\r
+    return new GQuery(JSArray.create(n));\r
   }\r
 \r
   /**\r
@@ -244,8 +249,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       Class<T> plugin) {\r
     try {\r
       if (plugins != null) {\r
-        T gquery = (T) plugins.get(plugin).\r
-            init(new GQuery(select(selector, context)));\r
+        T gquery = (T) plugins.get(plugin).init(new GQuery(select(selector, context)));\r
         return gquery;\r
       }\r
       throw new RuntimeException("No plugin for class " + plugin);\r
@@ -331,7 +335,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       n = n.getLastChild();\r
     }\r
     // TODO: add fixes for IE TBODY issue\r
-    return $((NodeList<Element>)n.getChildNodes().cast());\r
+    return $((NodeList<Element>) n.getChildNodes().cast());\r
   }\r
 \r
   protected static <S> Object data(Element item, String name, S value) {\r
@@ -354,7 +358,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     }\r
     return name != null ? d.getObject(name) : id;\r
   }\r
-\r
+  \r
   protected static String[] jsArrayToString(JsArrayString array) {\r
     if (GWT.isScript()) {\r
       return jsArrayToString0(array);\r
@@ -366,7 +370,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       return result;\r
     }\r
   }\r
-  \r
+\r
   private static JSArray copyNodeList(NodeList n) {\r
     JSArray res = JSArray.create();\r
     for (int i = 0; i < n.getLength(); i++) {\r
@@ -386,12 +390,10 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   private static native String[] jsArrayToString0(JsArrayString array) /*-{\r
     return array;\r
   }-*/;\r
-\r
+  \r
   private static native <T extends Node> T[] reinterpretCast(NodeList<T> nl) /*-{\r
     return nl;\r
   }-*/;\r
-  \r
-  private static SelectorEngine engine;\r
 \r
   private static NodeList<Element> select(String selector, Node context) {\r
     if (engine == null) {\r
@@ -1150,8 +1152,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * function fires.\r
    */\r
   public GQuery hover(Function fover, Function fout) {\r
-    return bind(Event.ONMOUSEOVER, null, fover).\r
-        bind(Event.ONMOUSEOUT, null, fout);\r
+    return bind(Event.ONMOUSEOVER, null, fover).bind(Event.ONMOUSEOUT, null, fout);\r
   }\r
 \r
   /**\r
@@ -1461,11 +1462,11 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * relative or absolute). This method only works with visible elements.\r
    */\r
   public GQuery offsetParent() {\r
-    Element offParent = SelectorEngine.\r
-        or(elements.getItem(0).getOffsetParent(), body);\r
-    while (offParent != null && !"body".equalsIgnoreCase(offParent.getTagName())\r
-        && !"html".equalsIgnoreCase(offParent.getTagName()) && "static".\r
-        equals(styleImpl.curCSS(offParent, "position", true))) {\r
+    Element offParent = GQUtils.or(elements.getItem(0).getOffsetParent(), body);\r
+    while (offParent != null \r
+        && !"body".equalsIgnoreCase(offParent.getTagName())\r
+        && !"html".equalsIgnoreCase(offParent.getTagName()) \r
+        && "static".equals(styleImpl.curCSS(offParent, "position", true))) {\r
       offParent = offParent.getOffsetParent();\r
     }\r
     return new GQuery(offParent);\r
@@ -1777,15 +1778,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     }\r
   }\r
 \r
-  /**\r
-   * Force the current matched set of elements to become\r
-   * the specified array of elements.\r
-   */\r
-  public GQuery setArray(NodeList<Element> nodes){\r
-    this.elements = nodes;\r
-    return this;\r
-  }\r
-\r
   /**\r
    * Bind a set of functions to the scroll event of each matched element.\r
    * Or trigger the event if no functions are provided.\r
@@ -1860,6 +1852,15 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     return as(Events).triggerHtmlEvent("select");\r
   }\r
 \r
+  /**\r
+   * Force the current matched set of elements to become\r
+   * the specified array of elements.\r
+   */\r
+  public GQuery setArray(NodeList<Element> nodes) {\r
+    this.elements = nodes;\r
+    return this;\r
+  }\r
+\r
   /**\r
    * Set CSS property on the first element.\r
    */\r
@@ -1898,7 +1899,8 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    */\r
   public GQuery show() {\r
     for (Element e : elements()) {\r
-      styleImpl.setStyleProperty(e, "display", SelectorEngine.or((String)data(e, "oldDisplay", null), ""));\r
+      styleImpl.setStyleProperty(e, "display", \r
+          GQUtils.or((String) data(e, "oldDisplay", null), ""));\r
       // When the display=none is in the stylesheet.\r
       if (!styleImpl.isVisible(e)) {\r
         styleImpl.setStyleProperty(e, "display", "block");\r
@@ -1978,7 +1980,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * Toggle visibility of elements.\r
    */\r
   public GQuery toggle() {\r
-    for (Element e: elements()) {\r
+    for (Element e : elements()) {\r
       if ($(e).visible()) {\r
         $(e).hide();\r
       } else {\r
@@ -1989,7 +1991,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     return this;\r
   }\r
 \r
-\r
   /**\r
    * Toggle among two or more function calls every other click.\r
    */\r
@@ -2005,7 +2006,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
 \r
   /**\r
    * Adds or removes the specified classes to each matched element\r
-   * depending on the class's presence\r
+   * depending on the class's presence.\r
    */\r
   public GQuery toggleClass(String... classes) {\r
     for (Element e : elements()) {\r
@@ -2124,8 +2125,8 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       } else if ("input".equalsIgnoreCase(name)) {\r
         InputElement ie = InputElement.as(e);\r
         String type = ie.getType();\r
-        if ("radio".equalsIgnoreCase((type)) || "checkbox".\r
-            equalsIgnoreCase(type)) {\r
+        if ("radio".equalsIgnoreCase((type)) \r
+            || "checkbox".equalsIgnoreCase(type)) {\r
           if ("checkbox".equalsIgnoreCase(type)) {\r
             for (String val : values) {\r
               if (ie.getValue().equals(val)) {\r
@@ -2413,7 +2414,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     JSArray newNodes = JSArray.create();\r
     for (int i = 0; i < elements().length; i++) {\r
       Element e = elements()[i];\r
-      if (document.equals(e)){\r
+      if (document.equals(e)) {\r
         e = body;\r
       }\r
       for (int j = 0; j < g.size(); j++) {\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
index fb4ce6ff593cfa918d41fac743039e42240c8035..4a2f01fc7a7efb7072fd1f6679e55fae0583b27a 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
@@ -877,12 +877,6 @@ public interface LazyGQuery<T> extends LazyBase<T>{
    */
   void saveCssAttrs(String... cssProps);
 
-  /**
-   * Force the current matched set of elements to become
-   * the specified array of elements.
-   */
-  LazyGQuery<T> setArray(NodeList<Element> nodes);
-
   /**
    * Bind a set of functions to the scroll event of each matched element.
    * Or trigger the event if no functions are provided.
@@ -917,6 +911,12 @@ public interface LazyGQuery<T> extends LazyBase<T>{
 
   LazyGQuery<T> select();
 
+  /**
+   * Force the current matched set of elements to become
+   * the specified array of elements.
+   */
+  LazyGQuery<T> setArray(NodeList<Element> nodes);
+
   /**
    * Set CSS property on the first element.
    */
@@ -988,7 +988,7 @@ public interface LazyGQuery<T> extends LazyBase<T>{
 
   /**
    * Adds or removes the specified classes to each matched element
-   * depending on the class's presence
+   * depending on the class's presence.
    */
   LazyGQuery<T> toggleClass(String... classes);
 

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
index 1fd286e8c77aa67b6394b9c52aa675c55effdc71..8f0c39affd9692bfd2320f06b38b39f167b85d94 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/SelectorEngine.java
@@ -40,10 +40,6 @@ public class SelectorEngine {
        return n.previousSibling || null; \r
     }-*/;\r
 \r
-  public static native <T> T or(T s1, T s2) /*-{\r
-       return s1 || s2;\r
-    }-*/;\r
-\r
   public static native NodeList<Element> querySelectorAll(String selector,\r
       Node ctx) /*-{\r
       return ctx.querySelectorAll(selector);\r

diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
index 9bbba14d32cfb2022f2733ad32c39e97de632ed2..78dc7e0e5c1a316f7aa8df42a3d013d45422be49 100644 (file)
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
@@ -668,6 +668,8 @@ public class GQueryCoreTest extends GWTTestCase {
     assertFalse(GQUtils.eq(45, 42));
     assertFalse(GQUtils.eq("", null));
     assertFalse(GQUtils.eq(0.45, 0.451));
+    
+//    assertEquals("a", GQUtils.or("a", ""));
   }
   
   public void testUtilsTruth() {