You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2003/03/29 19:47:10 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/bean StringBeanInitializer.java
hlship 2003/03/29 10:47:10
Modified: examples/Workbench/src/org/apache/tapestry/workbench/components
Border.java
framework/src/org/apache/tapestry IComponent.java
BaseComponentTemplateLoader.java
AbstractComponent.java
framework/src/org/apache/tapestry/bean
StringBeanInitializer.java
Log:
[ 18490 ] compile warning for Workbench
Revision Changes Path
1.3 +3 -3 jakarta-tapestry/examples/Workbench/src/org/apache/tapestry/workbench/components/Border.java
Index: Border.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/org/apache/tapestry/workbench/components/Border.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Border.java 10 Mar 2003 19:25:22 -0000 1.2
+++ Border.java 29 Mar 2003 18:47:09 -0000 1.3
@@ -91,7 +91,7 @@
if (_tabOrder == null)
{
- String tabOrderValue = getStrings().getString("tabOrder");
+ String tabOrderValue = getString("tabOrder");
StringSplitter splitter = new StringSplitter(' ');
@@ -132,7 +132,7 @@
// Need to check for synchronization issues, but I think
// ResourceBundle is safe.
- return getStrings().getString(getPageName());
+ return getString(getPageName());
}
public IAsset getLeftTabAsset()
1.3 +1 -2 jakarta-tapestry/framework/src/org/apache/tapestry/IComponent.java
Index: IComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/IComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IComponent.java 15 Mar 2003 21:22:08 -0000 1.2
+++ IComponent.java 29 Mar 2003 18:47:09 -0000 1.3
@@ -331,7 +331,6 @@
* if no string is defined for the key
* @since 2.0.4
*
- * @deprecated Use {@link #getStrings()} instead.
**/
public String getString(String key);
1.5 +12 -9 jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java
Index: BaseComponentTemplateLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseComponentTemplateLoader.java 23 Mar 2003 01:29:42 -0000 1.4
+++ BaseComponentTemplateLoader.java 29 Mar 2003 18:47:09 -0000 1.5
@@ -118,9 +118,9 @@
private static class LocalizedStringRender implements IRender
{
private IComponent _component;
- private IComponentStrings _strings;
private String _key;
private Map _attributes;
+ private String _value;
private boolean _raw;
private LocalizedStringRender(IComponent component, LocalizationToken token)
@@ -152,15 +152,13 @@
}
}
- if (_strings == null)
- _strings = _component.getStrings();
-
- String value = _strings.getString(_key);
+ if (_value == null)
+ _value = _component.getString(_key);
if (_raw)
- writer.printRaw(value);
+ writer.printRaw(_value);
else
- writer.print(value);
+ writer.print(_value);
if (_attributes != null)
writer.end();
@@ -314,7 +312,12 @@
private IComponent createImplicitComponent(String id, String componentType, Location location)
{
IComponent result =
- _pageLoader.createImplicitComponent(_requestCycle, _loadComponent, id, componentType, location);
+ _pageLoader.createImplicitComponent(
+ _requestCycle,
+ _loadComponent,
+ id,
+ componentType,
+ location);
return result;
}
1.4 +2 -7 jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java
Index: AbstractComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractComponent.java 23 Mar 2003 01:29:42 -0000 1.3
+++ AbstractComponent.java 29 Mar 2003 18:47:09 -0000 1.4
@@ -936,8 +936,6 @@
* Obtains the {@link IComponentStrings} for this component
* (if necessary), and gets the string from it.
*
- * @deprecated Use {@link IComponentStrings#getString(String)} instead.
- *
**/
public String getString(String key)
@@ -954,7 +952,6 @@
* @param arguments passed to the formatter
*
* @since 2.2
- * @deprecated Use {@link IComponentStrings#formatString(String, Object[])} instead.
*
**/
@@ -967,7 +964,6 @@
* Convienience method for {@link #formatString(String, Object[])}
*
* @since 2.2
- * @deprecated Use {@link IComponentStrings#format(String, Object)} instead.
*
**/
@@ -980,7 +976,7 @@
* Convienience method for {@link #formatString(String, Object[])}
*
* @since 2.2
- * @deprecated Use {@link IComponentStrings#format(String, Object, Object)} instead.
+ *
**/
public String formatString(String key, Object argument1, Object argument2)
@@ -992,7 +988,6 @@
* Convienience method for {@link #formatString(String, Object[])}
*
* @since 2.2
- * @deprecated Use {@link IComponentStrings#format(String, Object, Object, Object)} instead.
*
**/
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/bean/StringBeanInitializer.java
Index: StringBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/StringBeanInitializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.3
+++ StringBeanInitializer.java 29 Mar 2003 18:47:10 -0000 1.4
@@ -76,7 +76,7 @@
public void setBeanProperty(IBeanProvider provider, Object bean)
{
IComponent component = provider.getComponent();
- String value = component.getStrings().getString(_key);
+ String value = component.getString(_key);
setBeanProperty(provider.getResourceResolver(), bean, value);
}