From da2713270761886099ebb7c5883f5fb1761eb274 Mon Sep 17 00:00:00 2001
From: Frank Hossfeld <frank.hossfeld@googlemail.com>
Date: Tue, 20 Nov 2018 23:24:30 +0100
Subject: [PATCH] some improvements

* update version gwt-maven-plugin
* improve travis
* replace dom.Style with dom.style
---
 .travis.yml                                   | 12 +++++-
 pom.xml                                       | 23 +++++-----
 .../safecss/shared/SafeStylesBuilder.java     | 40 ++++++++---------
 .../shared/SafeStylesHostedModeUtilsJvm.java  |  2 +
 .../safecss/shared/SafeStylesUtils.java       | 43 ++++++++++---------
 .../org/gwtproject/safecss/SafeCss.gwt.xml    |  2 +-
 .../shared/GwtSafeStylesUtilsTest.java        | 16 +++----
 .../gwtproject/safecss/SafeCssTest.gwt.xml    |  2 +-
 8 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eeb4e2e..6560c4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,11 @@
 language: java
-jdk: openjdk8
-script: mvn clean install
+
+jdk:
+- oraclejdk8
+- openjdk8
+
+sudo: false
+
+cache:
+  directories:
+  - "$HOME/.m2"
diff --git a/pom.xml b/pom.xml
index 9998487..850b0ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
   <dependencies>
     <dependency>
       <groupId>org.gwtproject.dom</groupId>
-      <artifactId>gwt-dom</artifactId>
+      <artifactId>gwt-dom-style-definitions</artifactId>
       <version>${dom.version}</version>
     </dependency>
     <dependency>
@@ -56,6 +56,7 @@
       <artifactId>safehtml</artifactId>
       <version>${safehtml.version}</version>
     </dependency>
+
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -66,21 +67,23 @@
       <artifactId>guava-gwt</artifactId>
       <version>${guava.version}</version>
     </dependency>
-    
+
+    <!-- only for test -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-dev</artifactId>
-    </dependency>
-    
-    <!-- only for test -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -139,7 +142,7 @@
       <plugin>
         <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>1.0-rc-9</version>
+        <version>1.0-rc-10</version>
         <extensions>true</extensions>
         <configuration>
           <moduleName>org.gwtproject.safecss.SafeCss</moduleName>
diff --git a/src/main/java/org/gwtproject/safecss/shared/SafeStylesBuilder.java b/src/main/java/org/gwtproject/safecss/shared/SafeStylesBuilder.java
index abef8fa..7ee028f 100644
--- a/src/main/java/org/gwtproject/safecss/shared/SafeStylesBuilder.java
+++ b/src/main/java/org/gwtproject/safecss/shared/SafeStylesBuilder.java
@@ -15,26 +15,26 @@
  */
 package org.gwtproject.safecss.shared;
 
