svn commit: r1100252 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket: Localizer.java resource/loader/ComponentStringResourceLoader.java

[pete]

Author: pete
Date: Fri May  6 15:20:59 2011
New Revision: 1100252

URL: http://svn.apache.org/viewvc?rev=1100252&view=rev
Log:
WICKET-3671 eliminate repeater index on resource path for localizer lookup and 
resource cache

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Localizer.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Localizer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Localizer.java?rev=1100252&r1=1100251&r2=1100252&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Localizer.java 
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Localizer.java Fri 
May  6 15:20:59 2011
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentMa
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.wicket.markup.html.list.LoopItem;
+import org.apache.wicket.markup.repeater.AbstractRepeater;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.resource.loader.IStringResourceLoader;
 import org.apache.wicket.settings.IResourceSettings;
@@ -488,14 +489,15 @@ public class Localizer
                                 * are irrelevant when generating resource 
cache keys (b) they cause a lot of
                                 * redundant keys to be generated
                                 */
-                               final boolean skip = cursor instanceof LoopItem;
+                               final Component parent = cursor.getParent();
+                               final boolean skip = parent instanceof 
AbstractRepeater;
 
                                if (skip == false)
                                {
                                        
buffer.append(':').append(cursor.getId());
                                }
 
-                               cursor = cursor.getParent();
+                               cursor = parent;
                        }
 
                        buffer.append('-').append(locale);

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=1100252&r1=1100251&r2=1100252&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
 Fri May  6 15:20:59 2011
@@ -27,7 +27,7 @@ import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.list.LoopItem;
+import org.apache.wicket.markup.repeater.AbstractRepeater;
 import org.apache.wicket.resource.IPropertiesFactory;
 import org.apache.wicket.resource.Properties;
 import org.apache.wicket.util.lang.Args;
@@ -283,7 +283,7 @@ public class ComponentStringResourceLoad
                
                while (current.getParent() != null)
                {
-                       final boolean skip = current instanceof LoopItem;
+                       final boolean skip = current.getParent() instanceof 
AbstractRepeater;
 
                        if (skip == false)
                        {