Skip to content

Commit 9e1864c

Browse files
committed
Merge pull request #79 from GwtMaterialDesign/release_1.5.1
Release 1.5.1
2 parents a2d0e6a + f6a0a85 commit 9e1864c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+840
-624
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material library before we build the demo
10-
- git clone -b release_1.5 https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_1.5.1 https://github.com/GwtMaterialDesign/gwt-material.git
1111
- cd gwt-material
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..

.utility/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.1" ]; then
44
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
55
mvn deploy --settings ~/settings.xml
66
fi

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
77
<dependency>
88
<groupId>com.github.gwtmaterialdesign</groupId>
99
<artifactId>gwt-material-addins</artifactId>
10-
<version>1.5.0</version>
10+
<version>1.5.1</version>
1111
</dependency>
1212
```
1313

@@ -16,13 +16,13 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
1616
<dependency>
1717
<groupId>com.github.gwtmaterialdesign</groupId>
1818
<artifactId>gwt-material-addins</artifactId>
19-
<version>1.5.1-SNAPSHOT</version>
19+
<version>1.6.0-SNAPSHOT</version>
2020
</dependency>
2121
```
2222

2323
Import the theme in your GWT Module
2424
```xml
25-
<inherits name="gwt.material.design.addins.GWTMaterialAddins"/>
25+
<inherits name="gwt.material.design.addins.GwtMaterialAddins"/>
2626
```
2727
Define the ui:binder with single import (e.g Bubble and Timer Picker using a single package import)
2828
```xml

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@
33
<parent>
44
<artifactId>gwt-material-parent</artifactId>
55
<groupId>com.github.gwtmaterialdesign</groupId>
6-
<version>1.5.0</version>
6+
<version>1.5.1</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

1010
<artifactId>gwt-material-addins</artifactId>
1111

1212
<name>Gwt Material Addins</name>
13+
<version>1.5.1</version>
1314
<description>Extra Components of GWT Material Framework</description>
1415

1516
<properties>
16-
<gwt-material.version>1.5.0</gwt-material.version>
17+
<gwt-material.version>1.5.1</gwt-material.version>
1718
</properties>
1819

1920
<scm>
2021
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
2122
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
2223
<url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
23-
<tag>HEAD</tag>
24+
<tag>v1.5.1</tag>
2425
</scm>
2526

2627
<licenses>

src/main/java/gwt/material/design/addins/client/MaterialAddins.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,32 @@
2020
* #L%
2121
*/
2222

23-
2423
import com.google.gwt.core.client.EntryPoint;
24+
import com.google.gwt.core.client.GWT;
25+
import gwt.material.design.addins.client.StartupState.DebugState;
2526

2627
public class MaterialAddins implements EntryPoint {
2728

29+
private static StartupState startupState;
30+
2831
@Override
2932
public void onModuleLoad() {
30-
MaterialResourceInjector.setDebug(false);
33+
// Initialize the startup state.
34+
checkStartupState();
35+
}
36+
37+
private static void checkStartupState() {
38+
if(startupState == null) {
39+
startupState = GWT.create(StartupState.class);
40+
}
41+
}
42+
43+
public static StartupState getStartupState() {
44+
checkStartupState();
45+
return startupState;
46+
}
47+
48+
public static boolean isDebug() {
49+
return MaterialAddins.getStartupState() instanceof DebugState;
3150
}
3251
}

src/main/java/gwt/material/design/addins/client/MaterialResourceInjector.java

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/main/java/gwt/material/design/addins/client/MaterialAddinsDebug.java renamed to src/main/java/gwt/material/design/addins/client/StartupState.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
* #L%
2121
*/
2222

23+
public class StartupState {
24+
public StartupState() {
25+
}
2326

24-
import com.google.gwt.core.client.EntryPoint;
25-
26-
public class MaterialAddinsDebug implements EntryPoint {
27-
28-
@Override
29-
public void onModuleLoad() {
30-
MaterialResourceInjector.setDebug(true);
27+
public static class DebugState extends StartupState {
28+
public DebugState() {}
3129
}
3230
}

0 commit comments

Comments
 (0)