-import org.gwtproject.dom.client.Style.BorderStyle;
-import org.gwtproject.dom.client.Style.Clear;
-import org.gwtproject.dom.client.Style.Cursor;
-import org.gwtproject.dom.client.Style.Display;
-import org.gwtproject.dom.client.Style.Float;
-import org.gwtproject.dom.client.Style.FontStyle;
-import org.gwtproject.dom.client.Style.FontWeight;
-import org.gwtproject.dom.client.Style.ListStyleType;
-import org.gwtproject.dom.client.Style.Overflow;
-import org.gwtproject.dom.client.Style.Position;
-import org.gwtproject.dom.client.Style.TableLayout;
-import org.gwtproject.dom.client.Style.TextAlign;
-import org.gwtproject.dom.client.Style.TextDecoration;
-import org.gwtproject.dom.client.Style.TextJustify;
-import org.gwtproject.dom.client.Style.TextOverflow;
-import org.gwtproject.dom.client.Style.TextTransform;
-import org.gwtproject.dom.client.Style.Unit;
-import org.gwtproject.dom.client.Style.VerticalAlign;
-import org.gwtproject.dom.client.Style.Visibility;
-import org.gwtproject.dom.client.Style.WhiteSpace;
+import org.gwtproject.dom.style.shared.BorderStyle;
+import org.gwtproject.dom.style.shared.Clear;
+import org.gwtproject.dom.style.shared.Cursor;
+import org.gwtproject.dom.style.shared.Display;
+import org.gwtproject.dom.style.shared.Float;
+import org.gwtproject.dom.style.shared.FontStyle;
+import org.gwtproject.dom.style.shared.FontWeight;
+import org.gwtproject.dom.style.shared.ListStyleType;
+import org.gwtproject.dom.style.shared.Overflow;
+import org.gwtproject.dom.style.shared.Position;
+import org.gwtproject.dom.style.shared.TableLayout;
+import org.gwtproject.dom.style.shared.TextAlign;
+import org.gwtproject.dom.style.shared.TextDecoration;
+import org.gwtproject.dom.style.shared.TextJustify;
+import org.gwtproject.dom.style.shared.TextOverflow;
+import org.gwtproject.dom.style.shared.TextTransform;
+import org.gwtproject.dom.style.shared.Unit;
+import org.gwtproject.dom.style.shared.VerticalAlign;
+import org.gwtproject.dom.style.shared.Visibility;
+import org.gwtproject.dom.style.shared.WhiteSpace;
 import org.gwtproject.safehtml.shared.SafeUri;
 
 /**
diff --git a/src/main/java/org/gwtproject/safecss/shared/SafeStylesHostedModeUtilsJvm.java b/src/main/java/org/gwtproject/safecss/shared/SafeStylesHostedModeUtilsJvm.java
index b445cbf..00436c3 100644
--- a/src/main/java/org/gwtproject/safecss/shared/SafeStylesHostedModeUtilsJvm.java
+++ b/src/main/java/org/gwtproject/safecss/shared/SafeStylesHostedModeUtilsJvm.java
@@ -63,6 +63,7 @@ public class SafeStylesHostedModeUtilsJvm
    * @see <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier">CSS 2.1
    * identifiers</a>
    */
