Skip to content

Commit 694a2bb

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #518 from GwtMaterialDesign/release_2.0
Preparation for 2.0-rc3 release
2 parents 4f7767a + 456bd27 commit 694a2bb

14 files changed

+109
-25
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<br/>
77

88
## Demo
9-
* [2.0-rc2 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
9+
* [2.0-rc3 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
1010
* [2.0 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
1111

1212
## Documentation
@@ -15,12 +15,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
1515

1616

1717
## Maven
18-
### Current Version 2.0-rc2
18+
### Current Version 2.0-rc3
1919
```xml
2020
<dependency>
2121
<groupId>com.github.gwtmaterialdesign</groupId>
2222
<artifactId>gwt-material</artifactId>
23-
<version>2.0-rc2</version>
23+
<version>2.0-rc3</version>
2424
</dependency>
2525
```
2626
### Snapshot Version 2.0-SNAPSHOT

‎gwt-material/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.0-SNAPSHOT</version>
7+
<version>2.0-rc3</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>com.github.gwtmaterialdesign</groupId>
1919
<artifactId>gwt-material-jquery</artifactId>
20-
<version>1.0-SNAPSHOT</version>
20+
<version>1.0-rc3</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.google.gwt</groupId>

‎gwt-material/src/main/java/gwt/material/design/client/JQueryProvider.java

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.client;
21+
22+
import com.google.gwt.core.client.GWT;
23+
import com.google.gwt.resources.client.TextResource;
24+
import gwt.material.design.client.resources.WithJQueryDebugResources;
25+
import gwt.material.design.client.resources.WithJQueryResources;
26+
27+
public class JQueryProvider {
28+
29+
public TextResource jQuery() {
30+
return null;
31+
}
32+
33+
public static class JQueryDebug extends JQueryProvider {
34+
private WithJQueryDebugResources resources;
35+
36+
@Override
37+
public TextResource jQuery() {
38+
if(resources == null) {
39+
resources = GWT.create(WithJQueryDebugResources.class);
40+
}
41+
return resources.jQueryDebug();
42+
}
43+
}
44+
45+
public static class JQueryCompressed extends JQueryProvider {
46+
private WithJQueryResources resources;
47+
48+
@Override
49+
public TextResource jQuery() {
50+
if(resources == null) {
51+
resources = GWT.create(WithJQueryResources.class);
52+
}
53+
return resources.jQuery();
54+
}
55+
}
56+
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* #L%
2121
*/
2222

23+
import com.google.gwt.core.client.GWT;
2324
import com.google.gwt.core.client.ScriptInjector;
2425
import com.google.gwt.dom.client.StyleInjector;
2526
import com.google.gwt.resources.client.TextResource;
@@ -41,7 +42,7 @@ public FutureResource(TextResource resource, boolean removeTag, boolean sourceUr
4142
}
4243
}
4344

44-
static TextResource jqueryResource;
45+
static final JQueryProvider jQueryProvider = GWT.create(JQueryProvider.class);
4546
static List<FutureResource> futureResources;
4647

4748
protected void load() {
@@ -93,20 +94,21 @@ public static void injectCss(TextResource resource) {
9394
}
9495

9596
protected static boolean checkJQuery(boolean debug) {
96-
if (!isjQueryLoaded()) {
97-
if (jqueryResource != null) {
98-
if (debug) {
99-
injectDebugJs(jqueryResource);
100-
} else {
101-
injectJs(jqueryResource);
102-
}
97+
if (!isjQueryLoaded() && isProvidingJQuery()) {
98+
if (debug) {
99+
injectDebugJs(jQueryProvider.jQuery());
103100
} else {
104-
return false;
101+
injectJs(jQueryProvider.jQuery());
105102
}
106103
}
107104
return true;
108105
}
109106

107+
public static boolean isProvidingJQuery() {
108+
return jQueryProvider instanceof JQueryProvider.JQueryDebug ||
109+
jQueryProvider instanceof JQueryProvider.JQueryCompressed;
110+
}
111+
110112
/**
111113
* Check to see if jQuery is loaded already
112114
*

‎gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQuery.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
*/
2222

2323
import com.google.gwt.core.client.EntryPoint;
24-
import gwt.material.design.client.resources.WithJQueryResources;
2524

2625
public class MaterialWithJQuery extends MaterialDesignBase implements EntryPoint {
2726

2827
@Override
2928
public void onModuleLoad() {
30-
jqueryResource = WithJQueryResources.INSTANCE.jQuery();
3129
load();
3230
}
3331
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQueryDebug.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*/
2222

2323
import com.google.gwt.core.client.EntryPoint;
24-
import gwt.material.design.client.resources.WithJQueryDebugResources;
2524

2625
/**
2726
* Entry point classes define <code>onModuleLoad()</code>.
@@ -30,7 +29,6 @@ public class MaterialWithJQueryDebug extends MaterialDesignDebugBase implements
3029

3130
@Override
3231
public void onModuleLoad() {
33-
jqueryResource = WithJQueryDebugResources.INSTANCE.jQueryDebug();
3432
load();
3533
}
3634
}

‎gwt-material/src/main/java/gwt/material/design/client/resources/WithJQueryDebugResources.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
*/
2020
package gwt.material.design.client.resources;
2121

22-
import com.google.gwt.core.client.GWT;
2322
import com.google.gwt.resources.client.ClientBundle;
2423
import com.google.gwt.resources.client.TextResource;
2524

2625
public interface WithJQueryDebugResources extends ClientBundle {
27-
WithJQueryDebugResources INSTANCE = GWT.create(WithJQueryDebugResources.class);
2826

2927
@Source("js/jquery-2.1.1.js")
3028
TextResource jQueryDebug();

‎gwt-material/src/main/java/gwt/material/design/client/resources/WithJQueryResources.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
*/
2020
package gwt.material.design.client.resources;
2121

22-
import com.google.gwt.core.client.GWT;
2322
import com.google.gwt.resources.client.ClientBundle;
2423
import com.google.gwt.resources.client.TextResource;
2524

2625
public interface WithJQueryResources extends ClientBundle {
27-
WithJQueryResources INSTANCE = GWT.create(WithJQueryResources.class);
2826

2927
@Source("js/jquery-2.1.1.min.js")
3028
TextResource jQuery();

‎gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQuery.gwt.xml

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<inherits name="gwt.material.design.GwtMaterialDesignBase"/>
3030
<inherits name="gwt.material.design.ResourcesBasic"/>
3131

32+
<replace-with class="gwt.material.design.client.JQueryProvider.JQueryCompressed">
33+
<when-type-is class="gwt.material.design.client.JQueryProvider"/>
34+
</replace-with>
35+
36+
<replace-with class="gwt.material.design.client.resources.WithJQueryResources">
37+
<when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
38+
</replace-with>
39+
3240
<!-- Specify the app entry point class -->
3341
<entry-point class="gwt.material.design.client.MaterialWithJQuery"/>
3442
</module>

‎gwt-material/src/main/resources/gwt/material/design/GwtMaterialBasicWithJQueryDebug.gwt.xml

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<inherits name="gwt.material.design.GwtMaterialDesignBase"/>
3030
<inherits name="gwt.material.design.ResourcesBasic"/>
3131

32+
<replace-with class="gwt.material.design.client.JQueryProvider.JQueryDebug">
33+
<when-type-is class="gwt.material.design.client.JQueryProvider"/>
34+
</replace-with>
35+
36+
<replace-with class="gwt.material.design.client.resources.WithJQueryDebugResources">
37+
<when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
38+
</replace-with>
39+
3240
<!-- Specify the app entry point class -->
3341
<entry-point class="gwt.material.design.client.MaterialWithJQueryDebug"/>
3442
</module>

‎gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQuery.gwt.xml

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<inherits name="gwt.material.design.GwtMaterialDesignBase"/>
3030
<inherits name="gwt.material.design.Resources"/>
3131

32+
<replace-with class="gwt.material.design.client.JQueryProvider.JQueryCompressed">
33+
<when-type-is class="gwt.material.design.client.JQueryProvider"/>
34+
</replace-with>
35+
36+
<replace-with class="gwt.material.design.client.resources.WithJQueryResources">
37+
<when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
38+
</replace-with>
39+
3240
<!-- Specify the app entry point class -->
3341
<entry-point class="gwt.material.design.client.MaterialWithJQuery"/>
3442
</module>

‎gwt-material/src/main/resources/gwt/material/design/GwtMaterialWithJQueryDebug.gwt.xml

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<inherits name="gwt.material.design.GwtMaterialDesignBase"/>
3030
<inherits name="gwt.material.design.Resources"/>
3131

32+
<replace-with class="gwt.material.design.client.JQueryProvider.JQueryDebug">
33+
<when-type-is class="gwt.material.design.client.JQueryProvider"/>
34+
</replace-with>
35+
36+
<replace-with class="gwt.material.design.client.resources.WithJQueryDebugResources">
37+
<when-type-is class="gwt.material.design.client.resources.JQueryResource"/>
38+
</replace-with>
39+
3240
<!-- Specify the app entry point class -->
3341
<entry-point class="gwt.material.design.client.MaterialWithJQueryDebug"/>
3442
</module>

‎gwt-material/src/test/java/gwt/material/design/client/GwtMaterialTestComponent.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package gwt.material.design.client;
2121

22+
import com.google.gwt.core.client.GWT;
2223
import com.google.gwt.junit.client.GWTTestCase;
2324
import gwt.material.design.client.resources.MaterialResources;
2425
import gwt.material.design.client.resources.WithJQueryResources;
@@ -49,8 +50,9 @@ protected void gwtSetUp() throws Exception {
4950
}
5051

5152
public void setup() {
53+
WithJQueryResources jquery = GWT.create(WithJQueryResources.class);
5254
// Test JQuery
53-
MaterialDesign.injectJs(WithJQueryResources.INSTANCE.jQuery());
55+
MaterialDesign.injectJs(jquery.jQuery());
5456
assertTrue(MaterialDesign.isjQueryLoaded());
5557
// Test Materialize
5658
MaterialDesign.injectJs(MaterialResources.INSTANCE.materializeJs());

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.github.gwtmaterialdesign</groupId>
77
<artifactId>gwt-material-parent</artifactId>
88
<packaging>pom</packaging>
9-
<version>2.0-SNAPSHOT</version>
9+
<version>2.0-rc3</version>
1010

1111
<modules>
1212
<module>gwt-material</module>
@@ -63,7 +63,7 @@
6363
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
6464
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
6565
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
66-
<tag>v2.0-SNAPSHOT</tag>
66+
<tag>v2.0-rc3</tag>
6767
</scm>
6868

6969
<licenses>

0 commit comments

Comments
 (0)