Renamed getFormattedValue() methods to getCssValue().

diff --git a/src/java/com/marcozanon/macaco/web/ui/MWebBorder.java b/src/java/com/marcozanon/macaco/web/ui/MWebBorder.java
index 5c94282f7eef92bfc12001aabc22481468ed73f4..c063496388efa4aa329599fcd9564b7cf05185fe 100644 (file)
--- a/src/java/com/marcozanon/macaco/web/ui/MWebBorder.java
+++ b/src/java/com/marcozanon/macaco/web/ui/MWebBorder.java
@@ -78,8 +78,8 @@ public class MWebBorder extends MObject {
         return value;
     }
 
-    public String getFormattedValue() {
-        return this.getWidthReference().getFormattedValue() + " " + this.getStyle().toString() + " " + this.getColorReference().getFormattedValue();
+    public String getCssValue() {
+        return this.getWidthReference().getCssValue() + " " + this.getStyle().toString() + " " + this.getColorReference().getCssValue();
     }
 
 }

diff --git a/src/java/com/marcozanon/macaco/web/ui/MWebColor.java b/src/java/com/marcozanon/macaco/web/ui/MWebColor.java
index ea602f75401c1fea76992b97fd029b87f9eecbf6..e621adc92e3f255d4c91a57cc956932001049635 100644 (file)
--- a/src/java/com/marcozanon/macaco/web/ui/MWebColor.java
+++ b/src/java/com/marcozanon/macaco/web/ui/MWebColor.java
@@ -37,7 +37,7 @@ public class MWebColor extends MObject {
         return this.color;
     }
 
-    public String getFormattedValue() {
+    public String getCssValue() {
         return "#" + String.format("%6H", this.getValue()).replace(" ", "0");
     }
 

diff --git a/src/java/com/marcozanon/macaco/web/ui/MWebDisplayWidget.java b/src/java/com/marcozanon/macaco/web/ui/MWebDisplayWidget.java
index 9a88bd5062442830c06ff183a65ab2a381a95f29..54bb9d8b8c08d80a0ef958b1b3781b254d017aee 100644 (file)
--- a/src/java/com/marcozanon/macaco/web/ui/MWebDisplayWidget.java
+++ b/src/java/com/marcozanon/macaco/web/ui/MWebDisplayWidget.java
@@ -150,7 +150,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getWidthReference()) {
             throw new MNullPropertyWebException("Invalid width: reference null.");
         }
-        return this.getWidthReference().getFormattedValue();
+        return this.getWidthReference().getCssValue();
     }
 
     /* Height */
@@ -192,7 +192,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getHeightReference()) {
             throw new MNullPropertyWebException("Invalid height: reference null.");
         }
-        return this.getHeightReference().getFormattedValue();
+        return this.getHeightReference().getCssValue();
     }
 
     /* Foreground color */
@@ -234,7 +234,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getForegroundColorReference()) {
             throw new MNullPropertyWebException("Invalid foreground color: reference null.");
         }
-        return this.getForegroundColorReference().getFormattedValue();
+        return this.getForegroundColorReference().getCssValue();
     }
 
     /* Background color */
@@ -276,7 +276,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getBackgroundColorReference()) {
             throw new MNullPropertyWebException("Invalid background color: reference null.");
         }
-        return this.getBackgroundColorReference().getFormattedValue();
+        return this.getBackgroundColorReference().getCssValue();
     }
 
     /* Borders */
@@ -375,7 +375,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getTopBorderReference()) {
             throw new MNullPropertyWebException("Invalid top border: reference null.");
         }
-        return this.getTopBorderReference().getFormattedValue();
+        return this.getTopBorderReference().getCssValue();
     }
 
     protected MWebBorder getRightBorderReference() {
@@ -393,7 +393,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getRightBorderReference()) {
             throw new MNullPropertyWebException("Invalid right border: reference null.");
         }
-        return this.getRightBorderReference().getFormattedValue();
+        return this.getRightBorderReference().getCssValue();
     }
 
     protected MWebBorder getBottomBorderReference() {
@@ -411,7 +411,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getBottomBorderReference()) {
             throw new MNullPropertyWebException("Invalid bottom border: reference null.");
         }
