You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/09/06 22:54:34 UTC

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

Author: pete
Date: Tue Sep  6 20:54:34 2011
New Revision: 1165835

URL: http://svn.apache.org/viewvc?rev=1165835&view=rev
Log:
WICKET-4032: related to 'ComponentStringResourceLoader must not include the index of repeater items in resource lookup but still resolve properties to them'

- remove redundant piece of code

Modified:
    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/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=1165835&r1=1165834&r2=1165835&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 Tue Sep  6 20:54:34 2011
@@ -254,18 +254,6 @@ public class ComponentStringResourceLoad
 			}
 		}
 
-		// If not found, than check if a property with the 'key' provided by
-		// the user can be found.
-		if (string == null)
-		{
-			// Walk the component hierarchy down from page to the component
-			for (int i = searchStack.size() - 1; (i >= 0) && (string == null); i--)
-			{
-				Class<?> clazz = searchStack.get(i);
-				string = loadStringResource(clazz, key, locale, style, variation);
-			}
-		}
-
 		return string;
 	}