svn commit: r1131252 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java

[jdonnerstag]

Author: jdonnerstag
Date: Fri Jun  3 21:16:10 2011
New Revision: 1131252

URL: http://svn.apache.org/viewvc?rev=1131252&view=rev
Log:
patch applied
wickettag contents aren't skipped when trying to find markup in 1.5
Issue: WICKET-3725

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java?rev=1131252&r1=1131251&r2=1131252&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java
 Fri Jun  3 21:16:10 2011
@@ -20,7 +20,6 @@ import java.util.Iterator;
 
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.Strings;
 
 /**
  * Represents a portion of a markup file, but always spans a complete tag. E.g.
@@ -141,10 +140,7 @@ public class MarkupFragment implements I
 
        public final IMarkupFragment find(final String id)
        {
-               if (Strings.isEmpty(id))
-               {
-                       throw new IllegalArgumentException("Parameter 'id' must 
not be null or empty");
-               }
+               Args.notEmpty(id, "id");
 
                MarkupStream stream = new MarkupStream(this);
                stream.setCurrentIndex(1);
@@ -160,8 +156,7 @@ public class MarkupFragment implements I
                                        {
                                                return 
stream.getMarkupFragment();
                                        }
-                                       if (tag.isOpen() && 
!tag.hasNoCloseTag() && !(tag instanceof WicketTag) &&
-                                               (tag.isAutoComponentTag() == 
false))
+                                       if (tag.isOpen() && 
!tag.hasNoCloseTag() && !tag.isAutoComponentTag())
                                        {
                                                
stream.skipToMatchingCloseTag(tag);
                                        }