-        return this.getBottomBorderReference().getFormattedValue();
+        return this.getBottomBorderReference().getCssValue();
     }
 
     protected MWebBorder getLeftBorderReference() {
@@ -429,7 +429,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getLeftBorderReference()) {
             throw new MNullPropertyWebException("Invalid left border: reference null.");
         }
-        return this.getLeftBorderReference().getFormattedValue();
+        return this.getLeftBorderReference().getCssValue();
     }
 
     /* Font */
@@ -471,7 +471,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getFontReference()) {
             throw new MNullPropertyWebException("Invalid font: reference null.");
         }
-        return this.getFontReference().getFormattedValue();
+        return this.getFontReference().getCssValue();
     }
 
     /* Paddings */
@@ -570,7 +570,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getTopPaddingReference()) {
             throw new MNullPropertyWebException("Invalid top padding: reference null.");
         }
-        return this.getTopPaddingReference().getFormattedValue();
+        return this.getTopPaddingReference().getCssValue();
     }
 
     protected MWebMeasure getRightPaddingReference() {
@@ -588,7 +588,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getRightPaddingReference()) {
             throw new MNullPropertyWebException("Invalid right padding: reference null.");
         }
-        return this.getRightPaddingReference().getFormattedValue();
+        return this.getRightPaddingReference().getCssValue();
     }
 
     protected MWebMeasure getBottomPaddingReference() {
@@ -606,7 +606,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getBottomPaddingReference()) {
             throw new MNullPropertyWebException("Invalid bottom padding: reference null.");
         }
-        return this.getBottomPaddingReference().getFormattedValue();
+        return this.getBottomPaddingReference().getCssValue();
     }
 
     protected MWebMeasure getLeftPaddingReference() {
@@ -624,7 +624,7 @@ public abstract class MWebDisplayWidget extends MWebWidget {
         if (null == this.getLeftPaddingReference()) {
             throw new MNullPropertyWebException("Invalid left padding: reference null.");
         }
-        return this.getLeftPaddingReference().getFormattedValue();
+        return this.getLeftPaddingReference().getCssValue();
     }
 
     /* Text direction */

diff --git a/src/java/com/marcozanon/macaco/web/ui/MWebFont.java b/src/java/com/marcozanon/macaco/web/ui/MWebFont.java
index 1db639f8962dc7cbbf0d5fb05a4284f1a90607ad..dd6f1c1992d438712315fcddad181a54c9666122 100644 (file)
--- a/src/java/com/marcozanon/macaco/web/ui/MWebFont.java
+++ b/src/java/com/marcozanon/macaco/web/ui/MWebFont.java
@@ -148,9 +148,9 @@ public class MWebFont extends MObject {
         return value;
     }
 
-    public String[] getFormattedValue() {
+    public String[] getCssValue() {
         String[] formattedValue = new String[2];
-        formattedValue[0] = this.getStyle().toString() + " " + this.getVariant().toString() + " " + this.getWeight().toString() + " " + this.getSizeReference().getFormattedValue() + " " + this.getFamily();
+        formattedValue[0] = this.getStyle().toString() + " " + this.getVariant().toString() + " " + this.getWeight().toString() + " " + this.getSizeReference().getCssValue() + " " + this.getFamily();
         formattedValue[1] = this.getDecoration().toString();
         return formattedValue;
     }

diff --git a/src/java/com/marcozanon/macaco/web/ui/MWebMeasure.java b/src/java/com/marcozanon/macaco/web/ui/MWebMeasure.java
index a196e06a91bde89492133189e6ad3d228ac5b1e9..6d56825e4db1c1e4c68535dd55f8e59745616fd6 100644 (file)
--- a/src/java/com/marcozanon/macaco/web/ui/MWebMeasure.java
+++ b/src/java/com/marcozanon/macaco/web/ui/MWebMeasure.java
@@ -69,7 +69,7 @@ public class MWebMeasure extends MObject {
         return value;
     }
 
-    public String getFormattedValue() {
+    public String getCssValue() {
         return this.getNumber() + this.getUnit().toString();
     }