Author: pete
Date: Tue Sep 6 18:59:43 2011
New Revision: 1165783
URL: http://svn.apache.org/viewvc?rev=1165783&view=rev
Log:
remove unused migration code for 1.5 which is not required anymore
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=1165783&r1=1165782&r2=1165783&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
Tue Sep 6 18:59:43 2011
@@ -232,9 +232,6 @@ public class ComponentStringResourceLoad
// walk it downwards starting with Page down to the Component
List<Class<?>> searchStack =
getResourceLookupComponentStack(component);
- // TODO Should be changed to false in 1.5
- final boolean old = true;
-
// Walk the component hierarchy down from page to the component
for (int i = searchStack.size() - 1; (i >= 0) && (string ==
null); i--)
{
@@ -254,20 +251,8 @@ public class ComponentStringResourceLoad
// If not found, than check if a property with the
'key' provided by
// the user can be found.
- if ((string == null) && old)
- {
- string = loadStringResource(clazz, key, locale,
style);
- }
- }
-
- // If not found, than check if a property with the 'key'
provided by
- // the user can be found.
- if ((string == null) && !old)
- {
- // Walk the component hierarchy down from page to the
component
- for (int i = searchStack.size() - 1; (i >= 0) &&
(string == null); i--)
+ if ((string == null))
{
- Class<?> clazz = searchStack.get(i);
string = loadStringResource(clazz, key, locale,
style);
}
}
