You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/03/15 05:17:26 UTC
svn commit: r385968 [3/3] - in /jakarta/tapestry/trunk: .settings/
contrib/src/java/org/apache/tapestry/contrib/components/
contrib/src/java/org/apache/tapestry/contrib/form/
contrib/src/java/org/apache/tapestry/contrib/form/checkboxes/
contrib/src/jav...
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java Tue Mar 14 20:17:15 2006
@@ -46,22 +46,24 @@
* @since 2.0.4
*/
-public class ComponentMessagesSourceImpl implements ComponentMessagesSource, ResetEventListener
+public class ComponentMessagesSourceImpl implements ComponentMessagesSource,
+ ResetEventListener
{
- private Properties _emptyProperties = new Properties();
-
- private static final String SUFFIX = ".properties";
-
/**
- * The name of the component/application/etc property that will be used to determine the
- * encoding to use when loading the messages
+ * The name of the component/application/etc property that will be used to
+ * determine the encoding to use when loading the messages.
*/
public static final String MESSAGES_ENCODING_PROPERTY_NAME = "org.apache.tapestry.messages-encoding";
+
+ private static final String SUFFIX = ".properties";
+
+ private Properties _emptyProperties = new Properties();
/**
- * Map of Maps. The outer map is keyed on component specification location (a{@link Resource}.
- * This inner map is keyed on locale and the value is a {@link Properties}.
+ * Map of Maps. The outer map is keyed on component specification location
+ * (a{@link Resource}. This inner map is keyed on locale and the value is
+ * a {@link Properties}.
*/
private Map _componentCache = new HashMap();
@@ -69,15 +71,18 @@
private ComponentPropertySource _componentPropertySource;
/**
- * Returns an instance of {@link Properties}containing the properly localized messages for the
- * component, in the {@link Locale}identified by the component's containing page.
+ * Returns an instance of {@link Properties}containing the properly
+ * localized messages for the component, in the {@link Locale}identified by
+ * the component's containing page.
*/
- protected synchronized Properties getLocalizedProperties(IComponent component)
+ protected synchronized Properties getLocalizedProperties(
+ IComponent component)
{
Defense.notNull(component, "component");
- Resource specificationLocation = component.getSpecification().getSpecificationLocation();
+ Resource specificationLocation = component.getSpecification()
+ .getSpecificationLocation();
Locale locale = component.getPage().getLocale();
Map propertiesMap = findPropertiesMapForResource(specificationLocation);
@@ -89,11 +94,8 @@
// Not found, create it now.
- result = assembleComponentProperties(
- component,
- specificationLocation,
- propertiesMap,
- locale);
+ result = assembleComponentProperties(component,
+ specificationLocation, propertiesMap, locale);
propertiesMap.put(locale, result);
}
@@ -114,7 +116,8 @@
return result;
}
- private Properties getNamespaceProperties(IComponent component, Locale locale)
+ private Properties getNamespaceProperties(IComponent component,
+ Locale locale)
{
INamespace namespace = component.getNamespace();
@@ -126,7 +129,8 @@
if (result == null)
{
- result = assembleNamespaceProperties(namespace, propertiesMap, locale);
+ result = assembleNamespaceProperties(namespace, propertiesMap,
+ locale);
propertiesMap.put(locale, result);
}
@@ -137,40 +141,42 @@
private Properties assembleComponentProperties(IComponent component,
Resource baseResourceLocation, Map propertiesMap, Locale locale)
{
- List localizations = findLocalizationsForResource(baseResourceLocation, locale);
+ List localizations = findLocalizationsForResource(baseResourceLocation,
+ locale);
Properties parent = null;
Properties assembledProperties = null;
-
+
Iterator i = localizations.iterator();
- while (i.hasNext())
+ while(i.hasNext())
{
ResourceLocalization rl = (ResourceLocalization) i.next();
Locale l = rl.getLocale();
- // Retrieve namespace properties for current locale (and parent locales)
- Properties namespaceProperties = getNamespaceProperties(component, l);
-
- // Use the namespace properties as default for assembled properties
+ // Retrieve namespace properties for current locale (and parent
+ // locales)
+ Properties namespaceProperties = getNamespaceProperties(component,
+ l);
+
+ // Use the namespace properties as default for assembled properties
assembledProperties = new Properties(namespaceProperties);
-
+
// Read localized properties for component
- Properties properties = readComponentProperties(component, l, rl.getResource(), null);
+ Properties properties = readComponentProperties(component, l, rl
+ .getResource(), null);
// Override parent properties with current locale
- if (parent != null) {
- if (properties != null)
- parent.putAll(properties);
+ if (parent != null)
+ {
+ if (properties != null) parent.putAll(properties);
}
- else
- parent = properties;
-
+ else parent = properties;
+
// Add to assembled properties
- if (parent != null)
- assembledProperties.putAll(parent);
-
+ if (parent != null) assembledProperties.putAll(parent);
+
// Save result in cache
propertiesMap.put(l, assembledProperties);
}
@@ -178,12 +184,11 @@
return assembledProperties;
}
- private Properties assembleNamespaceProperties(INamespace namespace, Map propertiesMap,
- Locale locale)
+ private Properties assembleNamespaceProperties(INamespace namespace,
+ Map propertiesMap, Locale locale)
{
- List localizations = findLocalizationsForResource(
- namespace.getSpecificationLocation(),
- locale);
+ List localizations = findLocalizationsForResource(namespace
+ .getSpecificationLocation(), locale);
// Build them back up in reverse order.
@@ -191,7 +196,7 @@
Iterator i = localizations.iterator();
- while (i.hasNext())
+ while(i.hasNext())
{
ResourceLocalization rl = (ResourceLocalization) i.next();
@@ -201,7 +206,8 @@
if (properties == null)
{
- properties = readNamespaceProperties(namespace, l, rl.getResource(), parent);
+ properties = readNamespaceProperties(namespace, l, rl
+ .getResource(), parent);
propertiesMap.put(l, properties);
}
@@ -215,9 +221,9 @@
/**
* Finds the localizations of the provided resource. Returns a List of
- * {@link ResourceLocalization}(each pairing a locale with a localized resource). The list is
- * ordered from most general (i.e., "foo.properties") to most specific (i.e.,
- * "foo_en_US_yokel.properties").
+ * {@link ResourceLocalization}(each pairing a locale with a localized
+ * resource). The list is ordered from most general (i.e., "foo.properties")
+ * to most specific (i.e., "foo_en_US_yokel.properties").
*/
private List findLocalizationsForResource(Resource resource, Locale locale)
@@ -226,13 +232,15 @@
String baseName = extractBaseName(resource);
- LocalizedNameGenerator g = new LocalizedNameGenerator(baseName, locale, SUFFIX);
+ LocalizedNameGenerator g = new LocalizedNameGenerator(baseName, locale,
+ SUFFIX);
- while (g.more())
+ while(g.more())
{
String localizedName = g.next();
Locale l = g.getCurrentLocale();
- Resource localizedResource = resource.getRelativeResource(localizedName);
+ Resource localizedResource = resource
+ .getRelativeResource(localizedName);
result.add(new ResourceLocalization(l, localizedResource));
}
@@ -250,26 +258,28 @@
return fileName.substring(0, dotx);
}
- private Properties readComponentProperties(IComponent component, Locale locale,
- Resource propertiesResource, Properties parent)
+ private Properties readComponentProperties(IComponent component,
+ Locale locale, Resource propertiesResource, Properties parent)
{
String encoding = getComponentMessagesEncoding(component, locale);
- return readPropertiesResource(propertiesResource.getResourceURL(), encoding, parent);
+ return readPropertiesResource(propertiesResource.getResourceURL(),
+ encoding, parent);
}
- private Properties readNamespaceProperties(INamespace namespace, Locale locale,
- Resource propertiesResource, Properties parent)
+ private Properties readNamespaceProperties(INamespace namespace,
+ Locale locale, Resource propertiesResource, Properties parent)
{
String encoding = getNamespaceMessagesEncoding(namespace, locale);
- return readPropertiesResource(propertiesResource.getResourceURL(), encoding, parent);
+ return readPropertiesResource(propertiesResource.getResourceURL(),
+ encoding, parent);
}
- private Properties readPropertiesResource(URL resourceURL, String encoding, Properties parent)
+ private Properties readPropertiesResource(URL resourceURL, String encoding,
+ Properties parent)
{
- if (resourceURL == null)
- return parent;
+ if (resourceURL == null) return parent;
Properties result = new Properties(parent);
@@ -283,16 +293,14 @@
if (encoding == null)
wrapper.load(input);
- else
- wrapper.load(input, encoding);
+ else wrapper.load(input, encoding);
input.close();
}
catch (IOException ex)
{
- throw new ApplicationRuntimeException(ImplMessages.unableToLoadProperties(
- resourceURL,
- ex), ex);
+ throw new ApplicationRuntimeException(ImplMessages
+ .unableToLoadProperties(resourceURL, ex), ex);
}
finally
{
@@ -304,15 +312,14 @@
private void close(InputStream is)
{
- if (is != null)
- try
- {
- is.close();
- }
- catch (IOException ex)
- {
- // Ignore.
- }
+ if (is != null) try
+ {
+ is.close();
+ }
+ catch (IOException ex)
+ {
+ // Ignore.
+ }
}
/**
@@ -330,32 +337,31 @@
getLocalizedProperties(component));
}
- private String getComponentMessagesEncoding(IComponent component, Locale locale)
+ private String getComponentMessagesEncoding(IComponent component,
+ Locale locale)
{
- String encoding = _componentPropertySource.getLocalizedComponentProperty(
- component,
- locale,
- MESSAGES_ENCODING_PROPERTY_NAME);
+ String encoding = _componentPropertySource
+ .getLocalizedComponentProperty(component, locale,
+ MESSAGES_ENCODING_PROPERTY_NAME);
if (encoding == null)
encoding = _componentPropertySource.getLocalizedComponentProperty(
- component,
- locale,
+ component, locale,
TemplateSourceImpl.TEMPLATE_ENCODING_PROPERTY_NAME);
return encoding;
}
- private String getNamespaceMessagesEncoding(INamespace namespace, Locale locale)
+ private String getNamespaceMessagesEncoding(INamespace namespace,
+ Locale locale)
{
return _componentPropertySource.getLocalizedNamespaceProperty(
- namespace,
- locale,
- MESSAGES_ENCODING_PROPERTY_NAME);
+ namespace, locale, MESSAGES_ENCODING_PROPERTY_NAME);
}
- public void setComponentPropertySource(ComponentPropertySource componentPropertySource)
+ public void setComponentPropertySource(
+ ComponentPropertySource componentPropertySource)
{
_componentPropertySource = componentPropertySource;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentPropertySourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentPropertySourceImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentPropertySourceImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentPropertySourceImpl.java Tue Mar 14 20:17:15 2006
@@ -183,4 +183,4 @@
{
_globalProperties = globalProperties;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderImpl.java Tue Mar 14 20:17:15 2006
@@ -91,4 +91,4 @@
{
_bindingSource = bindingSource;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderLogic.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderLogic.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderLogic.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ComponentTemplateLoaderLogic.java Tue Mar 14 20:17:15 2006
@@ -434,4 +434,4 @@
return new ApplicationRuntimeException(ImplMessages.bodylessComponent(), component, null,
null);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/CookieSourceImpl.java Tue Mar 14 20:17:15 2006
@@ -87,4 +87,4 @@
{
_defaultMaxAge = defaultMaxAge;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java Tue Mar 14 20:17:15 2006
@@ -58,4 +58,4 @@
builder.append("engineClassName", _engineClassName);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/AssetSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/AssetSpecification.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/AssetSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/AssetSpecification.java Tue Mar 14 20:17:15 2006
@@ -22,7 +22,7 @@
public class AssetSpecification extends LocatablePropertyHolder implements IAssetSpecification
{
- protected String path;
+ protected String _path;
/** @since 4.0 */
private String _propertyName;
@@ -35,14 +35,14 @@
public String getPath()
{
- return path;
+ return _path;
}
/** @since 3.0 * */
public void setPath(String path)
{
- this.path = path;
+ this._path = path;
}
/** @since 4.0 */
@@ -56,4 +56,4 @@
{
_propertyName = propertyName;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanLifecycle.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanLifecycle.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanLifecycle.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanLifecycle.java Tue Mar 14 20:17:15 2006
@@ -21,7 +21,7 @@
* @since 1.0.4
*/
-public class BeanLifecycle
+public final class BeanLifecycle
{
/**
* No lifecycle; the bean is created fresh on each reference and not retained.
@@ -68,4 +68,4 @@
return _name;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BeanSpecification.java Tue Mar 14 20:17:15 2006
@@ -28,31 +28,31 @@
public class BeanSpecification extends LocatablePropertyHolder implements IBeanSpecification
{
- protected String className;
+ protected String _className;
- protected BeanLifecycle lifecycle;
-
- /** @since 1.0.9 * */
- private String description;
-
- /** @since 4.0 */
-
- private String _propertyName;
+ protected BeanLifecycle _lifecycle;
/**
* A List of {@link IBeanInitializer}.
*/
- protected List initializers;
+ protected List _initializers;
+ /** @since 1.0.9 * */
+ private String _description;
+
+ /** @since 4.0 */
+
+ private String _propertyName;
+
public String getClassName()
{
- return className;
+ return _className;
}
public BeanLifecycle getLifecycle()
{
- return lifecycle;
+ return _lifecycle;
}
/**
@@ -61,10 +61,10 @@
public void addInitializer(IBeanInitializer initializer)
{
- if (initializers == null)
- initializers = new ArrayList();
+ if (_initializers == null)
+ _initializers = new ArrayList();
- initializers.add(initializer);
+ _initializers.add(initializer);
}
/**
@@ -76,21 +76,21 @@
public List getInitializers()
{
- return initializers;
+ return _initializers;
}
public String toString()
{
StringBuffer buffer = new StringBuffer("BeanSpecification[");
- buffer.append(className);
+ buffer.append(_className);
buffer.append(", lifecycle ");
- buffer.append(lifecycle.getName());
+ buffer.append(_lifecycle.getName());
- if (initializers != null && initializers.size() > 0)
+ if (_initializers != null && _initializers.size() > 0)
{
buffer.append(", ");
- buffer.append(initializers.size());
+ buffer.append(_initializers.size());
buffer.append(" initializers");
}
@@ -101,26 +101,26 @@
public String getDescription()
{
- return description;
+ return _description;
}
public void setDescription(String desc)
{
- description = desc;
+ _description = desc;
}
/** @since 3.0 * */
public void setClassName(String className)
{
- this.className = className;
+ this._className = className;
}
/** @since 3.0 * */
public void setLifecycle(BeanLifecycle lifecycle)
{
- this.lifecycle = lifecycle;
+ this._lifecycle = lifecycle;
}
/** @since 4.0 */
@@ -134,4 +134,4 @@
{
_propertyName = propertyName;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingSpecification.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingSpecification.java Tue Mar 14 20:17:15 2006
@@ -29,7 +29,7 @@
{
private BindingType _type;
private String _value;
-
+
public BindingType getType()
{
return _type;
@@ -49,4 +49,4 @@
{
_value = value;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingType.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingType.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingType.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/BindingType.java Tue Mar 14 20:17:15 2006
@@ -44,4 +44,4 @@
{
return "BindingType[" + _name + "]";
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ComponentSpecification.java Tue Mar 14 20:17:15 2006
@@ -58,12 +58,6 @@
public class ComponentSpecification extends LocatablePropertyHolder implements
IComponentSpecification
{
- private String _componentClassName;
-
- /** @since 1.0.9 * */
-
- private String _description;
-
/**
* Keyed on component id, value is {@link IContainedComponent}.
*/
@@ -100,6 +94,12 @@
protected Set _reservedParameterNames;
+ private String _componentClassName;
+
+ /** @since 1.0.9 * */
+
+ private String _description;
+
/**
* Is the component allowed to have a body (that is, wrap other elements?).
*/
@@ -292,7 +292,7 @@
}
/**
- * Returns a <code>List</code> of the String names of all assets, in alphabetical order
+ * Returns a <code>List</code> of the String names of all assets, in alphabetical order.
*/
public List getAssetNames()
@@ -697,4 +697,4 @@
return Collections.unmodifiableSet(_reservedParameterNames);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/spec/ContainedComponent.java Tue Mar 14 20:17:15 2006
@@ -28,16 +28,16 @@
public class ContainedComponent extends LocatablePropertyHolder implements IContainedComponent
{
+ private static final int MAP_SIZE = 3;
+
+ protected Map bindings;
+
private String type;
private String copyOf;
private boolean inheritInformalParameters;
- protected Map bindings;
-
- private static final int MAP_SIZE = 3;
-
/** @since 4.0 */
private String _propertyName;
@@ -137,4 +137,4 @@
{
_propertyName = propertyName;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/CreatePropertyWorker.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/CreatePropertyWorker.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/CreatePropertyWorker.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/CreatePropertyWorker.java Tue Mar 14 20:17:15 2006
@@ -53,4 +53,4 @@
EnhanceUtils.createSimpleMutator(op, field, _propertyName, propertyType, _location);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/Creator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/Creator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/Creator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/test/Creator.java Tue Mar 14 20:17:15 2006
@@ -180,4 +180,4 @@
return newInstance(abstractClass, propertyMap);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/BasePropertyHolder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/BasePropertyHolder.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/BasePropertyHolder.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/BasePropertyHolder.java Tue Mar 14 20:17:15 2006
@@ -75,4 +75,4 @@
return result;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ComponentAddress.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ComponentAddress.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ComponentAddress.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ComponentAddress.java Tue Mar 14 20:17:15 2006
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 533068199722072804L;
- private String _pageName;
+ private String _pageName;
private String _idPath;
@@ -57,7 +57,7 @@
}
/**
- * Creates a new ComponentAddress using the given Page Name and ID Path
+ * Creates a new ComponentAddress using the given Page Name and ID Path.
*
* @param pageName
* the name of the page that contains the component
@@ -74,7 +74,7 @@
/**
* Creates a new ComponentAddress using the given Page Name and ID Path relative on the provided
- * Namespace
+ * Namespace.
*
* @param namespace
* the namespace of the page that contains the component
@@ -153,4 +153,4 @@
return (idPath1 == idPath2) || (idPath1 != null && idPath1.equals(idPath2));
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ContentType.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ContentType.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ContentType.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/ContentType.java Tue Mar 14 20:17:15 2006
@@ -39,7 +39,7 @@
private final Map _parameters = new HashMap();
/**
- * Creates a new empty content type
+ * Creates a new empty content type.
*/
public ContentType()
{
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionAnalyzer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionAnalyzer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionAnalyzer.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionAnalyzer.java Tue Mar 14 20:17:15 2006
@@ -36,6 +36,12 @@
public class ExceptionAnalyzer
{
+ private static final int SKIP_LEADING_WHITESPACE = 0;
+
+ private static final int SKIP_T = 1;
+
+ private static final int SKIP_OTHER_WHITESPACE = 2;
+
private final List exceptionDescriptions = new ArrayList();
private final List propertyDescriptions = new ArrayList();
@@ -264,25 +270,19 @@
// of readers.
}
- String result[] = new String[frames.size()];
+ String[] result = new String[frames.size()];
return (String[]) frames.toArray(result);
}
- private static final int SKIP_LEADING_WHITESPACE = 0;
-
- private static final int SKIP_T = 1;
-
- private static final int SKIP_OTHER_WHITESPACE = 2;
-
/**
- * Sun's JVM prefixes each line in the stack trace with " <tab>at ", other JVMs don't. This
+ * Sun's JVM prefixes each line in the stack trace with " <tab>at</tab> ", other JVMs don't. This
* method looks for and strips such stuff.
*/
private String stripFrame(String frame)
{
- char array[] = frame.toCharArray();
+ char[] array = frame.toCharArray();
int i = 0;
int state = SKIP_LEADING_WHITESPACE;
@@ -406,4 +406,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BinaryDumpOutputStream.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BinaryDumpOutputStream.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BinaryDumpOutputStream.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BinaryDumpOutputStream.java Tue Mar 14 20:17:15 2006
@@ -30,15 +30,18 @@
public class BinaryDumpOutputStream extends OutputStream
{
- private PrintWriter out;
+ private static final char[] HEX =
+ { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+ private PrintWriter _out;
private boolean locked = false;
- private boolean showOffset = true;
+ private boolean _showOffset = true;
private int bytesPerLine = 16;
- private int spacingInterval = 4;
+ private int _spacingInterval = 4;
private char substituteChar = '.';
@@ -58,9 +61,6 @@
private String asciiEnd = "|";
- private static final char[] HEX =
- { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
/**
* Creates a <code>PrintWriter</code> for <code>System.out</code>.
*/
@@ -72,25 +72,25 @@
public BinaryDumpOutputStream(PrintWriter out)
{
- this.out = out;
+ this._out = out;
}
public BinaryDumpOutputStream(Writer out)
{
- this.out = new PrintWriter(out);
+ this._out = new PrintWriter(out);
}
public void close() throws IOException
{
- if (out != null)
+ if (_out != null)
{
if (lineCount > 0)
finishFinalLine();
- out.close();
+ _out.close();
}
- out = null;
+ _out = null;
}
private void finishFinalLine()
@@ -103,15 +103,15 @@
{
// After every <n> bytes, emit a space.
- if (spacingInterval > 0 && bytesSinceSpace == spacingInterval)
+ if (_spacingInterval > 0 && bytesSinceSpace == _spacingInterval)
{
- out.print(' ');
+ _out.print(' ');
bytesSinceSpace = 0;
}
// Two spaces to substitute for the two hex digits.
- out.print(" ");
+ _out.print(" ");
if (showAscii)
ascii[lineCount] = ' ';
@@ -122,12 +122,12 @@
if (showAscii)
{
- out.print(asciiBegin);
- out.print(ascii);
- out.print(asciiEnd);
+ _out.print(asciiBegin);
+ _out.print(ascii);
+ _out.print(asciiEnd);
}
- out.println();
+ _out.println();
}
/**
@@ -136,7 +136,7 @@
public void flush() throws IOException
{
- out.flush();
+ _out.flush();
}
public String getAsciiBegin()
@@ -239,29 +239,29 @@
{
if (showAscii)
{
- out.print(asciiBegin);
- out.print(ascii);
- out.print(asciiEnd);
+ _out.print(asciiBegin);
+ _out.print(ascii);
+ _out.print(asciiEnd);
}
- out.println();
+ _out.println();
bytesSinceSpace = 0;
lineCount = 0;
offset += bytesPerLine;
}
- if (lineCount == 0 && showOffset)
+ if (lineCount == 0 && _showOffset)
{
writeHex(offset, 4);
- out.print(offsetSeperator);
+ _out.print(offsetSeperator);
}
// After every <n> bytes, emit a space.
- if (spacingInterval > 0 && bytesSinceSpace == spacingInterval)
+ if (_spacingInterval > 0 && bytesSinceSpace == _spacingInterval)
{
- out.print(' ');
+ _out.print(' ');
bytesSinceSpace = 0;
}
@@ -290,27 +290,27 @@
{
nybble = (value >> 4 * (digits - i - 1)) & 0x0f;
- out.print(HEX[nybble]);
+ _out.print(HEX[nybble]);
}
}
public void setSpacingInterval(int spacingInterval)
{
- this.spacingInterval = spacingInterval;
+ this._spacingInterval = spacingInterval;
}
public boolean isShowOffset()
{
- return showOffset;
+ return _showOffset;
}
public void setShowOffset(boolean showOffset)
{
- this.showOffset = showOffset;
+ this._showOffset = showOffset;
}
public int getSpacingInterval()
{
- return spacingInterval;
+ return _spacingInterval;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BooleanAdaptor.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BooleanAdaptor.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BooleanAdaptor.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/BooleanAdaptor.java Tue Mar 14 20:17:15 2006
@@ -62,4 +62,4 @@
return Boolean.FALSE;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ByteAdaptor.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ByteAdaptor.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ByteAdaptor.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ByteAdaptor.java Tue Mar 14 20:17:15 2006
@@ -55,4 +55,4 @@
return new Byte(string.substring(1));
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ComponentAddressAdaptor.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ComponentAddressAdaptor.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ComponentAddressAdaptor.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/ComponentAddressAdaptor.java Tue Mar 14 20:17:15 2006
@@ -69,4 +69,4 @@
return new ComponentAddress(pageName, idPath);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java Tue Mar 14 20:17:15 2006
@@ -212,4 +212,4 @@
return buffer.toString();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerUtil.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerUtil.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerUtil.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/io/DataSqueezerUtil.java Tue Mar 14 20:17:15 2006
@@ -24,9 +24,11 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class DataSqueezerUtil
+public final class DataSqueezerUtil
{
-
+ /* defeat instantiation */
+ private DataSqueezerUtil() { }
+
/**
* Returns a data squeezer with a set of basic adaptors, ready to be used by JUnit-tests.
*/
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterMatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterMatcher.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterMatcher.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterMatcher.java Tue Mar 14 20:17:15 2006
@@ -25,7 +25,7 @@
private boolean[] _charMap;
/**
- * Create a new ASCII character matcher for identifying the set of provided ASCII characters
+ * Create a new ASCII character matcher for identifying the set of provided ASCII characters.
*
* @param chars the character that this matcher should identify
*/
@@ -40,7 +40,7 @@
}
/**
- * Match the characters provided in the constructor
+ * Match the characters provided in the constructor.
*
* @see org.apache.tapestry.util.text.ICharacterMatcher#matches(char)
*/
@@ -50,4 +50,4 @@
return false;
return _charMap[ch];
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterTranslator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterTranslator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterTranslator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/AsciiCharacterTranslator.java Tue Mar 14 20:17:15 2006
@@ -22,43 +22,44 @@
*/
public class AsciiCharacterTranslator implements ICharacterTranslator
{
- private String[] _charMap;
-
- /**
- * Creates and initializes a new translator that translates the provided
- * ASCII characters into strings. All other characters will be translated to null.
- *
- * @param characterMap an array of pairs of strings.
- * Each pair consists of a key that must be a single ASCII character,
- * and a value that is its equivalent string.
- */
- public AsciiCharacterTranslator(String[][] characterMap)
- {
- _charMap = new String[128];
-
- int pairCount = characterMap.length;
- for (int i = 0; i < pairCount; i++) {
- String[] pair = characterMap[i];
- if (pair.length != 2)
- continue;
- String key = pair[0];
- String value = pair[1];
- if (key.length() != 1)
- continue;
- char ch = key.charAt(0);
- if (ch >= 128)
- continue;
-
- _charMap[ch] = value;
- }
- }
-
- /**
- * @see org.apache.tapestry.util.text.ICharacterTranslator#translate(char)
- */
- public String translate(char ch) {
- if (ch >= 128)
- return null;
- return _charMap[ch];
- }
+
+ private String[] _charMap;
+
+ /**
+ * Creates and initializes a new translator that translates the provided
+ * ASCII characters into strings. All other characters will be translated to
+ * null.
+ *
+ * @param characterMap
+ * an array of pairs of strings. Each pair consists of a key that
+ * must be a single ASCII character, and a value that is its
+ * equivalent string.
+ */
+ public AsciiCharacterTranslator(String[][] characterMap)
+ {
+ _charMap = new String[128];
+
+ int pairCount = characterMap.length;
+ for(int i = 0; i < pairCount; i++)
+ {
+ String[] pair = characterMap[i];
+ if (pair.length != 2) continue;
+ String key = pair[0];
+ String value = pair[1];
+ if (key.length() != 1) continue;
+ char ch = key.charAt(0);
+ if (ch >= 128) continue;
+
+ _charMap[ch] = value;
+ }
+ }
+
+ /**
+ * @see org.apache.tapestry.util.text.ICharacterTranslator#translate(char).
+ */
+ public String translate(char ch)
+ {
+ if (ch >= 128) return null;
+ return _charMap[ch];
+ }
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/CompoundMatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/CompoundMatcher.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/CompoundMatcher.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/CompoundMatcher.java Tue Mar 14 20:17:15 2006
@@ -47,4 +47,4 @@
}
return false;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/DefaultCharacterTranslatorSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/DefaultCharacterTranslatorSource.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/DefaultCharacterTranslatorSource.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/text/DefaultCharacterTranslatorSource.java Tue Mar 14 20:17:15 2006
@@ -18,51 +18,58 @@
import java.util.Map;
/**
- * The default implementation of a character translator source.
- * Returns a standard HTML translator that encodes everything that is non-safe
- * or an HTML translator that encodes only non-safe ASCII symbols
- * if the encoding is a unicode one.
+ * The default implementation of a character translator source. Returns a
+ * standard HTML translator that encodes everything that is non-safe or an HTML
+ * translator that encodes only non-safe ASCII symbols if the encoding is a
+ * unicode one.
*
* @author mb
* @since 4.0
*/
-public class DefaultCharacterTranslatorSource implements ICharacterTranslatorSource
+public class DefaultCharacterTranslatorSource implements
+ ICharacterTranslatorSource
{
- private static final ICharacterTranslator DEFAULT_TRANSLATOR = new MarkupCharacterTranslator();
- private static final ICharacterTranslator UNICODE_TRANSLATOR = new MarkupCharacterTranslator(false);
- private final static Map _translators;
-
- static {
- _translators = new HashMap();
- _translators.put("UTF-8", UNICODE_TRANSLATOR);
- _translators.put("UTF-7", UNICODE_TRANSLATOR);
- _translators.put("UTF-16", UNICODE_TRANSLATOR);
- _translators.put("UTF-16BE", UNICODE_TRANSLATOR);
- _translators.put("UTF-16LE", UNICODE_TRANSLATOR);
- }
-
- /**
- * Returns a translator that encodes all non-safe characters into their HTML equivalents.
- *
- * @see org.apache.tapestry.util.text.ICharacterTranslatorSource#getDefaultTranslator()
- */
- public ICharacterTranslator getDefaultTranslator() {
- return DEFAULT_TRANSLATOR;
- }
-
- /**
- * If the encoding is a Unicode one, returns a translator that encodes only the
- * non-safe ASCII characters and leaves the others untouched.
- * Otherwise, returns the default translator.
- *
- * @see org.apache.tapestry.util.text.ICharacterTranslatorSource#getTranslator(java.lang.String)
- */
- public ICharacterTranslator getTranslator(String encoding) {
- ICharacterTranslator translator = (ICharacterTranslator) _translators.get(encoding.toUpperCase());
- if (translator != null)
- return translator;
- return getDefaultTranslator();
- }
-
+ private static final ICharacterTranslator DEFAULT_TRANSLATOR = new MarkupCharacterTranslator();
+ private static final ICharacterTranslator UNICODE_TRANSLATOR = new MarkupCharacterTranslator(
+ false);
+
+ private static final Map _translators;
+
+ static
+ {
+ _translators = new HashMap();
+ _translators.put("UTF-8", UNICODE_TRANSLATOR);
+ _translators.put("UTF-7", UNICODE_TRANSLATOR);
+ _translators.put("UTF-16", UNICODE_TRANSLATOR);
+ _translators.put("UTF-16BE", UNICODE_TRANSLATOR);
+ _translators.put("UTF-16LE", UNICODE_TRANSLATOR);
+ }
+
+ /**
+ * Returns a translator that encodes all non-safe characters into their HTML
+ * equivalents.
+ *
+ * @see org.apache.tapestry.util.text.ICharacterTranslatorSource#getDefaultTranslator()
+ */
+ public ICharacterTranslator getDefaultTranslator()
+ {
+ return DEFAULT_TRANSLATOR;
+ }
+
+ /**
+ * If the encoding is a Unicode one, returns a translator that encodes only
+ * the non-safe ASCII characters and leaves the others untouched. Otherwise,
+ * returns the default translator.
+ *
+ * @see org.apache.tapestry.util.text.ICharacterTranslatorSource#getTranslator(java.lang.String)
+ */
+ public ICharacterTranslator getTranslator(String encoding)
+ {
+ ICharacterTranslator translator = (ICharacterTranslator) _translators
+ .get(encoding.toUpperCase());
+ if (translator != null) return translator;
+ return getDefaultTranslator();
+ }
+
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/xml/BaseRule.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/xml/BaseRule.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/xml/BaseRule.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/xml/BaseRule.java Tue Mar 14 20:17:15 2006
@@ -58,4 +58,4 @@
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/AbstractNumericValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/AbstractNumericValidator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/AbstractNumericValidator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/AbstractNumericValidator.java Tue Mar 14 20:17:15 2006
@@ -26,6 +26,18 @@
{
private boolean _zeroIsNull;
+ private String _scriptPath = getDefaultScriptPath();
+
+ private String _invalidNumericFormatMessage;
+
+ private String _invalidIntegerFormatMessage;
+
+ private String _numberTooSmallMessage;
+
+ private String _numberTooLargeMessage;
+
+ private String _numberRangeMessage;
+
public AbstractNumericValidator()
{
super();
@@ -56,20 +68,6 @@
_zeroIsNull = zeroIsNull;
}
- private String _scriptPath =
- getDefaultScriptPath();
-
-
- private String _invalidNumericFormatMessage;
-
- private String _invalidIntegerFormatMessage;
-
- private String _numberTooSmallMessage;
-
- private String _numberTooLargeMessage;
-
- private String _numberRangeMessage;
-
/**
* @since 2.2
*/
@@ -236,4 +234,4 @@
}
protected abstract String getDefaultScriptPath();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/DateValidator.java Tue Mar 14 20:17:15 2006
@@ -351,4 +351,4 @@
_invalidDateFormatMessage = string;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/NumberValidator.java Tue Mar 14 20:17:15 2006
@@ -38,8 +38,14 @@
public class NumberValidator extends AbstractNumericValidator
{
- private static final Map TYPES = new HashMap();
+ public static final int NUMBER_TYPE_INTEGER = 0;
+ public static final int NUMBER_TYPE_REAL = 1;
+
+ private static final Map TYPES = new HashMap();
+
+ private static StrategyRegistry _numberAdaptors = new StrategyRegistryImpl();
+
static
{
TYPES.put("boolean", boolean.class);
@@ -76,17 +82,11 @@
private Number _maximum;
- private static StrategyRegistry _numberAdaptors = new StrategyRegistryImpl();
-
- public final static int NUMBER_TYPE_INTEGER = 0;
-
- public final static int NUMBER_TYPE_REAL = 1;
-
/**
* This class is not meant for use outside of NumberValidator; it is public only to fascilitate
* some unit testing.
*/
- public static abstract class NumberStrategy
+ public abstract static class NumberStrategy
{
/**
* Parses a non-empty {@link String}into the correct subclass of {@link Number}.
@@ -95,7 +95,7 @@
* if the String can not be parsed.
*/
- abstract public Number parse(String value);
+ public abstract Number parse(String value);
/**
* Indicates the type of the number represented -- integer or real. The information is used
@@ -104,7 +104,7 @@
*
* @return one of the predefined number types
*/
- abstract public int getNumberType();
+ public abstract int getNumberType();
public int compare(Number left, Number right)
{
@@ -125,7 +125,10 @@
protected abstract Number coerce(Number number);
}
- private static abstract class IntegerNumberAdaptor extends NumberStrategy
+ /**
+ * Integer adaptor.
+ */
+ private abstract static class IntegerNumberAdaptor extends NumberStrategy
{
public int getNumberType()
{
@@ -133,7 +136,10 @@
}
}
- private static abstract class RealNumberAdaptor extends NumberStrategy
+ /**
+ * Integer adaptor.
+ */
+ private abstract static class RealNumberAdaptor extends NumberStrategy
{
public int getNumberType()
{
@@ -141,6 +147,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class ByteAdaptor extends IntegerNumberAdaptor
{
public Number parse(String value)
@@ -154,6 +163,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class ShortAdaptor extends IntegerNumberAdaptor
{
public Number parse(String value)
@@ -167,6 +179,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class IntAdaptor extends IntegerNumberAdaptor
{
public Number parse(String value)
@@ -180,6 +195,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class LongAdaptor extends IntegerNumberAdaptor
{
public Number parse(String value)
@@ -193,6 +211,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class FloatAdaptor extends RealNumberAdaptor
{
public Number parse(String value)
@@ -206,6 +227,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class DoubleAdaptor extends RealNumberAdaptor
{
public Number parse(String value)
@@ -219,6 +243,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class BigDecimalAdaptor extends RealNumberAdaptor
{
public Number parse(String value)
@@ -232,6 +259,9 @@
}
}
+ /**
+ * Integer adaptor.
+ */
private static class BigIntegerAdaptor extends IntegerNumberAdaptor
{
public Number parse(String value)
@@ -473,4 +503,4 @@
{
return "/org/apache/tapestry/valid/NumberValidator.script";
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/web/AttributeHolder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/web/AttributeHolder.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/web/AttributeHolder.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/web/AttributeHolder.java Tue Mar 14 20:17:15 2006
@@ -34,13 +34,13 @@
* @returns Unmodifiable list of string attribute names.
*/
- public List getAttributeNames();
+ List getAttributeNames();
/**
* Returns the named object, or null if no attribute has been stored with the given name.
*/
- public Object getAttribute(String name);
+ Object getAttribute(String name);
/**
* Updates the attribute, replacing (or removing) its value. For certain implementations, the
@@ -53,5 +53,5 @@
* the new value for the attribute, or null to delete the attribute entirely.
*/
- public void setAttribute(String name, Object attribute);
-}
\ No newline at end of file
+ void setAttribute(String name, Object attribute);
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/AbstractPostfield.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/AbstractPostfield.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/AbstractPostfield.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/AbstractPostfield.java Tue Mar 14 20:17:15 2006
@@ -61,4 +61,4 @@
{
getBinding("value").setObject(value);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Card.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Card.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Card.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Card.java Tue Mar 14 20:17:15 2006
@@ -65,4 +65,4 @@
}
public abstract String getTitle();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Deck.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Deck.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Deck.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/wml/Deck.java Tue Mar 14 20:17:15 2006
@@ -35,4 +35,4 @@
return new ContentType("text/vnd.wap.wml");
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Tue Mar 14 20:17:15 2006
@@ -22,7 +22,6 @@
import org.apache.hivemind.Locatable;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.test.AggregateArgumentsMatcher;
import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.hivemind.test.HiveMindTestCase;
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Tue Mar 14 20:17:15 2006
@@ -365,4 +365,4 @@
action.getRequiresSession();
setReturnValue(action, requiresSession);
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java Tue Mar 14 20:17:15 2006
@@ -16,7 +16,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
@@ -93,14 +92,13 @@
protected TemplateToken[] run(InputStream stream, ITemplateParserDelegate delegate,
Resource location) throws TemplateParseException
{
- InputStreamReader reader = new InputStreamReader(stream);
char[] data = null;
try
{
- data = IOUtils.toCharArray(reader);
+ data = IOUtils.toCharArray(stream, "UTF-8");
- reader.close();
+ stream.close();
}
catch (IOException ex)
{
@@ -204,7 +202,7 @@
protected void assertCloseToken(TemplateToken token, int line)
{
assertEquals("Close token type.", TokenType.CLOSE, token.getType());
-
+
checkLine(token, line);
}
@@ -636,7 +634,7 @@
public void testNamespaceAttributeName() throws Exception
{
TemplateToken[] tokens = run("NamespaceAttributeName.html", new ParserDelegate("t:id"));
-
+
assertTokenCount(tokens, 8);
assertOpenToken(tokens[1], "outer", "span", 3);
assertOpenToken(tokens[3], "inner", "span", 4);
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicer.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicer.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicer.java Tue Mar 14 20:17:15 2006
@@ -29,6 +29,6 @@
*/
public interface ActionRequestServicer
{
- public void service(ActionRequest request, ActionResponse response) throws IOException,
+ void service(ActionRequest request, ActionResponse response) throws IOException,
PortletException;
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerFilter.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerFilter.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerFilter.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerFilter.java Tue Mar 14 20:17:15 2006
@@ -30,6 +30,6 @@
*/
public interface ActionRequestServicerFilter
{
- public void service(ActionRequest request, ActionResponse response,
+ void service(ActionRequest request, ActionResponse response,
ActionRequestServicer servicer) throws IOException, PortletException;
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerToWebRequestServicerBridge.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerToWebRequestServicerBridge.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerToWebRequestServicerBridge.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ActionRequestServicerToWebRequestServicerBridge.java Tue Mar 14 20:17:15 2006
@@ -62,4 +62,4 @@
{
_webRequestServicer = webRequestServicer;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ApplicationPortlet.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ApplicationPortlet.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ApplicationPortlet.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/ApplicationPortlet.java Tue Mar 14 20:17:15 2006
@@ -169,4 +169,4 @@
_registry.cleanupThread();
}
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java Tue Mar 14 20:17:15 2006
@@ -20,10 +20,13 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-class BindingsMessages
+final class BindingsMessages
{
- private final static MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class);
+ private static final MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class);
+ /* defeat instantiation */
+ private BindingsMessages() { }
+
static String noUserInfo()
{
return _formatter.getMessage("no-user-info");
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsStrings.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsStrings.properties?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsStrings.properties (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsStrings.properties Tue Mar 14 20:17:15 2006
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-no-user-info=No user attributes are available; this may indicate an attempt to access user attributes prior to the user logging in to the Portal.
\ No newline at end of file
+no-user-info=No user attributes are available; this may indicate an attempt to access user attributes prior to the user logging in to the Portal.
Modified: jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/multipart/ActionRequestWrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/multipart/ActionRequestWrapper.java?rev=385968&r1=385967&r2=385968&view=diff
==============================================================================
--- jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/multipart/ActionRequestWrapper.java (original)
+++ jakarta/tapestry/trunk/portlet/src/java/org/apache/tapestry/portlet/multipart/ActionRequestWrapper.java Tue Mar 14 20:17:15 2006
@@ -31,181 +31,223 @@
/**
* @author Raphael Jean
- *
*/
-public class ActionRequestWrapper extends Object implements ActionRequest
+public class ActionRequestWrapper extends Object implements ActionRequest
{
- private ActionRequest wrapped;
-
+
+ private ActionRequest wrapped;
+
public ActionRequestWrapper(ActionRequest request)
{
wrapped = request;
}
-
- public InputStream getPortletInputStream() throws IOException {
- return wrapped.getPortletInputStream();
- }
-
- public void setCharacterEncoding(String arg0)
- throws UnsupportedEncodingException {
- wrapped.setCharacterEncoding(arg0);
- }
-
- public BufferedReader getReader() throws UnsupportedEncodingException,
- IOException {
- return wrapped.getReader();
- }
-
- public String getCharacterEncoding() {
- return wrapped.getCharacterEncoding();
- }
-
- public String getContentType() {
- return wrapped.getContentType();
- }
-
- public int getContentLength() {
- return wrapped.getContentLength();
- }
-
- public boolean isWindowStateAllowed(WindowState arg0) {
- return wrapped.isWindowStateAllowed(arg0);
- }
-
- public boolean isPortletModeAllowed(PortletMode arg0) {
- return wrapped.isPortletModeAllowed(arg0);
- }
-
- public PortletMode getPortletMode() {
- return wrapped.getPortletMode();
- }
-
- public WindowState getWindowState() {
- return wrapped.getWindowState();
- }
-
- public PortletPreferences getPreferences() {
- return wrapped.getPreferences();
- }
-
- public PortletSession getPortletSession() {
- return wrapped.getPortletSession();
- }
-
- public PortletSession getPortletSession(boolean arg0) {
- return wrapped.getPortletSession(arg0);
- }
-
- public String getProperty(String arg0) {
- return wrapped.getProperty(arg0);
- }
-
- public Enumeration getProperties(String arg0) {
- return wrapped.getProperties(arg0);
- }
-
- public Enumeration getPropertyNames() {
- return wrapped.getPropertyNames();
- }
-
- public PortalContext getPortalContext() {
- return wrapped.getPortalContext();
- }
-
- public String getAuthType() {
- return wrapped.getAuthType();
- }
-
- public String getContextPath() {
- return wrapped.getContextPath();
- }
-
- public String getRemoteUser() {
- return wrapped.getRemoteUser();
- }
-
- public Principal getUserPrincipal() {
- return wrapped.getUserPrincipal();
- }
-
- public boolean isUserInRole(String arg0) {
- return wrapped.isUserInRole(arg0);
- }
-
- public Object getAttribute(String arg0) {
- return wrapped.getAttribute(arg0);
- }
-
- public Enumeration getAttributeNames() {
- return wrapped.getAttributeNames();
- }
-
- public String getParameter(String arg0) {
- return wrapped.getParameter(arg0);
- }
-
- public Enumeration getParameterNames() {
- return wrapped.getParameterNames();
- }
-
- public String[] getParameterValues(String arg0) {
- return wrapped.getParameterValues(arg0);
- }
-
- public Map getParameterMap() {
- return wrapped.getParameterMap();
- }
-
- public boolean isSecure() {
- return wrapped.isSecure();
- }
-
- public void setAttribute(String arg0, Object arg1) {
- wrapped.setAttribute(arg0, arg1);
- }
-
- public void removeAttribute(String arg0) {
- wrapped.removeAttribute(arg0);
- }
-
- public String getRequestedSessionId() {
- return wrapped.getRequestedSessionId();
- }
-
- public boolean isRequestedSessionIdValid() {
- return wrapped.isRequestedSessionIdValid();
- }
-
- public String getResponseContentType() {
- return wrapped.getResponseContentType();
- }
-
- public Enumeration getResponseContentTypes() {
- return wrapped.getResponseContentTypes();
- }
-
- public Locale getLocale() {
- return wrapped.getLocale();
- }
-
- public Enumeration getLocales() {
- return wrapped.getLocales();
- }
-
- public String getScheme() {
- return wrapped.getScheme();
- }
-
- public String getServerName() {
- return wrapped.getServerName();
- }
-
- public int getServerPort() {
- return wrapped.getServerPort();
- }
-
- protected ActionRequest getRequest() {
- return wrapped;
- }
-}
\ No newline at end of file
+ public InputStream getPortletInputStream()
+ throws IOException
+ {
+ return wrapped.getPortletInputStream();
+ }
+
+ public void setCharacterEncoding(String arg0)
+ throws UnsupportedEncodingException
+ {
+ wrapped.setCharacterEncoding(arg0);
+ }
+
+ public BufferedReader getReader()
+ throws IOException
+ {
+ return wrapped.getReader();
+ }
+
+ public String getCharacterEncoding()
+ {
+ return wrapped.getCharacterEncoding();
+ }
+
+ public String getContentType()
+ {
+ return wrapped.getContentType();
+ }
+
+ public int getContentLength()
+ {
+ return wrapped.getContentLength();
+ }
+
+ public boolean isWindowStateAllowed(WindowState arg0)
+ {
+ return wrapped.isWindowStateAllowed(arg0);
+ }
+
+ public boolean isPortletModeAllowed(PortletMode arg0)
+ {
+ return wrapped.isPortletModeAllowed(arg0);
+ }
+
+ public PortletMode getPortletMode()
+ {
+ return wrapped.getPortletMode();
+ }
+
+ public WindowState getWindowState()
+ {
+ return wrapped.getWindowState();
+ }
+
+ public PortletPreferences getPreferences()
+ {
+ return wrapped.getPreferences();
+ }
+
+ public PortletSession getPortletSession()
+ {
+ return wrapped.getPortletSession();
+ }
+
+ public PortletSession getPortletSession(boolean arg0)
+ {
+ return wrapped.getPortletSession(arg0);
+ }
+
+ public String getProperty(String arg0)
+ {
+ return wrapped.getProperty(arg0);
+ }
+
+ public Enumeration getProperties(String arg0)
+ {
+ return wrapped.getProperties(arg0);
+ }
+
+ public Enumeration getPropertyNames()
+ {
+ return wrapped.getPropertyNames();
+ }
+
+ public PortalContext getPortalContext()
+ {
+ return wrapped.getPortalContext();
+ }
+
+ public String getAuthType()
+ {
+ return wrapped.getAuthType();
+ }
+
+ public String getContextPath()
+ {
+ return wrapped.getContextPath();
+ }
+
+ public String getRemoteUser()
+ {
+ return wrapped.getRemoteUser();
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return wrapped.getUserPrincipal();
+ }
+
+ public boolean isUserInRole(String arg0)
+ {
+ return wrapped.isUserInRole(arg0);
+ }
+
+ public Object getAttribute(String arg0)
+ {
+ return wrapped.getAttribute(arg0);
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return wrapped.getAttributeNames();
+ }
+
+ public String getParameter(String arg0)
+ {
+ return wrapped.getParameter(arg0);
+ }
+
+ public Enumeration getParameterNames()
+ {
+ return wrapped.getParameterNames();
+ }
+
+ public String[] getParameterValues(String arg0)
+ {
+ return wrapped.getParameterValues(arg0);
+ }
+
+ public Map getParameterMap()
+ {
+ return wrapped.getParameterMap();
+ }
+
+ public boolean isSecure()
+ {
+ return wrapped.isSecure();
+ }
+
+ public void setAttribute(String arg0, Object arg1)
+ {
+ wrapped.setAttribute(arg0, arg1);
+ }
+
+ public void removeAttribute(String arg0)
+ {
+ wrapped.removeAttribute(arg0);
+ }
+
+ public String getRequestedSessionId()
+ {
+ return wrapped.getRequestedSessionId();
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ return wrapped.isRequestedSessionIdValid();
+ }
+
+ public String getResponseContentType()
+ {
+ return wrapped.getResponseContentType();
+ }
+
+ public Enumeration getResponseContentTypes()
+ {
+ return wrapped.getResponseContentTypes();
+ }
+
+ public Locale getLocale()
+ {
+ return wrapped.getLocale();
+ }
+
+ public Enumeration getLocales()
+ {
+ return wrapped.getLocales();
+ }
+
+ public String getScheme()
+ {
+ return wrapped.getScheme();
+ }
+
+ public String getServerName()
+ {
+ return wrapped.getServerName();
+ }
+
+ public int getServerPort()
+ {
+ return wrapped.getServerPort();
+ }
+
+ protected ActionRequest getRequest()
+ {
+ return wrapped;
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org