You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/02/14 10:35:30 UTC

[myfaces-tobago] branch master updated: Use constants instead of strings

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new af7b092  Use constants instead of strings
af7b092 is described below

commit af7b0926fc4412428ef47fe351f06a975ddbbdd0
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Feb 14 11:36:04 2018 +0100

    Use constants instead of strings
---
 .../internal/taglib/component/BarTagDeclaration.java   | 12 ++++++------
 .../taglib/component/ButtonTagDeclaration.java         | 18 +++++++++---------
 .../internal/taglib/component/InTagDeclaration.java    |  2 +-
 .../internal/taglib/component/PageTagDeclaration.java  |  2 +-
 .../internal/taglib/component/PopupTagDeclaration.java |  4 ++--
 .../internal/taglib/component/SheetTagDeclaration.java | 10 +++++-----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
index baadac7..ea4e382 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
@@ -53,27 +53,27 @@ import javax.faces.component.UIPanel;
             description = "Content will be rendered usually at the right end of the bar.")},
     markups = {
         @Markup(
-            name = "dark",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_DARK,
             description = "Theming for dark backgrounds"
         ),
         @Markup(
-            name = "light",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_LIGHT,
             description = "Theming for light backgrounds"
         ),
         @Markup(
-            name = "small",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SMALL,
             description = "Bar collapse at a small size."
         ),
         @Markup(
-            name = "medium",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_MEDIUM,
             description = "Bar collapse at a medium size."
         ),
         @Markup(
-            name = "large",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_LARGE,
             description = "Bar collapse at a large size."
         ),
         @Markup(
-            name = "extraLarge",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_EXTRA_LARGE,
             description = "Bar collapse at a extra large size."
         )
     })
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
index 8d63726..66d89ec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
@@ -86,39 +86,39 @@ import javax.faces.component.UICommand;
     },
     markups = {
         @Markup(
-            name = "primary",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_PRIMARY,
             description = "Set button color to primary color of the theme."
         ),
         @Markup(
-            name = "secondary",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SECONDARY,
             description = "Set button color to secondary color of the theme."
         ),
         @Markup(
-            name = "success",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SUCCESS,
             description = "Set button color to success color of the theme."
         ),
         @Markup(
-            name = "danger",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_DANGER,
             description = "Set button color to danger color of the theme."
         ),
         @Markup(
-            name = "warning",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_WARNING,
             description = "Set button color to warning color of the theme."
         ),
         @Markup(
-            name = "info",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_INFO,
             description = "Set button color to info color of the theme."
         ),
         @Markup(
-            name = "light",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_LIGHT,
             description = "Set button color to light color of the theme."
         ),
         @Markup(
-            name = "dark",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_DARK,
             description = "Set button color to dark color of the theme."
         ),
         @Markup(
-            name = "none",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_NONE,
             description = "Colorless button."
         )
     })
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
index b317e0f..d96262b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
@@ -88,7 +88,7 @@ import javax.faces.component.UIInput;
             name = ClientBehaviors.BLUR)
     },
     markups = {
-        @Markup(name = "localMenu",
+        @Markup(name = org.apache.myfaces.tobago.context.Markup.STRING_LOCAL_MENU,
             description = "If a suggest menu is available, it will be rendered on the component, "
                 + "not in the '.tobago-page-menuStore'."
         )
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
index 156ec1c..000556b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
@@ -70,7 +70,7 @@ import javax.faces.component.UIForm;
     },
     markups = {
         @Markup(
-            name = "spread",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SPREAD,
             description = "Use the full browser height for the HTML content."
         )
     })
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
index 35fd1ad..4155b5e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
@@ -47,11 +47,11 @@ import org.apache.myfaces.tobago.model.CollapseMode;
     rendererType = RendererTypes.POPUP,
     markups = {
         @Markup(
-            name = "large",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_LARGE,
             description = "Large popup"
         ),
         @Markup(
-            name = "small",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SMALL,
             description = "Small popup"
         )
     })
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
index d6708f8..405228f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
@@ -67,23 +67,23 @@ import javax.faces.component.UIData;
     },
     markups = {
         @Markup(
-            name = "bordered",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_BORDERED,
             description = "Add borders to the table cells."
         ),
         @Markup(
-            name = "dark",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_DARK,
             description = "Set dark background."
         ),
         @Markup(
-            name = "hover",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_HOVER,
             description = "Background of row changed on hovering."
         ),
         @Markup(
-            name = "small",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_SMALL,
             description = "Small margins for table cells."
         ),
         @Markup(
-            name = "striped",
+            name = org.apache.myfaces.tobago.context.Markup.STRING_STRIPED,
             description = "Zebra-striping for table rows."
         ),
     })

-- 
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.