+  // TODO El Hoss: do we need this method?
   @VisibleForTesting
   @GwtIncompatible
   public static String isValidStyleName(String name) {
@@ -113,6 +114,7 @@ public static String isValidStyleName(String name) {
    * @see <a href="http://www.w3.org/TR/CSS21/syndata.html#declaration">CSS 2.1
    * declarations and properties</a>
    */
+  // TODO El Hoss: do we need this method?
   @VisibleForTesting
   @GwtIncompatible
   public static String isValidStyleValue(String value) {
diff --git a/src/main/java/org/gwtproject/safecss/shared/SafeStylesUtils.java b/src/main/java/org/gwtproject/safecss/shared/SafeStylesUtils.java
index b2802d3..28b6ded 100644
--- a/src/main/java/org/gwtproject/safecss/shared/SafeStylesUtils.java
+++ b/src/main/java/org/gwtproject/safecss/shared/SafeStylesUtils.java
@@ -15,29 +15,30 @@
  */
 package org.gwtproject.safecss.shared;
 
-import org.gwtproject.dom.client.Style.BorderStyle;
-import org.gwtproject.dom.client.Style.Clear;
-import org.gwtproject.dom.client.Style.Cursor;
-import org.gwtproject.dom.client.Style.Display;
-import org.gwtproject.dom.client.Style.Float;
-import org.gwtproject.dom.client.Style.FontStyle;
-import org.gwtproject.dom.client.Style.FontWeight;
-import org.gwtproject.dom.client.Style.ListStyleType;
-import org.gwtproject.dom.client.Style.OutlineStyle;
-import org.gwtproject.dom.client.Style.Overflow;
-import org.gwtproject.dom.client.Style.Position;
-import org.gwtproject.dom.client.Style.TableLayout;
-import org.gwtproject.dom.client.Style.TextAlign;
-import org.gwtproject.dom.client.Style.TextDecoration;
-import org.gwtproject.dom.client.Style.TextJustify;
-import org.gwtproject.dom.client.Style.TextOverflow;
-import org.gwtproject.dom.client.Style.TextTransform;
-import org.gwtproject.dom.client.Style.Unit;
-import org.gwtproject.dom.client.Style.VerticalAlign;
-import org.gwtproject.dom.client.Style.Visibility;
-import org.gwtproject.dom.client.Style.WhiteSpace;
+import org.gwtproject.dom.style.shared.BorderStyle;
+import org.gwtproject.dom.style.shared.Clear;
+import org.gwtproject.dom.style.shared.Cursor;
+import org.gwtproject.dom.style.shared.Display;
+import org.gwtproject.dom.style.shared.Float;
+import org.gwtproject.dom.style.shared.FontStyle;
+import org.gwtproject.dom.style.shared.FontWeight;
+import org.gwtproject.dom.style.shared.ListStyleType;
+import org.gwtproject.dom.style.shared.OutlineStyle;
+import org.gwtproject.dom.style.shared.Overflow;
+import org.gwtproject.dom.style.shared.Position;
+import org.gwtproject.dom.style.shared.TableLayout;
+import org.gwtproject.dom.style.shared.TextAlign;
+import org.gwtproject.dom.style.shared.TextDecoration;
+import org.gwtproject.dom.style.shared.TextJustify;
+import org.gwtproject.dom.style.shared.TextOverflow;
+import org.gwtproject.dom.style.shared.TextTransform;
+import org.gwtproject.dom.style.shared.Unit;
+import org.gwtproject.dom.style.shared.VerticalAlign;
+import org.gwtproject.dom.style.shared.Visibility;
+import org.gwtproject.dom.style.shared.WhiteSpace;
 import org.gwtproject.safehtml.shared.SafeUri;
 
+
 /**
  * Utility class containing static methods for creating {@link SafeStyles}.
  */
diff --git a/src/main/resources/org/gwtproject/safecss/SafeCss.gwt.xml b/src/main/resources/org/gwtproject/safecss/SafeCss.gwt.xml
index 1e72131..2ec4946 100644
--- a/src/main/resources/org/gwtproject/safecss/SafeCss.gwt.xml
+++ b/src/main/resources/org/gwtproject/safecss/SafeCss.gwt.xml
@@ -17,7 +17,7 @@
 <!-- SafeCss - facilities for avoiding XSS attacks                         -->
 <!--                                                                       -->
 <module>
-    <inherits name="org.gwtproject.dom.DOM"/>
+    <inherits name="org.gwtproject.dom.style.Style"/>
     <inherits name="org.gwtproject.safehtml.SafeHtml"/>
     
     <source path="shared"/>
diff --git a/src/test/java/org/gwtproject/safecss/shared/GwtSafeStylesUtilsTest.java b/src/test/java/org/gwtproject/safecss/shared/GwtSafeStylesUtilsTest.java
index 2706dd0..c9141e9 100644
--- a/src/test/java/org/gwtproject/safecss/shared/GwtSafeStylesUtilsTest.java
+++ b/src/test/java/org/gwtproject/safecss/shared/GwtSafeStylesUtilsTest.java
@@ -17,14 +17,14 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.junit.client.GWTTestCase;
-import org.gwtproject.dom.client.Style.Clear;
-import org.gwtproject.dom.client.Style.Display;
-import org.gwtproject.dom.client.Style.TextAlign;
-import org.gwtproject.dom.client.Style.TextDecoration;
-import org.gwtproject.dom.client.Style.TextJustify;
-import org.gwtproject.dom.client.Style.TextOverflow;
-import org.gwtproject.dom.client.Style.TextTransform;
-import org.gwtproject.dom.client.Style.WhiteSpace;
+import org.gwtproject.dom.style.shared.Display;
+import org.gwtproject.dom.style.shared.TextAlign;
+import org.gwtproject.dom.style.shared.TextDecoration;
+import org.gwtproject.dom.style.shared.TextJustify;
+import org.gwtproject.dom.style.shared.TextOverflow;
+import org.gwtproject.dom.style.shared.TextTransform;
+import org.gwtproject.dom.style.shared.WhiteSpace;
+import org.gwtproject.dom.style.shared.Clear;
 import org.gwtproject.safehtml.shared.SafeUri;
 import org.gwtproject.safehtml.shared.UriUtils;
 
diff --git a/src/test/resources/org/gwtproject/safecss/SafeCssTest.gwt.xml b/src/test/resources/org/gwtproject/safecss/SafeCssTest.gwt.xml
index 8c8e0ac..851692b 100644
--- a/src/test/resources/org/gwtproject/safecss/SafeCssTest.gwt.xml
+++ b/src/test/resources/org/gwtproject/safecss/SafeCssTest.gwt.xml
@@ -18,7 +18,7 @@
 <!--                                                                       -->
 <module>
   <inherits name="org.gwtproject.safecss.SafeCss"/>
-  <inherits name="org.gwtproject.dom.DOM"/>
+  <inherits name="org.gwtproject.dom.style.Style"/>
   
   <source path="shared"/>
 </module>