Avoid Fx class depending on CSS statics, now CSS stuff should be added when the user specifically uses it

2 files changed, 16 insertions, 14 deletions

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/css/BorderColorProperty.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/css/BorderColorProperty.java
index c93f5bd9..36435366 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/css/BorderColorProperty.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/css/BorderColorProperty.java
@@ -21,11 +21,11 @@ package com.google.gwt.query.client.css;
  */
 public class BorderColorProperty extends CssProperty<RGBColor> {
 
-  private static final String BORDER_BOTTOM_COLOR_PROPERTY = "borderBottomColor";
-  private static final String BORDER_COLOR_PROPERTY = "borderColor";
-  private static final String BORDER_LEFT_COLOR_PROPERTY = "borderLeftColor";
-  private static final String BORDER_RIGHT_COLOR_PROPERTY = "borderRightColor";
-  private static final String BORDER_TOP_COLOR_PROPERTY = "borderTopColor";
+  public static final String BORDER_BOTTOM_COLOR_PROPERTY = "borderBottomColor";
+  public static final String BORDER_COLOR_PROPERTY = "borderColor";
+  public static final String BORDER_LEFT_COLOR_PROPERTY = "borderLeftColor";
+  public static final String BORDER_RIGHT_COLOR_PROPERTY = "borderRightColor";
+  public static final String BORDER_TOP_COLOR_PROPERTY = "borderTopColor";
 
   public static void init() {
     CSS.BORDER_COLOR = new BorderColorProperty(BORDER_COLOR_PROPERTY);
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Fx.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Fx.java
index 70464e18..92c0ef42 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Fx.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/effects/Fx.java
@@ -3,7 +3,6 @@ package com.google.gwt.query.client.plugins.effects;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.query.client.GQuery;
 import com.google.gwt.query.client.css.BorderColorProperty;
-import com.google.gwt.query.client.css.CSS;
 import com.google.gwt.query.client.css.RGBColor;
 import com.google.gwt.query.client.js.JsNamedArray;
 import com.google.gwt.query.client.js.JsObjectArray;
@@ -29,9 +28,12 @@ public class Fx {
      */
     public static class BorderColorFx extends ColorFx {
 
-      private static BorderColorProperty[] borderColorProperties = {
-          CSS.BORDER_BOTTOM_COLOR, CSS.BORDER_TOP_COLOR, CSS.BORDER_LEFT_COLOR,
-          CSS.BORDER_RIGHT_COLOR};
+      private static String[] borderColorProperties = {
+          BorderColorProperty.BORDER_BOTTOM_COLOR_PROPERTY,
+          BorderColorProperty.BORDER_TOP_COLOR_PROPERTY,
+          BorderColorProperty.BORDER_LEFT_COLOR_PROPERTY,
+          BorderColorProperty.BORDER_RIGHT_COLOR_PROPERTY};
+      
       private JsNamedArray<int[]> startColors;
 
       public BorderColorFx(Element e, String endColorString) {
@@ -41,17 +43,17 @@ public class Fx {
 
         GQuery $e = GQuery.$(e);
 
-        for (BorderColorProperty border : borderColorProperties) {
+        for (String border : borderColorProperties) {
           int[] startColor = parseColor($e.css(border, true));
-          startColors.put(border.getCssName(), startColor);
+          startColors.put(border, startColor);
         }
       }
 
       @Override
       public void applyValue(GQuery g, double progress) {
-        for (BorderColorProperty border : borderColorProperties) {
-          startColor = startColors.get(border.getCssName());
-          cssprop = border.getCssName();
+        for (String border : borderColorProperties) {
+          startColor = startColors.get(border);
+          cssprop = border;
           super.applyValue(g, progress);
         }
       }