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 2009/10/20 10:54:51 UTC
svn commit: r827004 - in /myfaces/tobago/trunk/core/src: main/java/org/apache/myfaces/tobago/component/ main/java/org/apache/myfaces/tobago/taglib/component/ test/java/org/apache/myfaces/tobago/component/

Author: lofwyr
Date: Tue Oct 20 08:54:50 2009
New Revision: 827004

URL: http://svn.apache.org/viewvc?rev=827004&view=rev
Log:
TOBAGO-803: Value 'occurence' of OrderBy is misspelled and should be renamed to 'occurrence'

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIMessages.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIMessages.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIMessages.java?rev=827004&r1=827003&r2=827004&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIMessages.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIMessages.java Tue Oct 20 08:54:50 2009
@@ -127,12 +127,12 @@
 
   public abstract String getFor();
 
-  public enum OrderBy {
+  public static enum OrderBy {
 
-    OCCURENCE,
+    OCCURRENCE,
     SEVERITY;
 
-    public static final String OCCURENCE_STRING = "occurence";
+    public static final String OCCURRENCE_STRING = "occurrence";
     public static final String SEVERITY_STRING = "severity";
 
     public static OrderBy parse(String key) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java?rev=827004&r1=827003&r2=827004&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java Tue Oct 20 08:54:50 2009
@@ -97,9 +97,9 @@
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.UIMessages$OrderBy",
-      allowedValues = {AbstractUIMessages.OrderBy.OCCURENCE_STRING, AbstractUIMessages.OrderBy.SEVERITY_STRING},
-      defaultValue = AbstractUIMessages.OrderBy.OCCURENCE_STRING, 
-      defaultCode = "org.apache.myfaces.tobago.component.AbstractUIMessages.OrderBy.OCCURENCE")
+      allowedValues = {AbstractUIMessages.OrderBy.OCCURRENCE_STRING, AbstractUIMessages.OrderBy.SEVERITY_STRING},
+      defaultValue = AbstractUIMessages.OrderBy.OCCURRENCE_STRING, 
+      defaultCode = "org.apache.myfaces.tobago.component.AbstractUIMessages.OrderBy.OCCURRENCE")
   void setOrderBy(String orderBy);
 
   /**

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java?rev=827004&r1=827003&r2=827004&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java Tue Oct 20 08:54:50 2009
@@ -132,7 +132,7 @@
   @Test
   public void testOrderByEnum() {
     Assert.assertEquals(2, UIMessages.OrderBy.values().length);
-    Assert.assertEquals(UIMessages.OrderBy.OCCURENCE, UIMessages.OrderBy.parse(UIMessages.OrderBy.OCCURENCE_STRING));
+    Assert.assertEquals(UIMessages.OrderBy.OCCURRENCE, UIMessages.OrderBy.parse(UIMessages.OrderBy.OCCURRENCE_STRING));
     Assert.assertEquals(UIMessages.OrderBy.SEVERITY, UIMessages.OrderBy.parse(UIMessages.OrderBy.SEVERITY_STRING));
   }