svn commit: r1083267 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser: XmlTag.java filter/EnclosureHandler.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Mar 19 19:48:07 2011
New Revision: 1083267

URL: http://svn.apache.org/viewvc?rev=1083267&view=rev
Log:
replaced deprecated ComponentTag.getString with getAttribute

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=1083267&r1=1083266&r2=1083267&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
 Sat Mar 19 19:48:07 2011
@@ -256,7 +256,7 @@ public class XmlTag extends MarkupElemen
         *            The key
         * @return The string value
         */
-       public CharSequence getString(final String key)
+       public CharSequence getAttribute(final String key)
        {
                return getAttributes().getCharSequence(key);
        }
@@ -637,7 +637,7 @@ public class XmlTag extends MarkupElemen
                                {
                                        buffer.append(" ");
                                        buffer.append(key);
-                                       CharSequence value = getString(key);
+                                       CharSequence value = getAttribute(key);
 
                                        // Attributes without values are 
possible, e.g. 'disabled'
                                        if (value != null)

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java?rev=1083267&r1=1083266&r2=1083267&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
 Sat Mar 19 19:48:07 2011
@@ -129,7 +129,7 @@ public final class EnclosureHandler exte
                        ComponentTag lastEnclosure = stack.lastElement();
 
                        // If the enclosure tag has NO child attribute, then ...
-                       if (lastEnclosure.getString(CHILD_ATTRIBUTE) == null)
+                       if (lastEnclosure.getAttribute(CHILD_ATTRIBUTE) == null)
                        {
                                // We encountered more than one child component 
inside
                                // the enclosure and are not able to 
automatically
@@ -155,7 +155,7 @@ public final class EnclosureHandler exte
                if ((tag instanceof WicketTag) && 
((WicketTag)tag).isEnclosureTag())
                {
                        // Yes, we handled the tag
-                       return new Enclosure(tag.getId(), 
tag.getString(EnclosureHandler.CHILD_ATTRIBUTE));
+                       return new Enclosure(tag.getId(), 
tag.getAttribute(EnclosureHandler.CHILD_ATTRIBUTE));
                }
 
                // We were not able to handle the tag