Merge pull request #518 from GwtMaterialDesign/release_2.0

Preparation for 2.0-rc3 release
GwtMaterialDesign · Nov 28, 2016 · 694a2bb · 694a2bb
2 parents 4f7767a + 456bd27
commit 694a2bb
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 <br/>
 
 ## Demo
-* [2.0-rc2 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
+* [2.0-rc3 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
 * [2.0 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
 
 ## Documentation
@@ -15,12 +15,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
 
 
 ## Maven
-### Current Version 2.0-rc2
+### Current Version 2.0-rc3
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>2.0-rc2</version>
+    <version>2.0-rc3</version>
 </dependency>
 ```
 ### Snapshot Version 2.0-SNAPSHOT

diff --git a/gwt-material/pom.xml b/gwt-material/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0-rc3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.github.gwtmaterialdesign</groupId>
             <artifactId>gwt-material-jquery</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0-rc3</version>
         </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>

diff --git a/gwt-material/src/main/java/gwt/material/design/client/JQueryProvider.java b/gwt-material/src/main/java/gwt/material/design/client/JQueryProvider.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.client;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.TextResource;
+import gwt.material.design.client.resources.WithJQueryDebugResources;
+import gwt.material.design.client.resources.WithJQueryResources;
+
+public class JQueryProvider {
+
+    public TextResource jQuery() {
+        return null;
+    }
+
+    public static class JQueryDebug extends JQueryProvider {
+        private WithJQueryDebugResources resources;
+
+        @Override
+        public TextResource jQuery() {
+            if(resources == null) {
+                resources = GWT.create(WithJQueryDebugResources.class);
+            }
+            return resources.jQueryDebug();
+        }
+    }
+
+    public static class JQueryCompressed extends JQueryProvider {
+        private WithJQueryResources resources;
+
+        @Override
+        public TextResource jQuery() {
+            if(resources == null) {
+                resources = GWT.create(WithJQueryResources.class);
+            }
+            return resources.jQuery();
+        }
+    }
+}
diff --git a/gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java b/gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.ScriptInjector;
 import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.resources.client.TextResource;
@@ -41,7 +42,7 @@ public FutureResource(TextResource resource, boolean removeTag, boolean sourceUr
         }
     }
 
-    static TextResource jqueryResource;
+    static final JQueryProvider jQueryProvider = GWT.create(JQueryProvider.class);
     static List<FutureResource> futureResources;
 
     protected void load() {
@@ -93,20 +94,21 @@ public static void injectCss(TextResource resource) {
     }
 
     protected static boolean checkJQuery(boolean debug) {
-        if (!isjQueryLoaded()) {
-            if (jqueryResource != null) {
-                if (debug) {
-                    injectDebugJs(jqueryResource);
-                } else {
-                    injectJs(jqueryResource);
-                }
+        if (!isjQueryLoaded() && isProvidingJQuery()) {
+            if (debug) {
+                injectDebugJs(jQueryProvider.jQuery());
             } else {
-                return false;
+                injectJs(jQueryProvider.jQuery());
             }
         }
         return true;
     }
 
+    public static boolean isProvidingJQuery() {
+        return jQueryProvider instanceof JQueryProvider.JQueryDebug ||
+               jQueryProvider instanceof JQueryProvider.JQueryCompressed;
+    }
+
     /**
      * Check to see if jQuery is loaded already
      *

diff --git a/gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQuery.java b/gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQuery.java
@@ -21,13 +21,11 @@
  */
 
 import com.google.gwt.core.client.EntryPoint;
-import gwt.material.design.client.resources.WithJQueryResources;
 
 public class MaterialWithJQuery extends MaterialDesignBase implements EntryPoint {
 
     @Override
     public void onModuleLoad() {
-        jqueryResource = WithJQueryResources.INSTANCE.jQuery();
         load();
     }
 }
diff --git a/gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQueryDebug.java b/gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQueryDebug.java
@@ -21,7 +21,6 @@
  */
 
 import com.google.gwt.core.client.EntryPoint;
-import gwt.material.design.client.resources.WithJQueryDebugResources;
 
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
@@ -30,7 +29,6 @@ public class MaterialWithJQueryDebug extends MaterialDesignDebugBase implements
 
     @Override
     public void onModuleLoad() {
-        jqueryResource = WithJQueryDebugResources.INSTANCE.jQueryDebug();
         load();
     }
 }
diff --git a/...material/src/main/java/gwt/material/design/client/resources/WithJQueryDebugResources.java b/...material/src/main/java/gwt/material/design/client/resources/WithJQueryDebugResources.java
@@ -19,12 +19,10 @@
  */
 package gwt.material.design.client.resources;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.TextResource;
 
 public interface WithJQueryDebugResources extends ClientBundle {
-    WithJQueryDebugResources INSTANCE = GWT.create(WithJQueryDebugResources.class);
 
     @Source("js/jquery-2.1.1.js")
     TextResource jQueryDebug();

diff --git a/gwt-material/src/main/java/gwt/material/design/client/resources/WithJQueryResources.java b/gwt-material/src/main/java/gwt/material/design/client/resources/WithJQueryResources.java
@@ -19,12 +19,10 @@
  */
 package gwt.material.design.client.resources;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.TextResource;
 
 public interface WithJQueryResources extends ClientBundle {
-    WithJQueryResources INSTANCE = GWT.create(WithJQueryResources.class);
 
     @Source("js/jquery-2.1.1.min.js")
     TextResource jQuery();

diff --git a/gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQuery.gwt.xml b/gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQuery.gwt.xml
@@ -29,6 +29,14 @@
   <inherits name="gwt.material.design.GwtMaterialDesignBase"/>
   <inherits name="gwt.material.design.ResourcesBasic"/>
 
+  <replace-with class="gwt.material.design.client.JQueryProvider.JQueryCompressed">
+    <when-type-is class="gwt.material.design.client.JQueryProvider"/>
+  </replace-with>
+
+  <replace-with class="gwt.material.design.client.resources.WithJQueryResources">
+    <when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
+  </replace-with>
+
   <!-- Specify the app entry point class -->
   <entry-point class="gwt.material.design.client.MaterialWithJQuery"/>
 </module>
diff --git a/gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQueryDebug.gwt.xml b/gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQueryDebug.gwt.xml
@@ -29,6 +29,14 @@
   <inherits name="gwt.material.design.GwtMaterialDesignBase"/>
   <inherits name="gwt.material.design.ResourcesBasic"/>
 
+  <replace-with class="gwt.material.design.client.JQueryProvider.JQueryDebug">
+    <when-type-is class="gwt.material.design.client.JQueryProvider"/>
+  </replace-with>
+
+  <replace-with class="gwt.material.design.client.resources.WithJQueryDebugResources">
+    <when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
+  </replace-with>
+
   <!-- Specify the app entry point class -->
   <entry-point class="gwt.material.design.client.MaterialWithJQueryDebug"/>
 </module>
diff --git a/gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQuery.gwt.xml b/gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQuery.gwt.xml
@@ -29,6 +29,14 @@
   <inherits name="gwt.material.design.GwtMaterialDesignBase"/>
   <inherits name="gwt.material.design.Resources"/>
 
+  <replace-with class="gwt.material.design.client.JQueryProvider.JQueryCompressed">
+    <when-type-is class="gwt.material.design.client.JQueryProvider"/>
+  </replace-with>
+
+  <replace-with class="gwt.material.design.client.resources.WithJQueryResources">
+    <when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
+  </replace-with>
+
   <!-- Specify the app entry point class -->
   <entry-point class="gwt.material.design.client.MaterialWithJQuery"/>
 </module>
diff --git a/gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQueryDebug.gwt.xml b/gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQueryDebug.gwt.xml
@@ -29,6 +29,14 @@
   <inherits name="gwt.material.design.GwtMaterialDesignBase"/>
   <inherits name="gwt.material.design.Resources"/>
 
+  <replace-with class="gwt.material.design.client.JQueryProvider.JQueryDebug">
+    <when-type-is class="gwt.material.design.client.JQueryProvider"/>
+  </replace-with>
+
+  <replace-with class="gwt.material.design.client.resources.WithJQueryDebugResources">
+    <when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
+  </replace-with>
+
   <!-- Specify the app entry point class -->
   <entry-point class="gwt.material.design.client.MaterialWithJQueryDebug"/>
 </module>
diff --git a/gwt-material/src/test/java/gwt/material/design/client/GwtMaterialTestComponent.java b/gwt-material/src/test/java/gwt/material/design/client/GwtMaterialTestComponent.java
@@ -19,6 +19,7 @@
  */
 package gwt.material.design.client;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.junit.client.GWTTestCase;
 import gwt.material.design.client.resources.MaterialResources;
 import gwt.material.design.client.resources.WithJQueryResources;
@@ -49,8 +50,9 @@ protected void gwtSetUp() throws Exception {
     }
 
     public void setup() {
+        WithJQueryResources jquery = GWT.create(WithJQueryResources.class);
         // Test JQuery
-        MaterialDesign.injectJs(WithJQueryResources.INSTANCE.jQuery());
+        MaterialDesign.injectJs(jquery.jQuery());
         assertTrue(MaterialDesign.isjQueryLoaded());
         // Test Materialize
         MaterialDesign.injectJs(MaterialResources.INSTANCE.materializeJs());

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-rc3</version>
 
     <modules>
         <module>gwt-material</module>
@@ -63,7 +63,7 @@
         <connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</connection>
         <developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material</url>
-        <tag>v2.0-SNAPSHOT</tag>
+        <tag>v2.0-rc3</tag>
     </scm>
 
     <licenses>