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 2008/05/07 17:41:02 UTC
svn commit: r654153 [2/3] -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java Wed May 7 08:40:57 2008
@@ -32,42 +32,42 @@
*/
public class ClasspathAssetFactory implements AssetFactory, InvalidationListener
{
- private final ResourceCache _cache;
+ private final ResourceCache cache;
- private final ClasspathAssetAliasManager _aliasManager;
+ private final ClasspathAssetAliasManager aliasManager;
- private final Map<Resource, String> _resourceToClientURL = newConcurrentMap();
+ private final Map<Resource, String> resourceToClientURL = newConcurrentMap();
public ClasspathAssetFactory(final ResourceCache cache, final ClasspathAssetAliasManager aliasManager)
{
- _cache = cache;
- _aliasManager = aliasManager;
+ this.cache = cache;
+ this.aliasManager = aliasManager;
}
public void objectWasInvalidated()
{
- _resourceToClientURL.clear();
+ resourceToClientURL.clear();
}
private String clientURL(Resource resource)
{
- String clientURL = _resourceToClientURL.get(resource);
+ String clientURL = resourceToClientURL.get(resource);
if (clientURL == null)
{
clientURL = buildClientURL(resource);
- _resourceToClientURL.put(resource, clientURL);
+ resourceToClientURL.put(resource, clientURL);
}
// The path generated is partially request-dependent and therefore can't be cached, it will even
// vary from request to the next.
- return _aliasManager.toClientURL(clientURL);
+ return aliasManager.toClientURL(clientURL);
}
private String buildClientURL(Resource resource)
{
- boolean requiresDigest = _cache.requiresDigest(resource);
+ boolean requiresDigest = cache.requiresDigest(resource);
String path = resource.getPath();
@@ -77,7 +77,7 @@
int lastdotx = path.lastIndexOf('.');
- path = path.substring(0, lastdotx + 1) + _cache.getDigest(resource) + path.substring(lastdotx);
+ path = path.substring(0, lastdotx + 1) + cache.getDigest(resource) + path.substring(lastdotx);
}
return path;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java Wed May 7 08:40:57 2008
@@ -24,13 +24,13 @@
public class ClientBehaviorSupportImpl implements ClientBehaviorSupport
{
- private final PageRenderSupport _pageRenderSupport;
+ private final PageRenderSupport pageRenderSupport;
private final JSONObject _validations = new JSONObject();
public ClientBehaviorSupportImpl(PageRenderSupport pageRenderSupport)
{
- _pageRenderSupport = pageRenderSupport;
+ this.pageRenderSupport = pageRenderSupport;
}
public void addZone(String clientId, String showFunctionName, String updateFunctionName)
@@ -49,13 +49,13 @@
if (spec.length() == 0)
{
- _pageRenderSupport.addInit(functionName, clientId);
+ pageRenderSupport.addInit(functionName, clientId);
return;
}
spec.put("element", clientId);
- _pageRenderSupport.addInit(functionName, spec);
+ pageRenderSupport.addInit(functionName, spec);
}
@@ -70,7 +70,7 @@
spec.put(linkId);
spec.put(elementId);
- _pageRenderSupport.addInit("linkZone", spec);
+ pageRenderSupport.addInit("linkZone", spec);
}
public void addFormFragment(String clientId, String showFunctionName, String hideFunctionName)
@@ -97,7 +97,7 @@
// Always has at least two properties.
- _pageRenderSupport.addInit("formInjector", spec);
+ pageRenderSupport.addInit("formInjector", spec);
}
@@ -138,7 +138,7 @@
parameters.put(field);
parameters.put(specs);
- _pageRenderSupport.addInit("validate", parameters);
+ pageRenderSupport.addInit("validate", parameters);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java Wed May 7 08:40:57 2008
@@ -45,28 +45,28 @@
{
private static final long serialVersionUID = -2741540370081645945L;
- private final String _pageName;
+ private final String pageName;
- private final String _componentId;
+ private final String componentId;
- private final String _fieldName;
+ private final String fieldName;
- Key(final String pageName, final String componentId, final String fieldName)
+ Key(String pageName, String componentId, String fieldName)
{
- _pageName = pageName;
- _componentId = componentId;
- _fieldName = fieldName;
+ this.pageName = pageName;
+ this.componentId = componentId;
+ this.fieldName = fieldName;
}
public boolean matches(String pageName)
{
- return _pageName.equals(pageName);
+ return this.pageName.equals(pageName);
}
public PersistentFieldChange toChange(Object value)
{
- return new PersistentFieldChangeImpl(_componentId == null ? "" : _componentId,
- _fieldName, value);
+ return new PersistentFieldChangeImpl(componentId == null ? "" : componentId,
+ fieldName, value);
}
@Override
@@ -76,12 +76,12 @@
int result = 1;
- result = PRIME * result + ((_componentId == null) ? 0 : _componentId.hashCode());
+ result = PRIME * result + ((componentId == null) ? 0 : componentId.hashCode());
- // _fieldName and _pageName are never null
+ // fieldName and pageName are never null
- result = PRIME * result + _fieldName.hashCode();
- result = PRIME * result + _pageName.hashCode();
+ result = PRIME * result + fieldName.hashCode();
+ result = PRIME * result + pageName.hashCode();
return result;
}
@@ -94,26 +94,26 @@
if (getClass() != obj.getClass()) return false;
final Key other = (Key) obj;
- // _fieldName and _pageName are never null
+ // fieldName and pageName are never null
- if (!_fieldName.equals(other._fieldName)) return false;
- if (!_pageName.equals(other._pageName)) return false;
+ if (!fieldName.equals(other.fieldName)) return false;
+ if (!pageName.equals(other.pageName)) return false;
- if (_componentId == null)
+ if (componentId == null)
{
- if (other._componentId != null) return false;
+ if (other.componentId != null) return false;
}
- else if (!_componentId.equals(other._componentId)) return false;
+ else if (!componentId.equals(other.componentId)) return false;
return true;
}
}
- private final Map<Key, Object> _persistedValues = newMap();
+ private final Map<Key, Object> persistedValues = newMap();
- private String _clientData;
+ private String clientData;
- private boolean _mapUptoDate = false;
+ private boolean mapUptoDate = false;
public ClientPersistentFieldStorageImpl(Request request)
{
@@ -122,25 +122,25 @@
// MIME can encode to a '+' character; the browser converts that to a space; we convert it
// back.
- _clientData = value == null ? null : value.replace(' ', '+');
+ clientData = value == null ? null : value.replace(' ', '+');
}
public void updateLink(Link link)
{
refreshClientData();
- if (_clientData != null) link.addParameter(PARAMETER_NAME, _clientData);
+ if (clientData != null) link.addParameter(PARAMETER_NAME, clientData);
}
public Collection<PersistentFieldChange> gatherFieldChanges(String pageName)
{
refreshMap();
- if (_persistedValues.isEmpty()) return Collections.emptyList();
+ if (persistedValues.isEmpty()) return Collections.emptyList();
Collection<PersistentFieldChange> result = CollectionFactory.newList();
- for (Map.Entry<Key, Object> e : _persistedValues.entrySet())
+ for (Map.Entry<Key, Object> e : persistedValues.entrySet())
{
Key key = e.getKey();
@@ -156,15 +156,15 @@
Collection<Key> removedKeys = CollectionFactory.newList();
- for (Key key : _persistedValues.keySet())
+ for (Key key : persistedValues.keySet())
{
- if (key._pageName.equals(pageName)) removedKeys.add(key);
+ if (key.pageName.equals(pageName)) removedKeys.add(key);
}
for (Key key : removedKeys)
{
- _persistedValues.remove(key);
- _clientData = null;
+ persistedValues.remove(key);
+ clientData = null;
}
}
@@ -175,17 +175,17 @@
Key key = new Key(pageName, componentId, fieldName);
if (newValue == null)
- _persistedValues.remove(key);
+ persistedValues.remove(key);
else
{
if (!Serializable.class.isInstance(newValue))
throw new IllegalArgumentException(ServicesMessages
.clientStateMustBeSerializable(newValue));
- _persistedValues.put(key, newValue);
+ persistedValues.put(key, newValue);
}
- _clientData = null;
+ clientData = null;
}
/**
@@ -194,13 +194,13 @@
@SuppressWarnings("unchecked")
private void refreshMap()
{
- if (_mapUptoDate) return;
+ if (mapUptoDate) return;
// Parse the client data to form the map.
restoreMapFromClientData();
- _mapUptoDate = true;
+ mapUptoDate = true;
}
/**
@@ -208,15 +208,15 @@
*/
private void restoreMapFromClientData()
{
- _persistedValues.clear();
+ persistedValues.clear();
- if (_clientData == null) return;
+ if (clientData == null) return;
ObjectInputStream in = null;
try
{
- in = new Base64ObjectInputStream(_clientData);
+ in = new Base64ObjectInputStream(clientData);
int count = in.readInt();
@@ -225,7 +225,7 @@
Key key = (Key) in.readObject();
Object value = in.readObject();
- _persistedValues.put(key, value);
+ persistedValues.put(key, value);
}
}
catch (Exception ex)
@@ -244,18 +244,18 @@
// request. In any other case where the client data is non-null, it is by definition
// up-to date (since it is reset to null any time there's a change to the map).
- if (_clientData != null) return;
+ if (clientData != null) return;
// Very typical: we're refreshing the client data but haven't created the map yet, and there
// was no value in the request. Leave it as null.
- if (!_mapUptoDate) return;
+ if (!mapUptoDate) return;
// Null is also appropriate when the persisted values are empty.
- if (_persistedValues.isEmpty()) return;
+ if (persistedValues.isEmpty()) return;
- // Otherwise, time to update _clientData from _persistedValues
+ // Otherwise, time to update clientData from persistedValues
Base64ObjectOutputStream os = null;
@@ -263,9 +263,9 @@
{
os = new Base64ObjectOutputStream();
- os.writeInt(_persistedValues.size());
+ os.writeInt(persistedValues.size());
- for (Map.Entry<Key, Object> e : _persistedValues.entrySet())
+ for (Map.Entry<Key, Object> e : persistedValues.entrySet())
{
os.writeObject(e.getKey());
os.writeObject(e.getValue());
@@ -281,6 +281,6 @@
InternalUtils.close(os);
}
- _clientData = os.toBase64();
+ clientData = os.toBase64();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java Wed May 7 08:40:57 2008
@@ -27,35 +27,35 @@
*/
public class ClientPersistentFieldStrategy implements PersistentFieldStrategy, LinkFactoryListener
{
- private final ClientPersistentFieldStorage _storage;
+ private final ClientPersistentFieldStorage storage;
public ClientPersistentFieldStrategy(ClientPersistentFieldStorage storage)
{
- _storage = storage;
+ this.storage = storage;
}
public Collection<PersistentFieldChange> gatherFieldChanges(String pageName)
{
- return _storage.gatherFieldChanges(pageName);
+ return storage.gatherFieldChanges(pageName);
}
public void postChange(String pageName, String componentId, String fieldName, Object newValue)
{
- _storage.postChange(pageName, componentId, fieldName, newValue);
+ storage.postChange(pageName, componentId, fieldName, newValue);
}
public void createdActionLink(Link link)
{
- _storage.updateLink(link);
+ storage.updateLink(link);
}
public void createdPageLink(Link link)
{
- _storage.updateLink(link);
+ storage.updateLink(link);
}
public void discardChanges(String pageName)
{
- _storage.discardChanges(pageName);
+ storage.discardChanges(pageName);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java Wed May 7 08:40:57 2008
@@ -21,37 +21,37 @@
public class CoercingPropertyConduitWrapper implements PropertyConduit
{
- private final PropertyConduit _conduit;
+ private final PropertyConduit conduit;
- private final TypeCoercer _coercer;
+ private final TypeCoercer coercer;
public CoercingPropertyConduitWrapper(final PropertyConduit conduit, final TypeCoercer coercer)
{
- _conduit = conduit;
- _coercer = coercer;
+ this.conduit = conduit;
+ this.coercer = coercer;
}
public Object get(Object instance)
{
- return _conduit.get(instance);
+ return conduit.get(instance);
}
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
- return _conduit.getAnnotation(annotationClass);
+ return conduit.getAnnotation(annotationClass);
}
public Class getPropertyType()
{
- return _conduit.getPropertyType();
+ return conduit.getPropertyType();
}
@SuppressWarnings("unchecked")
public void set(Object instance, Object value)
{
- Object coerced = _coercer.coerce(value, getPropertyType());
+ Object coerced = coercer.coerce(value, getPropertyType());
- _conduit.set(instance, coerced);
+ conduit.set(instance, coerced);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java Wed May 7 08:40:57 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.ObjectLocator;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.InjectionProvider;
@@ -30,25 +30,19 @@
*/
public class CommonResourcesInjectionProvider implements InjectionProvider
{
- private static final Map<Class, String> _configuration = newMap();
+ private static final Map<Class, String> configuration = CollectionFactory.newMap();
- public CommonResourcesInjectionProvider()
{
- add(Messages.class, "getMessages");
- add(Locale.class, "getLocale");
- add(Logger.class, "getLogger");
- add(String.class, "getCompleteId");
- }
-
- private void add(Class fieldType, String methodName)
- {
- _configuration.put(fieldType, methodName);
+ configuration.put(Messages.class, "getMessages");
+ configuration.put(Locale.class, "getLocale");
+ configuration.put(Logger.class, "getLogger");
+ configuration.put(String.class, "getCompleteId");
}
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
ClassTransformation transformation, MutableComponentModel componentModel)
{
- String implementationMethodName = _configuration.get(fieldType);
+ String implementationMethodName = configuration.get(fieldType);
if (implementationMethodName == null) return false;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassCacheImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassCacheImpl.java Wed May 7 08:40:57 2008
@@ -23,31 +23,31 @@
public class ComponentClassCacheImpl implements ComponentClassCache, InvalidationListener
{
- private final Map<String, Class> _cache = CollectionFactory.newConcurrentMap();
+ private final Map<String, Class> cache = CollectionFactory.newConcurrentMap();
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
public ComponentClassCacheImpl(ClassFactory classFactory)
{
- _classFactory = classFactory;
+ this.classFactory = classFactory;
}
public void objectWasInvalidated()
{
- _cache.clear();
+ cache.clear();
}
public Class forName(final String className)
{
- Class result = _cache.get(className);
+ Class result = cache.get(className);
if (result == null)
{
result = lookupClassForType(className);
- _cache.put(className, result);
+ cache.put(className, result);
}
return result;
@@ -64,7 +64,7 @@
String jvmName = ClassFabUtils.toJVMBinaryName(className);
- ClassLoader componentLoader = _classFactory.getClassLoader();
+ ClassLoader componentLoader = classFactory.getClassLoader();
try
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java Wed May 7 08:40:57 2008
@@ -19,7 +19,6 @@
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.Symbol;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.Invokable;
@@ -35,18 +34,18 @@
{
private static final String CORE_LIBRARY_PREFIX = "core/";
- private final Logger _logger;
+ private final Logger logger;
- private final ComponentInstantiatorSource _componentInstantiatorSource;
+ private final ComponentInstantiatorSource componentInstantiatorSource;
- private final ClassNameLocator _classNameLocator;
+ private final ClassNameLocator classNameLocator;
- private final String _appRootPackage;
+ private final String appRootPackage;
// Map from folder name to a list of root package names.
// The key does not begin or end with a slash.
- private final Map<String, List<String>> _mappings = newCaseInsensitiveMap();
+ private final Map<String, List<String>> mappings = CollectionFactory.newCaseInsensitiveMap();
// Flag indicating that the maps have been cleared following an invalidation
// and need to be rebuilt. The flag and the four maps below are not synchronized
@@ -55,41 +54,42 @@
// structure of Tapestry, there should not be any reader threads while the write thread
// is operating.
- private boolean _needsRebuild = true;
+ private boolean needsRebuild = true;
/**
* Logical page name to class name.
*/
- private final Map<String, String> _pageToClassName = newCaseInsensitiveMap();
+ private final Map<String, String> pageToClassName = CollectionFactory.newCaseInsensitiveMap();
/**
* Component type to class name.
*/
- private final Map<String, String> _componentToClassName = newCaseInsensitiveMap();
+ private final Map<String, String> componentToClassName = CollectionFactory.newCaseInsensitiveMap();
/**
* Mixing type to class name.
*/
- private final Map<String, String> _mixinToClassName = newCaseInsensitiveMap();
+ private final Map<String, String> mixinToClassName = CollectionFactory.newCaseInsensitiveMap();
/**
* Page class name to logical name (needed to build URLs). This one is case sensitive, since class names do always
* have a particular case.
*/
- private final Map<String, String> _pageClassNameToLogicalName = newMap();
+ private final Map<String, String> pageClassNameToLogicalName = CollectionFactory.newMap();
/**
* Used to convert an logical page name to the canonical form of the page name; this ensures that uniform case for
* page names is used.
*/
- private final Map<String, String> _pageNameToCanonicalPageName = newCaseInsensitiveMap();
+ private final Map<String, String> pageNameToCanonicalPageName = CollectionFactory.newCaseInsensitiveMap();
- private final ConcurrentBarrier _barrier = new ConcurrentBarrier();
+ private final ConcurrentBarrier barrier = new ConcurrentBarrier();
private static final Pattern SPLIT_PACKAGE_PATTERN = Pattern.compile("\\.");
private static final Pattern SPLIT_FOLDER_PATTERN = Pattern.compile("/");
+
private static final int LOGICAL_NAME_BUFFER_SIZE = 40;
public ComponentClassResolverImpl(Logger logger,
@@ -103,13 +103,13 @@
Collection<LibraryMapping> mappings)
{
- _logger = logger;
- _componentInstantiatorSource = componentInstantiatorSource;
- _classNameLocator = classNameLocator;
+ this.logger = logger;
+ this.componentInstantiatorSource = componentInstantiatorSource;
+ this.classNameLocator = classNameLocator;
- _appRootPackage = appRootPackage;
+ this.appRootPackage = appRootPackage;
- addPackagesToInstantiatorSource(_appRootPackage);
+ addPackagesToInstantiatorSource(this.appRootPackage);
for (LibraryMapping mapping : mappings)
{
@@ -127,12 +127,12 @@
String rootPackage = mapping.getRootPackage();
- List<String> packages = _mappings.get(prefix);
+ List<String> packages = this.mappings.get(prefix);
if (packages == null)
{
- packages = newList();
- _mappings.put(prefix, packages);
+ packages = CollectionFactory.newList();
+ this.mappings.put(prefix, packages);
}
packages.add(rootPackage);
@@ -148,10 +148,10 @@
private void addPackagesToInstantiatorSource(String rootPackage)
{
- _componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.PAGES_SUBPACKAGE);
- _componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.COMPONENTS_SUBPACKAGE);
- _componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.MIXINS_SUBPACKAGE);
- _componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.BASE_SUBPACKAGE);
+ componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.PAGES_SUBPACKAGE);
+ componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.COMPONENTS_SUBPACKAGE);
+ componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.MIXINS_SUBPACKAGE);
+ componentInstantiatorSource.addPackage(rootPackage + "." + InternalConstants.BASE_SUBPACKAGE);
}
/**
@@ -159,11 +159,11 @@
*/
public synchronized void objectWasInvalidated()
{
- _barrier.withWrite(new Runnable()
+ barrier.withWrite(new Runnable()
{
public void run()
{
- _needsRebuild = true;
+ needsRebuild = true;
}
});
@@ -175,9 +175,9 @@
*/
private void rebuild()
{
- if (!_needsRebuild) return;
+ if (!needsRebuild) return;
- _barrier.withWrite(new Runnable()
+ barrier.withWrite(new Runnable()
{
public void run()
{
@@ -189,21 +189,21 @@
private void performRebuild()
{
- Map<String, String> savedPages = CollectionFactory.newMap(_pageToClassName);
- Map<String, String> savedComponents = CollectionFactory.newMap(_componentToClassName);
- Map<String, String> savedMixins = CollectionFactory.newMap(_mixinToClassName);
+ Map<String, String> savedPages = CollectionFactory.newMap(pageToClassName);
+ Map<String, String> savedComponents = CollectionFactory.newMap(componentToClassName);
+ Map<String, String> savedMixins = CollectionFactory.newMap(mixinToClassName);
- _pageToClassName.clear();
- _componentToClassName.clear();
- _mixinToClassName.clear();
- _pageClassNameToLogicalName.clear();
- _pageNameToCanonicalPageName.clear();
+ pageToClassName.clear();
+ componentToClassName.clear();
+ mixinToClassName.clear();
+ pageClassNameToLogicalName.clear();
+ pageNameToCanonicalPageName.clear();
- rebuild("", _appRootPackage);
+ rebuild("", appRootPackage);
- for (String prefix : _mappings.keySet())
+ for (String prefix : mappings.keySet())
{
- List<String> packages = _mappings.get(prefix);
+ List<String> packages = mappings.get(prefix);
String folder = prefix + "/";
@@ -212,11 +212,11 @@
}
- showChanges("pages", savedPages, _pageToClassName);
- showChanges("components", savedComponents, _componentToClassName);
- showChanges("mixins", savedMixins, _mixinToClassName);
+ showChanges("pages", savedPages, pageToClassName);
+ showChanges("components", savedComponents, componentToClassName);
+ showChanges("mixins", savedMixins, mixinToClassName);
- _needsRebuild = false;
+ needsRebuild = false;
}
private void showChanges(String title, Map<String, String> savedMap, Map<String, String> newMap)
@@ -274,15 +274,15 @@
f.format(formatString, name, className);
}
- _logger.info(builder.toString());
+ logger.info(builder.toString());
}
private void rebuild(String pathPrefix, String rootPackage)
{
- fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.PAGES_SUBPACKAGE, _pageToClassName);
- fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.COMPONENTS_SUBPACKAGE, _componentToClassName);
- fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.MIXINS_SUBPACKAGE, _mixinToClassName);
+ fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.PAGES_SUBPACKAGE, pageToClassName);
+ fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.COMPONENTS_SUBPACKAGE, componentToClassName);
+ fillNameToClassNameMap(pathPrefix, rootPackage, InternalConstants.MIXINS_SUBPACKAGE, mixinToClassName);
}
private void fillNameToClassNameMap(String pathPrefix, String rootPackage, String subPackage,
@@ -291,7 +291,7 @@
String searchPackage = rootPackage + "." + subPackage;
boolean isPage = subPackage.equals(InternalConstants.PAGES_SUBPACKAGE);
- Collection<String> classNames = _classNameLocator.locateClassNames(searchPackage);
+ Collection<String> classNames = classNameLocator.locateClassNames(searchPackage);
int startPos = searchPackage.length() + 1;
@@ -313,12 +313,12 @@
// Make the super-stripped name another alias to the class.
logicalNameToClassName.put(reducedName, name);
- _pageNameToCanonicalPageName.put(reducedName, logicalName);
+ pageNameToCanonicalPageName.put(reducedName, logicalName);
}
- _pageClassNameToLogicalName.put(name, logicalName);
- _pageNameToCanonicalPageName.put(logicalName, logicalName);
- _pageNameToCanonicalPageName.put(unstrippedName, logicalName);
+ pageClassNameToLogicalName.put(name, logicalName);
+ pageNameToCanonicalPageName.put(logicalName, logicalName);
+ pageNameToCanonicalPageName.put(unstrippedName, logicalName);
}
logicalNameToClassName.put(logicalName, name);
@@ -409,14 +409,14 @@
public String resolvePageNameToClassName(final String pageName)
{
- return _barrier.withRead(new Invokable<String>()
+ return barrier.withRead(new Invokable<String>()
{
public String invoke()
{
- String result = locate(pageName, _pageToClassName);
+ String result = locate(pageName, pageToClassName);
if (result == null) throw new IllegalArgumentException(
- ServicesMessages.couldNotResolvePageName(pageName, presentableNames(_pageToClassName)));
+ ServicesMessages.couldNotResolvePageName(pageName, presentableNames(pageToClassName)));
return result;
}
@@ -426,25 +426,25 @@
public boolean isPageName(final String pageName)
{
- return _barrier.withRead(new Invokable<Boolean>()
+ return barrier.withRead(new Invokable<Boolean>()
{
public Boolean invoke()
{
- return locate(pageName, _pageToClassName) != null;
+ return locate(pageName, pageToClassName) != null;
}
});
}
public String resolveComponentTypeToClassName(final String componentType)
{
- return _barrier.withRead(new Invokable<String>()
+ return barrier.withRead(new Invokable<String>()
{
public String invoke()
{
- String result = locate(componentType, _componentToClassName);
+ String result = locate(componentType, componentToClassName);
if (result == null) throw new IllegalArgumentException(ServicesMessages
- .couldNotResolveComponentType(componentType, presentableNames(_componentToClassName)));
+ .couldNotResolveComponentType(componentType, presentableNames(componentToClassName)));
return result;
}
@@ -453,7 +453,7 @@
Collection<String> presentableNames(Map<String, ?> map)
{
- Set<String> result = newSet();
+ Set<String> result = CollectionFactory.newSet();
for (String name : map.keySet())
{
@@ -472,14 +472,14 @@
public String resolveMixinTypeToClassName(final String mixinType)
{
- return _barrier.withRead(new Invokable<String>()
+ return barrier.withRead(new Invokable<String>()
{
public String invoke()
{
- String result = locate(mixinType, _mixinToClassName);
+ String result = locate(mixinType, mixinToClassName);
if (result == null) throw new IllegalArgumentException(
- ServicesMessages.couldNotResolveMixinType(mixinType, presentableNames(_mixinToClassName)));
+ ServicesMessages.couldNotResolveMixinType(mixinType, presentableNames(mixinToClassName)));
return result;
}
@@ -510,13 +510,13 @@
public String resolvePageClassNameToPageName(final String pageClassName)
{
- return _barrier.withRead(new Invokable<String>()
+ return barrier.withRead(new Invokable<String>()
{
public String invoke()
{
rebuild();
- String result = _pageClassNameToLogicalName.get(pageClassName);
+ String result = pageClassNameToLogicalName.get(pageClassName);
if (result == null) throw new IllegalArgumentException(ServicesMessages
.pageNameUnresolved(pageClassName));
@@ -528,14 +528,14 @@
public String canonicalizePageName(final String pageName)
{
- return _barrier.withRead(new Invokable<String>()
+ return barrier.withRead(new Invokable<String>()
{
public String invoke()
{
- String result = locate(pageName, _pageNameToCanonicalPageName);
+ String result = locate(pageName, pageNameToCanonicalPageName);
if (result == null) throw new IllegalArgumentException(ServicesMessages
- .couldNotCanonicalizePageName(pageName, presentableNames(_pageNameToCanonicalPageName)));
+ .couldNotCanonicalizePageName(pageName, presentableNames(pageNameToCanonicalPageName)));
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java Wed May 7 08:40:57 2008
@@ -24,7 +24,7 @@
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.services.CtClassSource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
@@ -43,19 +43,19 @@
/**
* Map from class name to class transformation.
*/
- private final Map<String, InternalClassTransformation> _nameToClassTransformation = newConcurrentMap();
+ private final Map<String, InternalClassTransformation> nameToClassTransformation = CollectionFactory.newConcurrentMap();
- private final Map<String, ComponentModel> _nameToComponentModel = newConcurrentMap();
+ private final Map<String, ComponentModel> nameToComponentModel = CollectionFactory.newConcurrentMap();
- private final ComponentClassTransformWorker _workerChain;
+ private final ComponentClassTransformWorker workerChain;
- private final LoggerSource _loggerSource;
+ private final LoggerSource loggerSource;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final CtClassSource _classSource;
+ private final CtClassSource classSource;
- private final ComponentClassCache _componentClassCache;
+ private final ComponentClassCache componentClassCache;
private final String[] SUBPACKAGES = { "." + InternalConstants.PAGES_SUBPACKAGE + ".",
"." + InternalConstants.COMPONENTS_SUBPACKAGE + ".",
@@ -73,11 +73,11 @@
@ComponentLayer CtClassSource classSource,
ComponentClassCache componentClassCache)
{
- _workerChain = workerChain;
- _loggerSource = loggerSource;
- _classFactory = classFactory;
- _componentClassCache = componentClassCache;
- _classSource = classSource;
+ this.workerChain = workerChain;
+ this.loggerSource = loggerSource;
+ this.classFactory = classFactory;
+ this.componentClassCache = componentClassCache;
+ this.classSource = classSource;
}
/**
@@ -85,8 +85,8 @@
*/
public void objectWasInvalidated()
{
- _nameToClassTransformation.clear();
- _nameToComponentModel.clear();
+ nameToClassTransformation.clear();
+ nameToComponentModel.clear();
}
public void transformComponentClass(CtClass ctClass, ClassLoader classLoader)
@@ -123,12 +123,12 @@
String classname = ctClass.getName();
- Logger logger = _loggerSource.getLogger(classname);
+ Logger logger = loggerSource.getLogger(classname);
// If the parent class is in a controlled package, it will already have been loaded and
// transformed (that is driven by the ComponentInstantiatorSource).
- InternalClassTransformation parentTransformation = _nameToClassTransformation
+ InternalClassTransformation parentTransformation = nameToClassTransformation
.get(parentClassname);
if (parentTransformation == null && !parentClassname.equals(Object.class.getName()))
@@ -144,18 +144,18 @@
Resource baseResource = new ClasspathResource(classname.replace(".", "/") + ".class");
- ComponentModel parentModel = _nameToComponentModel.get(parentClassname);
+ ComponentModel parentModel = nameToComponentModel.get(parentClassname);
MutableComponentModel model = new MutableComponentModelImpl(classname, logger, baseResource, parentModel);
InternalClassTransformation transformation =
parentTransformation == null
- ? new InternalClassTransformationImpl(_classFactory, ctClass, _componentClassCache, model, _classSource)
+ ? new InternalClassTransformationImpl(classFactory, ctClass, componentClassCache, model, classSource)
: parentTransformation.createChildTransformation(ctClass, model);
try
{
- _workerChain.transform(transformation, model);
+ workerChain.transform(transformation, model);
transformation.finish();
}
@@ -166,13 +166,13 @@
if (logger.isDebugEnabled()) logger.debug("Finished class transformation: " + transformation);
- _nameToClassTransformation.put(classname, transformation);
- _nameToComponentModel.put(classname, model);
+ nameToClassTransformation.put(classname, transformation);
+ nameToComponentModel.put(classname, model);
}
public Instantiator createInstantiator(String componentClassName)
{
- InternalClassTransformation ct = _nameToClassTransformation.get(componentClassName);
+ InternalClassTransformation ct = nameToClassTransformation.get(componentClassName);
if (ct == null) throw new RuntimeException(ServicesMessages.classNotTransformed(componentClassName));
@@ -192,7 +192,7 @@
{
int pos = className.indexOf(subpackage);
-// Keep the leading '.' in the subpackage name and tack on "base".
+ // Keep the leading '.' in the subpackage name and tack on "base".
if (pos > 0) return className.substring(0, pos + 1) + InternalConstants.BASE_SUBPACKAGE;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java Wed May 7 08:40:57 2008
@@ -28,21 +28,21 @@
public class ComponentDefaultProviderImpl implements ComponentDefaultProvider
{
- private final PropertyAccess _propertyAccess;
+ private final PropertyAccess propertyAccess;
- private final BindingSource _bindingSource;
+ private final BindingSource bindingSource;
- private final ValueEncoderSource _valueEncoderSource;
+ private final ValueEncoderSource valueEncoderSource;
- private final TranslatorSource _translatorSource;
+ private final TranslatorSource translatorSource;
public ComponentDefaultProviderImpl(PropertyAccess propertyAccess, BindingSource bindingSource,
ValueEncoderSource valueEncoderSource, TranslatorSource translatorSource)
{
- _propertyAccess = propertyAccess;
- _bindingSource = bindingSource;
- _valueEncoderSource = valueEncoderSource;
- _translatorSource = translatorSource;
+ this.propertyAccess = propertyAccess;
+ this.bindingSource = bindingSource;
+ this.valueEncoderSource = valueEncoderSource;
+ this.translatorSource = translatorSource;
}
public String defaultLabel(ComponentResources resources)
@@ -72,12 +72,12 @@
// This sets up an error condition for when the parameter is not bound, and
// the binding can't be deduced.
- if (_propertyAccess.getAdapter(container).getPropertyAdapter(componentId) == null)
+ if (propertyAccess.getAdapter(container).getPropertyAdapter(componentId) == null)
return null;
ComponentResources containerResources = resources.getContainerResources();
- return _bindingSource.newBinding(
+ return bindingSource.newBinding(
"default " + parameterName,
containerResources,
TapestryConstants.PROP_BINDING_PREFIX,
@@ -93,7 +93,7 @@
if (parameterType == null) return null;
- return _valueEncoderSource.getValueEncoder(parameterType);
+ return valueEncoderSource.getValueEncoder(parameterType);
}
public Translator defaultTranslator(String parameterName, ComponentResources resources)
@@ -105,6 +105,6 @@
if (type == null) return null;
- return _translatorSource.findByType(type);
+ return translatorSource.findByType(type);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java Wed May 7 08:40:57 2008
@@ -45,13 +45,13 @@
*/
public class ComponentEventDispatcher implements Dispatcher
{
- private final ComponentClassResolver _componentClassResolver;
+ private final ComponentClassResolver componentClassResolver;
- private final ComponentEventRequestHandler _componentEventRequestHandler;
+ private final ComponentEventRequestHandler componentEventRequestHandler;
- private final ContextValueEncoder _contextValueEncoder;
+ private final ContextValueEncoder contextValueEncoder;
- private final RequestEncodingInitializer _requestEncodingInitializer;
+ private final RequestEncodingInitializer requestEncodingInitializer;
private final EventContext _emptyContext = new EmptyEventContext();
@@ -60,10 +60,10 @@
ContextValueEncoder contextValueEncoder,
RequestEncodingInitializer requestEncodingInitializer)
{
- _componentEventRequestHandler = componentEventRequestHandler;
- _componentClassResolver = componentClassResolver;
- _contextValueEncoder = contextValueEncoder;
- _requestEncodingInitializer = requestEncodingInitializer;
+ this.componentEventRequestHandler = componentEventRequestHandler;
+ this.componentClassResolver = componentClassResolver;
+ this.contextValueEncoder = contextValueEncoder;
+ this.requestEncodingInitializer = requestEncodingInitializer;
}
// A beast that recognizes all the elements of a path in a single go.
@@ -105,14 +105,14 @@
if (nestedComponentId == null && eventType == null) return false;
- if (!_componentClassResolver.isPageName(activePageName)) return false;
+ if (!componentClassResolver.isPageName(activePageName)) return false;
EventContext eventContext = decodeContext(matcher.group(CONTEXT));
// Initialize the request encoding BEFORE accessing any query parameters
// (TAPESTRY-1605)
- _requestEncodingInitializer.initializeRequestEncoding(activePageName);
+ requestEncodingInitializer.initializeRequestEncoding(activePageName);
EventContext activationContext = decodeContext(request.getParameter(InternalConstants.PAGE_CONTEXT_NAME));
@@ -132,7 +132,7 @@
activationContext,
eventContext);
- _componentEventRequestHandler.handle(parameters);
+ componentEventRequestHandler.handle(parameters);
return true;
}
@@ -149,7 +149,7 @@
values[i] = TapestryInternalUtils.unescapePercentAndSlash(values[i]);
}
- return new URLEventContext(_contextValueEncoder, values);
+ return new URLEventContext(contextValueEncoder, values);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java Wed May 7 08:40:57 2008
@@ -21,13 +21,13 @@
public class ComponentEventImpl extends EventImpl implements ComponentEvent
{
- private final String _eventType;
+ private final String eventType;
- private final String _originatingComponentId;
+ private final String originatingComponentId;
- private final EventContext _context;
+ private final EventContext context;
- private final PageResources _pageResources;
+ private final PageResources pageResources;
/**
* @param eventType non blank string used to identify the type of event that was triggered
@@ -42,29 +42,29 @@
{
super(handler);
- _eventType = eventType;
- _originatingComponentId = originatingComponentId;
- _pageResources = pageResources;
- _context = context;
+ this.eventType = eventType;
+ this.originatingComponentId = originatingComponentId;
+ this.pageResources = pageResources;
+ this.context = context;
}
public boolean matches(String eventType, String componentId, int parameterCount)
{
- return _eventType.equalsIgnoreCase(
- eventType) && _context.getCount() >= parameterCount && (_originatingComponentId.equalsIgnoreCase(
+ return this.eventType.equalsIgnoreCase(
+ eventType) && context.getCount() >= parameterCount && (originatingComponentId.equalsIgnoreCase(
componentId) || componentId.equals(""));
}
@SuppressWarnings("unchecked")
public Object coerceContext(int index, String desiredTypeName)
{
- if (index >= _context.getCount()) throw new IllegalArgumentException(ServicesMessages
+ if (index >= context.getCount()) throw new IllegalArgumentException(ServicesMessages
.contextIndexOutOfRange(getMethodDescription()));
try
{
- Class desiredType = _pageResources.toClass(desiredTypeName);
+ Class desiredType = pageResources.toClass(desiredTypeName);
- return _context.get(desiredType, index);
+ return context.get(desiredType, index);
}
catch (Exception ex)
@@ -76,18 +76,18 @@
public Object[] getContext()
{
- int count = _context.getCount();
+ int count = context.getCount();
Object[] result = new Object[count];
for (int i = 0; i < count; i++)
- result[i] = _context.get(Object.class, i);
+ result[i] = context.get(Object.class, i);
return result;
}
public EventContext getEventContext()
{
- return _context;
+ return context;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java Wed May 7 08:40:57 2008
@@ -23,32 +23,32 @@
public class ComponentEventRequestHandlerImpl implements ComponentEventRequestHandler
{
- private final ComponentEventResultProcessor _resultProcessor;
+ private final ComponentEventResultProcessor resultProcessor;
- private final RequestPageCache _cache;
+ private final RequestPageCache cache;
- private final Response _response;
+ private final Response response;
- private final ActionRenderResponseGenerator _generator;
+ private final ActionRenderResponseGenerator generator;
- private final Environment _environment;
+ private final Environment environment;
public ComponentEventRequestHandlerImpl(@Traditional ComponentEventResultProcessor resultProcessor,
RequestPageCache cache, Response response,
ActionRenderResponseGenerator generator, Environment environment)
{
- _resultProcessor = resultProcessor;
- _cache = cache;
- _response = response;
- _generator = generator;
- _environment = environment;
+ this.resultProcessor = resultProcessor;
+ this.cache = cache;
+ this.response = response;
+ this.generator = generator;
+ this.environment = environment;
}
public void handle(ComponentEventRequestParameters parameters) throws IOException
{
- Page activePage = _cache.get(parameters.getActivePageName());
+ Page activePage = cache.get(parameters.getActivePageName());
- ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(_resultProcessor);
+ ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(resultProcessor);
// If activating the page returns a "navigational result", then don't trigger the action
// on the component.
@@ -58,18 +58,18 @@
if (callback.isAborted()) return;
- Page containerPage = _cache.get(parameters.getContainingPageName());
+ Page containerPage = cache.get(parameters.getContainingPageName());
ComponentPageElement element = containerPage.getComponentElementByNestedId(parameters.getNestedComponentId());
- _environment.push(ComponentEventResultProcessor.class, _resultProcessor);
+ environment.push(ComponentEventResultProcessor.class, resultProcessor);
element.triggerContextEvent(parameters.getEventType(), parameters.getEventContext(), callback);
- _environment.pop(ComponentEventResultProcessor.class);
+ environment.pop(ComponentEventResultProcessor.class);
if (callback.isAborted()) return;
- if (!_response.isCommitted()) _generator.generateResponse(activePage);
+ if (!response.isCommitted()) generator.generateResponse(activePage);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java Wed May 7 08:40:57 2008
@@ -24,18 +24,18 @@
public class ComponentInstanceResultProcessor implements ComponentEventResultProcessor<Component>
{
- private final RequestPageCache _requestPageCache;
+ private final RequestPageCache requestPageCache;
- private final Logger _logger;
+ private final Logger logger;
- private final ActionRenderResponseGenerator _generator;
+ private final ActionRenderResponseGenerator generator;
public ComponentInstanceResultProcessor(Logger logger, RequestPageCache requestPageCache,
ActionRenderResponseGenerator generator)
{
- _requestPageCache = requestPageCache;
- _logger = logger;
- _generator = generator;
+ this.requestPageCache = requestPageCache;
+ this.logger = logger;
+ this.generator = generator;
}
public void processResultValue(Component value) throws IOException
@@ -43,13 +43,13 @@
ComponentResources resources = value.getComponentResources();
if (resources.getContainer() != null)
- _logger.warn(ServicesMessages.componentInstanceIsNotAPage(value));
+ logger.warn(ServicesMessages.componentInstanceIsNotAPage(value));
// We have all these layers and layers between us and the page instance, but its easy to
// extract the page class name and quickly re-resolve that to the page instance.
- Page page = _requestPageCache.get(resources.getPageName());
+ Page page = requestPageCache.get(resources.getPageName());
- _generator.generateResponse(page);
+ generator.generateResponse(page);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java Wed May 7 08:40:57 2008
@@ -22,8 +22,7 @@
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.internal.services.CtClassSource;
import org.apache.tapestry.ioc.internal.services.CtClassSourceImpl;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.slf4j.Logger;
@@ -43,27 +42,28 @@
*/
private static final String JAVASSIST_WRITE_DIR = System.getProperty("javassist-write-dir");
- private final Set<String> _controlledPackageNames = newSet();
+ private final Set<String> controlledPackageNames = CollectionFactory.newSet();
- private final URLChangeTracker _changeTracker = new URLChangeTracker();
+ private final URLChangeTracker changeTracker = new URLChangeTracker();
- private final ClassLoader _parent;
+ private final ClassLoader parent;
- private final InternalRequestGlobals _internalRequestGlobals;
+ private final InternalRequestGlobals internalRequestGlobals;
- private Loader _loader;
+ private Loader loader;
- private final ComponentClassTransformer _transformer;
+ private final ComponentClassTransformer transformer;
- private final Logger _logger;
+ private final Logger logger;
- private ClassFactory _classFactory;
+ private ClassFactory classFactory;
/**
* Map from class name to Instantiator.
*/
- private final Map<String, Instantiator> _instantiatorMap = newMap();
- private CtClassSource _classSource;
+ private final Map<String, Instantiator> classNameToInstantiator = CollectionFactory.newMap();
+
+ private CtClassSource classSource;
private class PackageAwareLoader extends Loader
{
@@ -87,20 +87,20 @@
public ComponentInstantiatorSourceImpl(Logger logger, ClassLoader parent, ComponentClassTransformer transformer,
InternalRequestGlobals internalRequestGlobals)
{
- _parent = parent;
- _transformer = transformer;
- _logger = logger;
- _internalRequestGlobals = internalRequestGlobals;
+ this.parent = parent;
+ this.transformer = transformer;
+ this.logger = logger;
+ this.internalRequestGlobals = internalRequestGlobals;
initializeService();
}
public synchronized void checkForUpdates()
{
- if (!_changeTracker.containsChanges()) return;
+ if (!changeTracker.containsChanges()) return;
- _changeTracker.clear();
- _instantiatorMap.clear();
+ changeTracker.clear();
+ classNameToInstantiator.clear();
// Release the existing class pool, loader and so forth.
// Create a new one.
@@ -119,32 +119,32 @@
*/
private void initializeService()
{
- ClassFactoryClassPool classPool = new ClassFactoryClassPool(_parent);
+ ClassFactoryClassPool classPool = new ClassFactoryClassPool(parent);
- _loader = new PackageAwareLoader(_parent, classPool);
+ loader = new PackageAwareLoader(parent, classPool);
- ClassPath path = new LoaderClassPath(_loader);
+ ClassPath path = new LoaderClassPath(loader);
classPool.appendClassPath(path);
- _classSource = new CtClassSourceImpl(classPool, _loader);
+ classSource = new CtClassSourceImpl(classPool, loader);
try
{
- _loader.addTranslator(classPool, this);
+ loader.addTranslator(classPool, this);
}
catch (Exception ex)
{
throw new RuntimeException(ex);
}
- _classFactory = new ClassFactoryImpl(_loader, classPool, _classSource, _logger);
+ classFactory = new ClassFactoryImpl(loader, classPool, classSource, logger);
}
// This is called from well within a synchronized block.
public void onLoad(ClassPool pool, String classname) throws NotFoundException, CannotCompileException
{
- _logger.debug("BEGIN onLoad " + classname);
+ logger.debug("BEGIN onLoad " + classname);
// This is our chance to make changes to the CtClass before it is loaded into memory.
@@ -168,7 +168,7 @@
// Do the transformations here
- _transformer.transformComponentClass(ctClass, _loader);
+ transformer.transformComponentClass(ctClass, loader);
writeClassToFileSystemForHardCoreDebuggingPurposesOnly(ctClass);
@@ -176,13 +176,13 @@
}
catch (RuntimeException classLoaderException)
{
- _internalRequestGlobals.storeClassLoaderException(classLoaderException);
+ internalRequestGlobals.storeClassLoaderException(classLoaderException);
throw classLoaderException;
}
finally
{
- _logger.debug(String.format("%5s onLoad %s", diag, classname));
+ logger.debug(String.format("%5s onLoad %s", diag, classname));
}
}
@@ -208,9 +208,9 @@
{
String path = classname.replace('.', '/') + ".class";
- URL url = _loader.getResource(path);
+ URL url = loader.getResource(path);
- _changeTracker.add(url);
+ changeTracker.add(url);
}
private void forceSuperclassTransform(CtClass ctClass) throws NotFoundException
@@ -229,7 +229,7 @@
public synchronized Instantiator findInstantiator(String className)
{
- Instantiator result = _instantiatorMap.get(className);
+ Instantiator result = classNameToInstantiator.get(className);
if (result == null)
{
@@ -237,9 +237,9 @@
findClass(className);
- result = _transformer.createInstantiator(className);
+ result = transformer.createInstantiator(className);
- _instantiatorMap.put(className, result);
+ classNameToInstantiator.put(className, result);
}
return result;
@@ -249,7 +249,7 @@
{
try
{
- return _loader.loadClass(classname);
+ return loader.loadClass(classname);
}
catch (ClassNotFoundException ex)
{
@@ -268,7 +268,7 @@
while (packageName != null)
{
- if (_controlledPackageNames.contains(packageName)) return true;
+ if (controlledPackageNames.contains(packageName)) return true;
packageName = stripTail(packageName);
}
@@ -292,23 +292,23 @@
// TODO: Should we check that packages are not nested?
- _controlledPackageNames.add(packageName);
+ controlledPackageNames.add(packageName);
}
public boolean exists(String className)
{
String path = className.replace(".", "/") + ".class";
- return _parent.getResource(path) != null;
+ return parent.getResource(path) != null;
}
public ClassFactory getClassFactory()
{
- return _classFactory;
+ return classFactory;
}
public CtClassSource getClassSource()
{
- return _classSource;
+ return classSource;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationImpl.java Wed May 7 08:40:57 2008
@@ -30,13 +30,13 @@
*/
public class ComponentInvocationImpl implements ComponentInvocation
{
- private final String[] _context;
+ private final String[] context;
- private final InvocationTarget _target;
+ private final InvocationTarget target;
- private final String[] _activationContext;
+ private final String[] activationContext;
- private Map<String, String> _parameters;
+ private Map<String, String> parameters;
/**
* @param target identifies the target of the event: a component with a page
@@ -49,16 +49,16 @@
*/
public ComponentInvocationImpl(InvocationTarget target, String[] context, String[] activationContext)
{
- _target = target;
- _context = context;
- _activationContext = activationContext;
+ this.target = target;
+ this.context = context;
+ this.activationContext = activationContext;
}
public String buildURI(boolean isForm)
{
String path = getPath();
- if (isForm || _parameters == null) return path;
+ if (isForm || parameters == null) return path;
StringBuilder builder = new StringBuilder();
@@ -68,7 +68,7 @@
for (String name : getParameterNames())
{
- String value = _parameters.get(name);
+ String value = parameters.get(name);
builder.append(sep);
@@ -91,9 +91,9 @@
private String getPath()
{
StringBuilder builder = new StringBuilder();
- builder.append(_target.getPath());
+ builder.append(target.getPath());
- for (String id : _context)
+ for (String id : context)
{
if (builder.length() > 0) builder.append("/");
@@ -105,12 +105,12 @@
public String[] getContext()
{
- return _context;
+ return context;
}
public String[] getActivationContext()
{
- return _activationContext;
+ return activationContext;
}
public void addParameter(String parameterName, String value)
@@ -118,26 +118,26 @@
notBlank(parameterName, "parameterName");
notBlank(value, "value");
- if (_parameters == null) _parameters = newMap();
+ if (parameters == null) parameters = newMap();
- if (_parameters.containsKey(parameterName)) throw new IllegalArgumentException(
- ServicesMessages.parameterNameMustBeUnique(parameterName, _parameters.get(parameterName)));
+ if (parameters.containsKey(parameterName)) throw new IllegalArgumentException(
+ ServicesMessages.parameterNameMustBeUnique(parameterName, parameters.get(parameterName)));
- _parameters.put(parameterName, value);
+ parameters.put(parameterName, value);
}
public List<String> getParameterNames()
{
- return InternalUtils.sortedKeys(_parameters);
+ return InternalUtils.sortedKeys(parameters);
}
public String getParameterValue(String name)
{
- return InternalUtils.get(_parameters, name);
+ return InternalUtils.get(parameters, name);
}
public InvocationTarget getTarget()
{
- return _target;
+ return target;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java Wed May 7 08:40:57 2008
@@ -26,41 +26,41 @@
public class ComponentMessagesSourceImpl implements ComponentMessagesSource, UpdateListener
{
- private final MessagesSource _messagesSource;
+ private final MessagesSource messagesSource;
- private final Resource _rootResource;
+ private final Resource rootResource;
- private final String _appCatalog;
+ private final String appCatalog;
private static class ComponentModelBundle implements MessagesBundle
{
- private final ComponentModel _model;
+ private final ComponentModel model;
- private final MessagesBundle _rootBundle;
+ private final MessagesBundle rootBundle;
public ComponentModelBundle(ComponentModel model, MessagesBundle rootBundle)
{
- _model = model;
- _rootBundle = rootBundle;
+ this.model = model;
+ this.rootBundle = rootBundle;
}
public Resource getBaseResource()
{
- return _model.getBaseResource();
+ return model.getBaseResource();
}
public Object getId()
{
- return _model.getComponentClassName();
+ return model.getComponentClassName();
}
public MessagesBundle getParent()
{
- ComponentModel parentModel = _model.getParentModel();
+ ComponentModel parentModel = model.getParentModel();
- if (parentModel == null) return _rootBundle;
+ if (parentModel == null) return rootBundle;
- return new ComponentModelBundle(parentModel, _rootBundle);
+ return new ComponentModelBundle(parentModel, rootBundle);
}
}
@@ -71,20 +71,20 @@
ComponentMessagesSourceImpl(Resource rootResource, String appCatalog, URLChangeTracker tracker)
{
- _rootResource = rootResource;
- _appCatalog = appCatalog;
+ this.rootResource = rootResource;
+ this.appCatalog = appCatalog;
- _messagesSource = new MessagesSourceImpl(tracker);
+ messagesSource = new MessagesSourceImpl(tracker);
}
public void checkForUpdates()
{
- _messagesSource.checkForUpdates();
+ messagesSource.checkForUpdates();
}
public Messages getMessages(ComponentModel componentModel, Locale locale)
{
- final Resource appCatalogResource = _rootResource.forFile(_appCatalog);
+ final Resource appCatalogResource = rootResource.forFile(appCatalog);
// If the application catalog exists, set it up as the root, otherwise use null.
@@ -98,7 +98,7 @@
public Object getId()
{
- return _appCatalog;
+ return appCatalog;
}
public MessagesBundle getParent()
@@ -109,11 +109,11 @@
MessagesBundle bundle = new ComponentModelBundle(componentModel, appCatalogBundle);
- return _messagesSource.getMessages(bundle, locale);
+ return messagesSource.getMessages(bundle, locale);
}
public void addInvalidationListener(InvalidationListener listener)
{
- _messagesSource.addInvalidationListener(listener);
+ messagesSource.addInvalidationListener(listener);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResultProcessorWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResultProcessorWrapper.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResultProcessorWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResultProcessorWrapper.java Wed May 7 08:40:57 2008
@@ -24,29 +24,29 @@
*/
public class ComponentResultProcessorWrapper implements ComponentEventCallback
{
- private boolean _aborted;
+ private boolean aborted;
- private IOException _exception;
+ private IOException exception;
- private final ComponentEventResultProcessor _processor;
+ private final ComponentEventResultProcessor processor;
public ComponentResultProcessorWrapper(ComponentEventResultProcessor processor)
{
- _processor = processor;
+ this.processor = processor;
}
public boolean handleResult(Object result)
{
try
{
- _processor.processResultValue(result);
+ processor.processResultValue(result);
}
catch (IOException ex)
{
- _exception = ex;
+ exception = ex;
}
- _aborted = true;
+ aborted = true;
return true;
}
@@ -60,8 +60,8 @@
*/
public boolean isAborted() throws IOException
{
- if (_exception != null) throw _exception;
+ if (exception != null) throw exception;
- return _aborted;
+ return aborted;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java Wed May 7 08:40:57 2008
@@ -22,11 +22,11 @@
public class ComponentSourceImpl implements ComponentSource
{
- private final RequestPageCache _pageCache;
+ private final RequestPageCache pageCache;
public ComponentSourceImpl(RequestPageCache pageCache)
{
- _pageCache = pageCache;
+ this.pageCache = pageCache;
}
public Component getComponent(String completeId)
@@ -35,14 +35,14 @@
if (colonx < 0)
{
- Page page = _pageCache.get(completeId);
+ Page page = pageCache.get(completeId);
return page.getRootComponent();
}
String pageName = completeId.substring(0, colonx);
- Page page = _pageCache.get(pageName);
+ Page page = pageCache.get(pageName);
String nestedId = completeId.substring(colonx + 1);
String mixinId = null;
@@ -67,7 +67,7 @@
public Component getPage(String pageName)
{
- Page page = _pageCache.get(pageName);
+ Page page = pageCache.get(pageName);
return page.getRootComponent();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java Wed May 7 08:40:57 2008
@@ -22,7 +22,7 @@
import org.apache.tapestry.internal.util.MultiKey;
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.model.ComponentModel;
import java.util.List;
@@ -36,25 +36,25 @@
public final class ComponentTemplateSourceImpl extends InvalidationEventHubImpl implements ComponentTemplateSource, UpdateListener
{
- private final TemplateParser _parser;
+ private final TemplateParser parser;
- private final PageTemplateLocator _locator;
+ private final PageTemplateLocator locator;
- private final URLChangeTracker _tracker;
+ private final URLChangeTracker tracker;
/**
* Caches from a key (combining component name and locale) to a resource. Often, many different keys will point to
* the same resource (i.e., "foo:en_US", "foo:en_UK", and "foo:en" may all be parsed from the same "foo.tml"
* resource). The resource may end up being null, meaning the template does not exist in any locale.
*/
- private final Map<MultiKey, Resource> _templateResources = newConcurrentMap();
+ private final Map<MultiKey, Resource> templateResources = CollectionFactory.newConcurrentMap();
/**
* Cache of parsed templates, keyed on resource.
*/
- private final Map<Resource, ComponentTemplate> _templates = newConcurrentMap();
+ private final Map<Resource, ComponentTemplate> templates = CollectionFactory.newConcurrentMap();
- private final ComponentTemplate _missingTemplate = new ComponentTemplate()
+ private final ComponentTemplate missingTemplate = new ComponentTemplate()
{
public Set<String> getComponentIds()
{
@@ -84,9 +84,9 @@
ComponentTemplateSourceImpl(TemplateParser parser, PageTemplateLocator locator, URLChangeTracker tracker)
{
- _parser = parser;
- _locator = locator;
- _tracker = tracker;
+ this.parser = parser;
+ this.locator = locator;
+ this.tracker = tracker;
}
/**
@@ -104,22 +104,22 @@
// First cache is key to resource.
- Resource resource = _templateResources.get(key);
+ Resource resource = templateResources.get(key);
if (resource == null)
{
resource = locateTemplateResource(componentModel, locale);
- _templateResources.put(key, resource);
+ templateResources.put(key, resource);
}
// If we haven't yet parsed the template into the cache, do so now.
- ComponentTemplate result = _templates.get(resource);
+ ComponentTemplate result = templates.get(resource);
if (result == null)
{
result = parseTemplate(resource);
- _templates.put(resource, result);
+ templates.put(resource, result);
}
return result;
@@ -130,11 +130,11 @@
// In a race condition, we may parse the same template more than once. This will likely add
// the resource to the tracker multiple times. Not likely this will cause a big issue.
- if (!r.exists()) return _missingTemplate;
+ if (!r.exists()) return missingTemplate;
- _tracker.add(r.toURL());
+ tracker.add(r.toURL());
- return _parser.parseTemplate(r);
+ return parser.parseTemplate(r);
}
private Resource locateTemplateResource(ComponentModel initialModel, Locale locale)
@@ -158,7 +158,7 @@
// Not on the classpath, the the locator see if its a) a page and b) a resource inside
// the context
- localized = _locator.findPageTemplateResource(model, locale);
+ localized = locator.findPageTemplateResource(model, locale);
if (localized != null) return localized;
@@ -186,11 +186,11 @@
*/
public void checkForUpdates()
{
- if (_tracker.containsChanges())
+ if (tracker.containsChanges())
{
- _tracker.clear();
- _templateResources.clear();
- _templates.clear();
+ tracker.clear();
+ templateResources.clear();
+ templates.clear();
fireInvalidationEvent();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java Wed May 7 08:40:57 2008
@@ -25,29 +25,29 @@
*/
public final class CompositeFieldValidator implements FieldValidator
{
- private final FieldValidator[] _validators;
+ private final FieldValidator[] validators;
public CompositeFieldValidator(List<FieldValidator> validators)
{
- _validators = validators.toArray(new FieldValidator[validators.size()]);
+ this.validators = validators.toArray(new FieldValidator[validators.size()]);
}
@SuppressWarnings("unchecked")
public void validate(Object value) throws ValidationException
{
- for (FieldValidator fv : _validators)
+ for (FieldValidator fv : validators)
fv.validate(value);
}
public void render(MarkupWriter writer)
{
- for (FieldValidator fv : _validators)
+ for (FieldValidator fv : validators)
fv.render(writer);
}
public boolean isRequired()
{
- for (FieldValidator fv : _validators)
+ for (FieldValidator fv : validators)
{
if (fv.isRequired()) return true;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java Wed May 7 08:40:57 2008
@@ -27,22 +27,22 @@
*/
public class ContextAssetFactory implements AssetFactory
{
- private final Request _request;
+ private final Request request;
- private final Context _context;
+ private final Context context;
- private final RequestPathOptimizer _optimizer;
+ private final RequestPathOptimizer optimizer;
public ContextAssetFactory(Request request, Context context, RequestPathOptimizer optimizer)
{
- _request = request;
- _context = context;
- _optimizer = optimizer;
+ this.request = request;
+ this.context = context;
+ this.optimizer = optimizer;
}
public Asset createAsset(final Resource resource)
{
- final String contextPath = _request.getContextPath() + "/" + resource.getPath();
+ final String contextPath = request.getContextPath() + "/" + resource.getPath();
return new Asset()
{
@@ -53,7 +53,7 @@
public String toClientURL()
{
- return _optimizer.optimizePath(contextPath);
+ return optimizer.optimizePath(contextPath);
}
/**
@@ -73,7 +73,7 @@
*/
public Resource getRootResource()
{
- return new ContextResource(_context, "/");
+ return new ContextResource(context, "/");
}
}