myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1395546 - in /myfaces/tobago/branches/tobago-1.5.x: tobago-core/src/main/java/org/apache/myfaces/tobago/context/ tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ tobago-...
Date Mon, 08 Oct 2012 13:19:41 GMT
Author: lofwyr
Date: Mon Oct  8 13:19:40 2012
New Revision: 1395546

URL: http://svn.apache.org/viewvc?rev=1395546&view=rev
Log:
TOBAGO-1206: Some sheet header markups are missing

Modified:
    myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
    myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml

Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java?rev=1395546&r1=1395545&r2=1395546&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
(original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
Mon Oct  8 13:19:40 2012
@@ -186,6 +186,10 @@ public final class Markup implements Ser
     return EmptyIterator.INSTANCE;
   }
 
+  /**
+   * Adds one markup to an other.
+   * Attention: The markup itself is not modified, you need to use the result of this operation.
+   */
   public Markup add(Markup markup) {
     if (markup == null) {
       return this;

Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1395546&r1=1395545&r2=1395546&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
Mon Oct  8 13:19:40 2012
@@ -753,7 +753,7 @@ public class SheetRenderer extends Layou
       }
       tip += ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetTipSorting");
 
-      markup.add(Markup.SORTABLE);
+      markup = markup.add(Markup.SORTABLE);
 
       SheetState sheetState = sheet.getSheetState(facesContext);
       if (column.getId().equals(sheetState.getSortedColumnId())) {
@@ -761,11 +761,11 @@ public class SheetRenderer extends Layou
         if (sheetState.isAscending()) {
           sorterImage = contextPath + resourceManager.getImage(facesContext, "image/ascending.gif");
           sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetAscending");
-          markup.add(Markup.ASCENDING);
+          markup = markup.add(Markup.ASCENDING);
         } else {
           sorterImage = contextPath + resourceManager.getImage(facesContext, "image/descending.gif");
           sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetDescending");
-          markup.add(Markup.DESCENDING);
+          markup = markup.add(Markup.DESCENDING);
         }
         if (sortTitle != null) {
           tip += " - " + sortTitle;

Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1395546&r1=1395545&r2=1395546&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Mon Oct  8 13:19:40 2012
@@ -245,6 +245,9 @@
             <markup>disabled</markup>
             <!-- internal: for the header -->
             <markup>resizable</markup>
+            <markup>sortable</markup>
+            <markup>ascending</markup>
+            <markup>descending</markup>
             <!-- for the rows -->
             <markup>odd</markup>
             <markup>even</markup>



Mime
View raw message