Use Utils class

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
index 2dd040de2d780d084cdca403076ca004627bd1aa..9ca1aa1e9f029b23dae3a16814ac8c39c98fa03c 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineJS.java
@@ -315,7 +315,7 @@ public class SelectorEngineJS extends SelectorEngineImpl {
                       ? attributeMatch.getStr(3).replaceAll("\\.", "\\.")\r
                       : null;\r
               String attrVal = attrToRegExp(attributeValue,\r
-                  (SelectorEngine.or(attributeMatch.getStr(2), null)));\r
+                  (GQUtils.or(attributeMatch.getStr(2), null)));\r
               regExpAttributes[q] = (GQUtils.truth(attrVal) ? new Regexp(\r
                   attrVal) : null);\r
               regExpAttributesStr[q] = attributeMatch.getStr(1);\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
index 8a413f7771285d21bf0e78fe6d3558e0c9e3b09d..6cc48dec4eafedceacc083fa5ce005be7942adba 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineXPath.java
@@ -119,7 +119,7 @@ public class SelectorEngineXPath extends SelectorEngineImpl {
         }\r
         if (truth(splitRule.allAttr)) {\r
           xPathExpression += replaceAttr(\r
-              SelectorEngine.or(splitRule.allAttr, ""));\r
+              GQUtils.or(splitRule.allAttr, ""));\r
         }\r
         if (truth(splitRule.allPseudos)) {\r
           Regexp pseudoSplitRegExp = new Regexp(\r