From e706b8b5da89557e0476b8e43300a59eeb98954d Mon Sep 17 00:00:00 2001 From: Ray Cromwell Date: Tue, 3 Jun 2008 07:18:45 +0000 Subject: [PATCH] Refactoring for 0.2 release --- gwtquery-core/pom.xml | 52 ++++++ .../src/main/java/gquery/GQueryBench.gwt.xml | 5 - .../src/main/java/gquery/GQueryDemo.gwt.xml | 5 - .../src/main/java/gquery/GQuerySample.gwt.xml | 5 - .../GwtQuery.gwt.xml} | 40 ++--- .../client/DeferredGQuery.java | 2 +- .../{gquery => gwtquery}/client/Effects.java | 2 +- .../{gquery => gwtquery}/client/Function.java | 2 +- .../{gquery => gwtquery}/client/GQuery.java | 2 +- .../{gquery => gwtquery}/client/JSArray.java | 2 +- .../client/MySelectors.java | 2 +- .../{gquery => gwtquery}/client/Plugin.java | 2 +- .../client/Properties.java | 2 +- .../{gquery => gwtquery}/client/Regexp.java | 2 +- .../{gquery => gwtquery}/client/Selector.java | 7 +- .../client/SelectorEngine.java | 4 +- .../client/Selectors.java | 2 +- .../client/impl/SelectorEngineImpl.java | 8 +- .../client/impl/SelectorEngineJS.java | 8 +- .../client/impl/SelectorEngineJSIE.java | 2 +- .../client/impl/SelectorEngineNative.java | 4 +- .../client/impl/SelectorEngineXPath.java | 16 +- .../rebind/SelectorGeneratorBase.java | 10 +- .../rebind/SelectorGeneratorJS.java | 4 +- .../rebind/SelectorGeneratorNative.java | 4 +- .../rebind/SelectorGeneratorXPath.java | 4 +- .../gebcn/SelectorGeneratorJSGEBCN.java | 4 +- .../gebcn/SelectorGeneratorNativeGEBCN.java | 4 +- .../gebcn/SelectorGeneratorXPathGEBCN.java | 4 +- pom.xml | 153 ++++++++++++++++++ samples/pom.xml | 65 ++++++++ .../gwtquery/samples/GwtQueryBench.gwt.xml | 5 + .../gwtquery/samples/GwtQueryDemo.gwt.xml | 5 + .../gwtquery/samples/GwtQuerySample.gwt.xml | 5 + .../samples/client/GwtQueryBenchModule.java | 6 +- .../samples/client/GwtQueryDemoModule.java | 8 +- .../samples/client/GwtQuerySampleModule.java | 4 +- .../public/DOMAssistantComplete-2.7.js | 0 .../samples/public/GwtQueryBench.html | 2 +- .../gwtquery/samples/public/GwtQueryDemo.html | 2 +- .../samples/public/GwtQuerySample.html | 2 +- .../java/gwtquery/samples}/public/ext-all.js | 0 .../java/gwtquery/samples}/public/ext-base.js | 0 .../java/gwtquery/samples}/public/ext-core.js | 0 .../gwtquery/samples}/public/jquery-1.2.3.js | 0 45 files changed, 366 insertions(+), 101 deletions(-) create mode 100644 gwtquery-core/pom.xml delete mode 100644 gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml delete mode 100644 gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml delete mode 100644 gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml rename gwtquery-core/src/main/java/{gquery/GQuery.gwt.xml => gwtquery/GwtQuery.gwt.xml} (62%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/DeferredGQuery.java (89%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Effects.java (94%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Function.java (93%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/GQuery.java (96%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/JSArray.java (93%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/MySelectors.java (99%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Plugin.java (74%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Properties.java (91%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Regexp.java (94%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Selector.java (51%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/SelectorEngine.java (94%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/Selectors.java (71%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/impl/SelectorEngineImpl.java (94%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/impl/SelectorEngineJS.java (97%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/impl/SelectorEngineJSIE.java (88%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/impl/SelectorEngineNative.java (82%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/client/impl/SelectorEngineXPath.java (93%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/SelectorGeneratorBase.java (93%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/SelectorGeneratorJS.java (96%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/SelectorGeneratorNative.java (90%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/SelectorGeneratorXPath.java (96%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/gebcn/SelectorGeneratorJSGEBCN.java (66%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/gebcn/SelectorGeneratorNativeGEBCN.java (67%) rename gwtquery-core/src/main/java/{gquery => gwtquery}/rebind/gebcn/SelectorGeneratorXPathGEBCN.java (66%) create mode 100644 pom.xml create mode 100644 samples/pom.xml create mode 100644 samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml create mode 100644 samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml create mode 100644 samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml rename gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java => samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java (95%) rename gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java => samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java (91%) rename gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java => samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java (90%) rename {gwtquery-core/src/main/java/gquery => samples/src/main/java/gwtquery/samples}/public/DOMAssistantComplete-2.7.js (100%) rename gwtquery-core/src/main/java/gquery/public/GQueryBench.html => samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html (97%) rename gwtquery-core/src/main/java/gquery/public/GQueryDemo.html => samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html (85%) rename gwtquery-core/src/main/java/gquery/public/GQuerySample.html => samples/src/main/java/gwtquery/samples/public/GwtQuerySample.html (56%) rename {gwtquery-core/src/main/java/gquery => samples/src/main/java/gwtquery/samples}/public/ext-all.js (100%) rename {gwtquery-core/src/main/java/gquery => samples/src/main/java/gwtquery/samples}/public/ext-base.js (100%) rename {gwtquery-core/src/main/java/gquery => samples/src/main/java/gwtquery/samples}/public/ext-core.js (100%) rename {gwtquery-core/src/main/java/gquery => samples/src/main/java/gwtquery/samples}/public/jquery-1.2.3.js (100%) diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml new file mode 100644 index 00000000..449aaebd --- /dev/null +++ b/gwtquery-core/pom.xml @@ -0,0 +1,52 @@ + + 4.0.0 + + gwtquery + gwtquery-project + 0.2-SNAPSHOT + + + gwtquery + jar + GwtQuery Core API + http://gwtquery.com + + + junit + junit + 3.8.1 + jar + + + + + com.google.gwt + gwt-user + ${gwtversion} + jar + + + + + + + + ${basedir}/src/main/java + + + ${basedir}/src/main/resources + + + + + ${basedir}/src/test/java + + + ${basedir}/src/test/resources + + + + + + + diff --git a/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml b/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml deleted file mode 100644 index 4b3f4d69..00000000 --- a/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml b/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml deleted file mode 100644 index 41dfe995..00000000 --- a/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml b/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml deleted file mode 100644 index 7be01766..00000000 --- a/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gwtquery-core/src/main/java/gquery/GQuery.gwt.xml b/gwtquery-core/src/main/java/gwtquery/GwtQuery.gwt.xml similarity index 62% rename from gwtquery-core/src/main/java/gquery/GQuery.gwt.xml rename to gwtquery-core/src/main/java/gwtquery/GwtQuery.gwt.xml index 27ea989d..4153d1a9 100644 --- a/gwtquery-core/src/main/java/gquery/GQuery.gwt.xml +++ b/gwtquery-core/src/main/java/gwtquery/GwtQuery.gwt.xml @@ -16,8 +16,8 @@ ]]> - - + + @@ -25,8 +25,8 @@ - - + + @@ -37,8 +37,8 @@ - - + + @@ -46,33 +46,33 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -83,8 +83,8 @@ - - + + diff --git a/gwtquery-core/src/main/java/gquery/client/DeferredGQuery.java b/gwtquery-core/src/main/java/gwtquery/client/DeferredGQuery.java similarity index 89% rename from gwtquery-core/src/main/java/gquery/client/DeferredGQuery.java rename to gwtquery-core/src/main/java/gwtquery/client/DeferredGQuery.java index ac6e05e3..fe1165ae 100644 --- a/gwtquery-core/src/main/java/gquery/client/DeferredGQuery.java +++ b/gwtquery-core/src/main/java/gwtquery/client/DeferredGQuery.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.Element; diff --git a/gwtquery-core/src/main/java/gquery/client/Effects.java b/gwtquery-core/src/main/java/gwtquery/client/Effects.java similarity index 94% rename from gwtquery-core/src/main/java/gquery/client/Effects.java rename to gwtquery-core/src/main/java/gwtquery/client/Effects.java index 8e7fff23..abe6345c 100644 --- a/gwtquery-core/src/main/java/gquery/client/Effects.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Effects.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NodeList; diff --git a/gwtquery-core/src/main/java/gquery/client/Function.java b/gwtquery-core/src/main/java/gwtquery/client/Function.java similarity index 93% rename from gwtquery-core/src/main/java/gquery/client/Function.java rename to gwtquery-core/src/main/java/gwtquery/client/Function.java index d42207f6..a30bd8ea 100644 --- a/gwtquery-core/src/main/java/gquery/client/Function.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Function.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.Event; diff --git a/gwtquery-core/src/main/java/gquery/client/GQuery.java b/gwtquery-core/src/main/java/gwtquery/client/GQuery.java similarity index 96% rename from gwtquery-core/src/main/java/gquery/client/GQuery.java rename to gwtquery-core/src/main/java/gwtquery/client/GQuery.java index 388ff81a..1fa9bba3 100644 --- a/gwtquery-core/src/main/java/gquery/client/GQuery.java +++ b/gwtquery-core/src/main/java/gwtquery/client/GQuery.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.ButtonElement; diff --git a/gwtquery-core/src/main/java/gquery/client/JSArray.java b/gwtquery-core/src/main/java/gwtquery/client/JSArray.java similarity index 93% rename from gwtquery-core/src/main/java/gquery/client/JSArray.java rename to gwtquery-core/src/main/java/gwtquery/client/JSArray.java index f28b3c2c..a8049347 100644 --- a/gwtquery-core/src/main/java/gquery/client/JSArray.java +++ b/gwtquery-core/src/main/java/gwtquery/client/JSArray.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.dom.client.Element; diff --git a/gwtquery-core/src/main/java/gquery/client/MySelectors.java b/gwtquery-core/src/main/java/gwtquery/client/MySelectors.java similarity index 99% rename from gwtquery-core/src/main/java/gquery/client/MySelectors.java rename to gwtquery-core/src/main/java/gwtquery/client/MySelectors.java index 067a9d5d..5059893b 100644 --- a/gwtquery-core/src/main/java/gquery/client/MySelectors.java +++ b/gwtquery-core/src/main/java/gwtquery/client/MySelectors.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NodeList; diff --git a/gwtquery-core/src/main/java/gquery/client/Plugin.java b/gwtquery-core/src/main/java/gwtquery/client/Plugin.java similarity index 74% rename from gwtquery-core/src/main/java/gquery/client/Plugin.java rename to gwtquery-core/src/main/java/gwtquery/client/Plugin.java index cc8adfbc..9f7864d2 100644 --- a/gwtquery-core/src/main/java/gquery/client/Plugin.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Plugin.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; /** * A GQuery plugin diff --git a/gwtquery-core/src/main/java/gquery/client/Properties.java b/gwtquery-core/src/main/java/gwtquery/client/Properties.java similarity index 91% rename from gwtquery-core/src/main/java/gquery/client/Properties.java rename to gwtquery-core/src/main/java/gwtquery/client/Properties.java index cc558a5d..20030926 100644 --- a/gwtquery-core/src/main/java/gquery/client/Properties.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Properties.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.JavaScriptObject; diff --git a/gwtquery-core/src/main/java/gquery/client/Regexp.java b/gwtquery-core/src/main/java/gwtquery/client/Regexp.java similarity index 94% rename from gwtquery-core/src/main/java/gquery/client/Regexp.java rename to gwtquery-core/src/main/java/gwtquery/client/Regexp.java index 3856fdde..5eae1c1d 100644 --- a/gwtquery-core/src/main/java/gquery/client/Regexp.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Regexp.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.JavaScriptObject; diff --git a/gwtquery-core/src/main/java/gquery/client/Selector.java b/gwtquery-core/src/main/java/gwtquery/client/Selector.java similarity index 51% rename from gwtquery-core/src/main/java/gquery/client/Selector.java rename to gwtquery-core/src/main/java/gwtquery/client/Selector.java index 3c6f3ed3..a137faa4 100644 --- a/gwtquery-core/src/main/java/gquery/client/Selector.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Selector.java @@ -1,14 +1,9 @@ -package gquery.client; +package gwtquery.client; import java.lang.annotation.Target; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.LOCAL_VARIABLE; /** * Used to pass a CSS Selector to a generator at compile time diff --git a/gwtquery-core/src/main/java/gquery/client/SelectorEngine.java b/gwtquery-core/src/main/java/gwtquery/client/SelectorEngine.java similarity index 94% rename from gwtquery-core/src/main/java/gquery/client/SelectorEngine.java rename to gwtquery-core/src/main/java/gwtquery/client/SelectorEngine.java index fcf994d7..63c246ec 100644 --- a/gwtquery-core/src/main/java/gquery/client/SelectorEngine.java +++ b/gwtquery-core/src/main/java/gwtquery/client/SelectorEngine.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JavaScriptObject; @@ -7,7 +7,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.NodeList; -import gquery.client.impl.SelectorEngineImpl; +import gwtquery.client.impl.SelectorEngineImpl; /** * diff --git a/gwtquery-core/src/main/java/gquery/client/Selectors.java b/gwtquery-core/src/main/java/gwtquery/client/Selectors.java similarity index 71% rename from gwtquery-core/src/main/java/gquery/client/Selectors.java rename to gwtquery-core/src/main/java/gwtquery/client/Selectors.java index 8a697a6c..6ebd5018 100644 --- a/gwtquery-core/src/main/java/gquery/client/Selectors.java +++ b/gwtquery-core/src/main/java/gwtquery/client/Selectors.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; /** */ diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineImpl.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineImpl.java similarity index 94% rename from gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineImpl.java rename to gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineImpl.java index 674072ef..18774d0c 100644 --- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineImpl.java +++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineImpl.java @@ -1,8 +1,8 @@ -package gquery.client.impl; +package gwtquery.client.impl; -import gquery.client.Regexp; -import gquery.client.JSArray; -import gquery.client.SelectorEngine; +import gwtquery.client.Regexp; +import gwtquery.client.JSArray; +import gwtquery.client.SelectorEngine; import com.google.gwt.dom.client.*; /** diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJS.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJS.java similarity index 97% rename from gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJS.java rename to gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJS.java index d854c4ac..a65e1cdc 100644 --- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJS.java +++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJS.java @@ -1,13 +1,13 @@ -package gquery.client.impl; +package gwtquery.client.impl; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.NodeList; -import gquery.client.JSArray; -import gquery.client.Regexp; -import gquery.client.SelectorEngine; +import gwtquery.client.JSArray; +import gwtquery.client.Regexp; +import gwtquery.client.SelectorEngine; /** * Copyright 2007 Timepedia.org Licensed under the Apache License, Version 2.0 diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJSIE.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJSIE.java similarity index 88% rename from gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJSIE.java rename to gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJSIE.java index f680c7f9..e7aad623 100644 --- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJSIE.java +++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJSIE.java @@ -1,4 +1,4 @@ -package gquery.client.impl; +package gwtquery.client.impl; import com.google.gwt.dom.client.Element; diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineNative.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineNative.java similarity index 82% rename from gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineNative.java rename to gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineNative.java index aaa7635c..b9e96bd8 100644 --- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineNative.java +++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineNative.java @@ -1,10 +1,10 @@ -package gquery.client.impl; +package gwtquery.client.impl; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NodeList; import com.google.gwt.dom.client.Node; -import gquery.client.SelectorEngine; +import gwtquery.client.SelectorEngine; /** * diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineXPath.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineXPath.java similarity index 93% rename from gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineXPath.java rename to gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineXPath.java index 1eed30ee..cbc2ca3b 100644 --- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineXPath.java +++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineXPath.java @@ -1,15 +1,15 @@ -package gquery.client.impl; +package gwtquery.client.impl; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.NodeList; -import gquery.client.JSArray; -import gquery.client.Regexp; -import gquery.client.SelectorEngine; -import static gquery.client.SelectorEngine.eq; -import static gquery.client.SelectorEngine.truth; +import gwtquery.client.JSArray; +import gwtquery.client.Regexp; +import gwtquery.client.SelectorEngine; +import static gwtquery.client.SelectorEngine.eq; +import static gwtquery.client.SelectorEngine.truth; /** * Copyright 2007 Timepedia.org Licensed under the Apache License, Version 2.0 @@ -225,13 +225,13 @@ public class SelectorEngineXPath extends SelectorEngineImpl { if(!allAttr) return ""; return allAttr.replace(/(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?/g, function(a,b,c,d) { - return @gquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(a,b || "",c || "",d || ""); + return @gwtquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(a,b || "",c || "",d || ""); }); }-*/; private native String replaceAttr2(String allAttr) /*-{ if(!allAttr) return ""; - return allAttr.replace(/\[(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?\]/g, @gquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)); + return allAttr.replace(/\[(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?\]/g, @gwtquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)); }-*/; } \ No newline at end of file diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorBase.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorBase.java similarity index 93% rename from gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorBase.java rename to gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorBase.java index 2d1dba80..21630d1d 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorBase.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorBase.java @@ -1,4 +1,4 @@ -package gquery.rebind; +package gwtquery.rebind; import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; @@ -13,7 +13,7 @@ import com.google.gwt.user.rebind.SourceWriter; import java.io.PrintWriter; -import gquery.client.Selector; +import gwtquery.client.Selector; /** * @@ -148,10 +148,10 @@ public abstract class SelectorGeneratorBase extends Generator { } ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory(packageName, className); - composerFactory.setSuperclass("gquery.client.SelectorEngine"); + composerFactory.setSuperclass("gwtquery.client.SelectorEngine"); composerFactory.addImport("com.google.gwt.core.client.GWT"); - composerFactory.addImport("gquery.client.GQuery"); - composerFactory.addImport("gquery.client.JSArray"); + composerFactory.addImport("gwtquery.client.GQuery"); + composerFactory.addImport("gwtquery.client.JSArray"); composerFactory.addImport("com.google.gwt.dom.client.*"); for (String interfaceName : interfaceNames) { diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorJS.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorJS.java similarity index 96% rename from gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorJS.java rename to gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorJS.java index e316a84b..8917f4c9 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorJS.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorJS.java @@ -1,4 +1,4 @@ -package gquery.rebind; +package gwtquery.rebind; import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; @@ -7,7 +7,7 @@ import com.google.gwt.user.rebind.SourceWriter; import java.util.regex.Pattern; -import gquery.client.Selector; +import gwtquery.client.Selector; /** * diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorNative.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorNative.java similarity index 90% rename from gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorNative.java rename to gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorNative.java index a00de220..e7db5da7 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorNative.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorNative.java @@ -1,11 +1,11 @@ -package gquery.rebind; +package gwtquery.rebind; import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.typeinfo.JMethod; import com.google.gwt.user.rebind.SourceWriter; -import gquery.client.Selector; +import gwtquery.client.Selector; /** * diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorXPath.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorXPath.java similarity index 96% rename from gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorXPath.java rename to gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorXPath.java index ab4ca185..d43cfd3e 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorXPath.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorXPath.java @@ -1,4 +1,4 @@ -package gquery.rebind; +package gwtquery.rebind; import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import gquery.client.Selector; +import gwtquery.client.Selector; /** * diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java similarity index 66% rename from gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java rename to gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java index 447ddf64..a287303a 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java @@ -1,6 +1,6 @@ -package gquery.rebind.gebcn; +package gwtquery.rebind.gebcn; -import gquery.rebind.SelectorGeneratorJS; +import gwtquery.rebind.SelectorGeneratorJS; /** */ diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java similarity index 67% rename from gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java rename to gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java index eb1efe36..04226dbd 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java @@ -1,6 +1,6 @@ -package gquery.rebind.gebcn; +package gwtquery.rebind.gebcn; -import gquery.rebind.SelectorGeneratorNative; +import gwtquery.rebind.SelectorGeneratorNative; /** * diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java similarity index 66% rename from gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java rename to gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java index 36f7f138..9bcce9ce 100644 --- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java +++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java @@ -1,6 +1,6 @@ -package gquery.rebind.gebcn; +package gwtquery.rebind.gebcn; -import gquery.rebind.SelectorGeneratorXPath; +import gwtquery.rebind.SelectorGeneratorXPath; /** */ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c89c4d5e --- /dev/null +++ b/pom.xml @@ -0,0 +1,153 @@ + + 4.0.0 + gwtquery + gwtquery-project + pom + 0.2-SNAPSHOT + GwtQuery Project + http://gwtquery.com + GwtQuery is a jQuery clone written in GWT. + + Google Code + http://code.google.com/p/gwtquery/issues/list + + + + + ray + Ray Cromwell + ray@timefire.com + + Project Manager + Architect + + Timepedia.org + -8 + + + + + scm:svn:http://gwtquery.googlecode.com/svn/trunk + scm:svn:https://gwtquery.googlecode.com/svn/trunk + http://code.google.com/p/gwtquery/source/browse/trunk + + + + gwtquery-core + samples + + + + + + org.apache.maven.plugins + maven-release-plugin + + + https://gwtquery.googlecode.com/svn/tags + + clean install + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + + org.codehaus.mojo + changelog-maven-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-jxr-plugin + + true + + + + + + + + gwt-maven + http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ + + + + + + gwt-maven + http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ + + + timepedia + http://gwt-chronoscope.googlecode.com/svn/mavenrepo/ + + + + + + default + + 1 + + + + 1.5.0 + + + + + + + linux + + + linux + + + + linux + + + + + windows + + + windows + + + + windows + + + + + macosx + + + mac os x + + + + mac + + -Xmx512m -XstartOnFirstThread + + + + + diff --git a/samples/pom.xml b/samples/pom.xml new file mode 100644 index 00000000..0859ac53 --- /dev/null +++ b/samples/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + + gwtquery + gwtquery-project + 0.2-SNAPSHOT + + + GwtQuery Samples + gwtquery-samples + jar + + + ${groupId} + gwtquery + ${version} + jar + + + + + + + com.totsp.gwt + maven-googlewebtoolkit2-plugin + + ${gwtversion} + INFO + + gwtquery.samples.GQueryDemo/index.html + + + + gwtquery.samples.GQueryDemo + + + gwtquery.samples.GQueryBench + + + gwtquery.samples.GQuerySample + + + + + + + setupgwt + validate + + setup + extractGwt + + + + compilegwt + + compile + + + + + + + + diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml new file mode 100644 index 00000000..e1b9159d --- /dev/null +++ b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml new file mode 100644 index 00000000..00b219af --- /dev/null +++ b/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml new file mode 100644 index 00000000..be8b1706 --- /dev/null +++ b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java similarity index 95% rename from gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java rename to samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java index b7b73560..0d09afa0 100644 --- a/gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java +++ b/samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; @@ -6,9 +6,9 @@ import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.IncrementalCommand; -import static gquery.client.GQuery.$; +import static gwtquery.client.GQuery.$; -public class GQueryBenchModule implements EntryPoint { +public class GwtQueryBenchModule implements EntryPoint { private StringBuffer log = new StringBuffer(); diff --git a/gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java similarity index 91% rename from gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java rename to samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java index 5190c21d..b72d0530 100644 --- a/gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java +++ b/samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; @@ -8,13 +8,13 @@ import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Node; import com.google.gwt.user.client.Event; -import static gquery.client.GQuery.$; -import static gquery.client.Effects.Effects; +import static gwtquery.client.GQuery.$; +import static gwtquery.client.Effects.Effects; /** * */ -public class GQueryDemoModule implements EntryPoint { +public class GwtQueryDemoModule implements EntryPoint { // Compile-time Selectors! interface Slide extends Selectors { // find all LI elements in DIV.slide elements diff --git a/gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java similarity index 90% rename from gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java rename to samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java index 2382070f..f14ab702 100644 --- a/gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java +++ b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java @@ -1,4 +1,4 @@ -package gquery.client; +package gwtquery.client; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; @@ -19,7 +19,7 @@ import com.google.gwt.user.client.Window; * * @author Ray Cromwell */ -public class GQuerySampleModule implements EntryPoint { +public class GwtQuerySampleModule implements EntryPoint { interface Sample extends Selectors { @Selector(".note") GQuery allNotes(); diff --git a/gwtquery-core/src/main/java/gquery/public/DOMAssistantComplete-2.7.js b/samples/src/main/java/gwtquery/samples/public/DOMAssistantComplete-2.7.js similarity index 100% rename from gwtquery-core/src/main/java/gquery/public/DOMAssistantComplete-2.7.js rename to samples/src/main/java/gwtquery/samples/public/DOMAssistantComplete-2.7.js diff --git a/gwtquery-core/src/main/java/gquery/public/GQueryBench.html b/samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html similarity index 97% rename from gwtquery-core/src/main/java/gquery/public/GQueryBench.html rename to samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html index f2615e16..523616e1 100644 --- a/gwtquery-core/src/main/java/gquery/public/GQueryBench.html +++ b/samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html @@ -5,7 +5,7 @@ - + diff --git a/gwtquery-core/src/main/java/gquery/public/GQueryDemo.html b/samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html similarity index 85% rename from gwtquery-core/src/main/java/gquery/public/GQueryDemo.html rename to samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html index 03323360..8a79c863 100644 --- a/gwtquery-core/src/main/java/gquery/public/GQueryDemo.html +++ b/samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html @@ -1,7 +1,7 @@ GQuery Demo - +