svn commit: r604484 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java

[ivaynberg]

Author: ivaynberg
Date: Sat Dec 15 10:37:39 2007
New Revision: 604484

URL: http://svn.apache.org/viewvc?rev=604484&view=rev
Log:
WICKET-1229

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=604484&r1=604483&r2=604484&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
 Sat Dec 15 10:37:39 2007
@@ -45,8 +45,8 @@
  * @author Igor Vaynberg
  */
 public final class WicketMessageTagHandler extends AbstractMarkupFilter
-               implements
-                       IComponentResolver
+       implements
+               IComponentResolver
 {
        /** */
        private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
                }
 
                final String wicketMessageAttribute = 
tag.getAttributes().getString(
-                               WICKET_MESSAGE_ATTRIBUTE_NAME);
+                       WICKET_MESSAGE_ATTRIBUTE_NAME);
 
                if ((wicketMessageAttribute != null) && 
(wicketMessageAttribute.trim().length() > 0))
                {
@@ -131,13 +131,13 @@
                                for (int i = 0; i < attrsAndKeys.length; i++)
                                {
                                        String attrAndKey = attrsAndKeys[i];
-                                       int colon = attrAndKey.indexOf(":");
+                                       int colon = attrAndKey.lastIndexOf(":");
                                        // make sure the attribute-key pair is 
valid
                                        if (attrAndKey.length() < 3 || colon < 
1 || colon > attrAndKey.length() - 2)
                                        {
                                                throw new 
WicketRuntimeException(
-                                                               "wicket:message 
attribute contains an invalid value [[" + expr +
-                                                                               
"]], must be of form (attr:key)+");
+                                                       "wicket:message 
attribute contains an invalid value [[" + expr +
+                                                               "]], must be of 
form (attr:key)+");
                                        }
 
                                        String attr = attrAndKey.substring(0, 
colon);
@@ -175,12 +175,12 @@
                        if (tag.isOpenClose())
                        {
                                wc = new 
WebComponent(WICKET_MESSAGE_CONTAINER_ID +
-                                               
container.getPage().getAutoIndex());
+                                       container.getPage().getAutoIndex());
                        }
                        else
                        {
                                wc = new 
WebMarkupContainer(WICKET_MESSAGE_CONTAINER_ID +
-                                               
container.getPage().getAutoIndex());
+                                       container.getPage().getAutoIndex());
                        }
 
                        container.autoAdd(wc, markupStream);