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 [1/3] -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/
Author: hlship
Date: Wed May 7 08:40:57 2008
New Revision: 654153
URL: http://svn.apache.org/viewvc?rev=654153&view=rev
Log:
Remove leading underscores from field names
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CachedPage.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractComponentMethodInvocation.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractInstantiator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionRenderResponseGeneratorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentInstanceEventResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BaseURLSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockOverrideSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClientPersistentFieldStrategy.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CoercingPropertyConduitWrapper.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassCacheImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventRequestHandlerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResultProcessorWrapper.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextValueEncoderImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentLinkerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EventImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidationSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformation.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolCache.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractComponentMethodInvocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractComponentMethodInvocation.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractComponentMethodInvocation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractComponentMethodInvocation.java Wed May 7 08:40:57 2008
@@ -20,45 +20,45 @@
public abstract class AbstractComponentMethodInvocation implements ComponentMethodInvocation
{
- private final MethodInvocationInfo _info;
+ private final MethodInvocationInfo info;
- private final ComponentResources _resources;
+ private final ComponentResources resources;
- private int _adviceIndex = 0;
+ private int adviceIndex = 0;
- private Throwable _thrown;
+ private Throwable thrown;
- private Object _result;
+ private Object result;
public AbstractComponentMethodInvocation(MethodInvocationInfo info, ComponentResources resources)
{
- _info = info;
- _resources = resources;
+ this.info = info;
+ this.resources = resources;
}
public ComponentResources getComponentResources()
{
- return _resources;
+ return resources;
}
public String getMethodName()
{
- return _info.getMethodName();
+ return info.getMethodName();
}
public Class getResultType()
{
- return _info.getResultType();
+ return info.getResultType();
}
public int getParameterCount()
{
- return _info.getParameterCount();
+ return info.getParameterCount();
}
public Class getParameterType(int index)
{
- return _info.getParameterType(index);
+ return info.getParameterType(index);
}
/**
@@ -66,13 +66,13 @@
*/
public void proceed()
{
- if (_adviceIndex >= _info.getAdviceCount())
+ if (adviceIndex >= info.getAdviceCount())
{
invokeAdvisedMethod();
return;
}
- ComponentMethodAdvice advice = _info.getAdvice(_adviceIndex++);
+ ComponentMethodAdvice advice = info.getAdvice(adviceIndex++);
// When this advice invokes proceed(), we can advance to the next advice,
// and then ultimately to the advised method.
@@ -87,24 +87,24 @@
public boolean isFail()
{
- return _thrown != null;
+ return thrown != null;
}
public <T extends Throwable> T getThrown(Class<T> throwableClass)
{
- if (throwableClass.isInstance(_thrown))
- return throwableClass.cast(_thrown);
+ if (throwableClass.isInstance(thrown))
+ return throwableClass.cast(thrown);
return null;
}
public void overrideThrown(Exception thrown)
{
- for (Class type : _info.getExceptionTypes())
+ for (Class type : info.getExceptionTypes())
{
if (type.isInstance(thrown))
{
- _thrown = thrown;
+ this.thrown = thrown;
return;
}
}
@@ -112,19 +112,19 @@
throw new IllegalArgumentException(
String.format("Exception class %s is not a declared exception type for method %s().",
thrown.getClass(),
- _info.getMethodName()));
+ info.getMethodName()));
}
public Object getResult()
{
- return _result;
+ return result;
}
public void overrideResult(Object newResult)
{
if (newResult != null)
{
- Class expectedType = _info.getEffectiveResultType();
+ Class expectedType = info.getEffectiveResultType();
if (!expectedType.isInstance(newResult))
{
@@ -132,12 +132,12 @@
String.format("Invalid result value (%s) does not match return type %s for method %s.",
newResult,
expectedType.getName(),
- _info.getMethodName()));
+ info.getMethodName()));
}
}
- _result = newResult;
- _thrown = null;
+ result = newResult;
+ thrown = null;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractInstantiator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractInstantiator.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractInstantiator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractInstantiator.java Wed May 7 08:40:57 2008
@@ -21,24 +21,24 @@
*/
public abstract class AbstractInstantiator implements Instantiator
{
- private final ComponentModel _model;
+ private final ComponentModel model;
- private final String _description;
+ private final String description;
public AbstractInstantiator(ComponentModel model, String description)
{
- _model = model;
- _description = description;
+ this.model = model;
+ this.description = description;
}
@Override
public String toString()
{
- return _description;
+ return description;
}
public ComponentModel getModel()
{
- return _model;
+ return model;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AbstractSessionPersistentFieldStrategy.java Wed May 7 08:40:57 2008
@@ -31,25 +31,25 @@
*/
public abstract class AbstractSessionPersistentFieldStrategy implements PersistentFieldStrategy
{
- private final String _prefix;
+ private final String prefix;
- private final Request _request;
+ private final Request request;
protected AbstractSessionPersistentFieldStrategy(String prefix, Request request)
{
- _prefix = prefix;
- _request = request;
+ this.prefix = prefix;
+ this.request = request;
}
public final Collection<PersistentFieldChange> gatherFieldChanges(String pageName)
{
- Session session = _request.getSession(false);
+ Session session = request.getSession(false);
if (session == null) return Collections.emptyList();
List<PersistentFieldChange> result = newList();
- String fullPrefix = _prefix + pageName + ":";
+ String fullPrefix = prefix + pageName + ":";
for (String name : session.getAttributeNames(fullPrefix))
{
@@ -65,11 +65,11 @@
public void discardChanges(String pageName)
{
- Session session = _request.getSession(false);
+ Session session = request.getSession(false);
if (session == null) return;
- String fullPrefix = _prefix + pageName + ":";
+ String fullPrefix = prefix + pageName + ":";
for (String name : session.getAttributeNames(fullPrefix))
{
@@ -108,7 +108,7 @@
notBlank(pageName, "pageName");
notBlank(fieldName, "fieldName");
- StringBuilder builder = new StringBuilder(_prefix);
+ StringBuilder builder = new StringBuilder(prefix);
builder.append(pageName);
builder.append(':');
@@ -117,7 +117,7 @@
builder.append(':');
builder.append(fieldName);
- Session session = _request.getSession(newValue != null);
+ Session session = request.getSession(newValue != null);
// TAPESTRY-2308: The session will be false when newValue is null and the session
// does not already exist.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionLinkTarget.java Wed May 7 08:40:57 2008
@@ -22,17 +22,17 @@
*/
public class ActionLinkTarget implements InvocationTarget
{
- private final String _eventType;
+ private final String eventType;
- private final String _pageName;
+ private final String pageName;
- private final String _componentNestedId;
+ private final String componentNestedId;
public ActionLinkTarget(String eventType, String pageName, String componentNestedId)
{
- _eventType = eventType;
- _pageName = pageName;
- _componentNestedId = componentNestedId;
+ this.eventType = eventType;
+ this.pageName = pageName;
+ this.componentNestedId = componentNestedId;
}
@@ -40,25 +40,25 @@
{
StringBuilder builder = new StringBuilder();
- builder.append(_pageName.toLowerCase());
+ builder.append(pageName.toLowerCase());
- boolean hasComponentId = InternalUtils.isNonBlank(_componentNestedId);
+ boolean hasComponentId = InternalUtils.isNonBlank(componentNestedId);
if (hasComponentId)
{
builder.append(".");
// Already lower case by design.
- builder.append(_componentNestedId);
+ builder.append(componentNestedId);
}
// If no nested component id, then must append the action; the ':' and the action become the
// delimiter between the page name and the event context.
- if (!hasComponentId || !_eventType.equals(TapestryConstants.ACTION_EVENT))
+ if (!hasComponentId || !eventType.equals(TapestryConstants.ACTION_EVENT))
{
builder.append(":");
- builder.append(_eventType);
+ builder.append(eventType);
}
return builder.toString();
@@ -66,17 +66,17 @@
public String getEventType()
{
- return _eventType;
+ return eventType;
}
public String getComponentNestedId()
{
- return _componentNestedId;
+ return componentNestedId;
}
public String getPageName()
{
- return _pageName;
+ return pageName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionRenderResponseGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionRenderResponseGeneratorImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionRenderResponseGeneratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ActionRenderResponseGeneratorImpl.java Wed May 7 08:40:57 2008
@@ -26,20 +26,20 @@
*/
public class ActionRenderResponseGeneratorImpl implements ActionRenderResponseGenerator
{
- private final LinkFactory _linkFactory;
+ private final LinkFactory linkFactory;
- private final Response _response;
+ private final Response response;
public ActionRenderResponseGeneratorImpl(LinkFactory linkFactory, Response response)
{
- _linkFactory = linkFactory;
- _response = response;
+ this.linkFactory = linkFactory;
+ this.response = response;
}
public void generateResponse(Page page) throws IOException
{
- Link link = _linkFactory.createPageLink(page, false);
+ Link link = linkFactory.createPageLink(page, false);
- _response.sendRedirect(link);
+ response.sendRedirect(link);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentEventRequestHandler.java Wed May 7 08:40:57 2008
@@ -30,39 +30,39 @@
*/
public class AjaxComponentEventRequestHandler implements ComponentEventRequestHandler
{
- private final RequestPageCache _cache;
+ private final RequestPageCache cache;
- private final Request _request;
+ private final Request request;
- private final PageRenderQueue _queue;
+ private final PageRenderQueue queue;
- private final ComponentEventResultProcessor _resultProcessor;
+ private final ComponentEventResultProcessor resultProcessor;
- private final PageContentTypeAnalyzer _pageContentTypeAnalyzer;
+ private final PageContentTypeAnalyzer pageContentTypeAnalyzer;
- private final Environment _environment;
+ private final Environment environment;
- private final AjaxPartialResponseRenderer _partialRenderer;
+ private final AjaxPartialResponseRenderer partialRenderer;
public AjaxComponentEventRequestHandler(RequestPageCache cache, Request request, PageRenderQueue queue,
@Ajax ComponentEventResultProcessor resultProcessor,
PageContentTypeAnalyzer pageContentTypeAnalyzer, Environment environment,
AjaxPartialResponseRenderer partialRenderer)
{
- _cache = cache;
- _queue = queue;
- _resultProcessor = resultProcessor;
- _pageContentTypeAnalyzer = pageContentTypeAnalyzer;
- _request = request;
- _environment = environment;
- _partialRenderer = partialRenderer;
+ this.cache = cache;
+ this.queue = queue;
+ this.resultProcessor = resultProcessor;
+ this.pageContentTypeAnalyzer = pageContentTypeAnalyzer;
+ this.request = request;
+ this.environment = environment;
+ this.partialRenderer = partialRenderer;
}
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);
activePage.getRootElement().triggerContextEvent(TapestryConstants.ACTIVATE_EVENT,
@@ -74,28 +74,28 @@
// If we end up doing a partial render, the page render queue service needs to know the
// page that will be rendered (for logging purposes, if nothing else).
- _queue.setRenderingPage(activePage);
+ queue.setRenderingPage(activePage);
- ContentType contentType = _pageContentTypeAnalyzer.findContentType(activePage);
+ ContentType contentType = pageContentTypeAnalyzer.findContentType(activePage);
- _request.setAttribute(InternalConstants.CONTENT_TYPE_ATTRIBUTE_NAME, contentType);
+ request.setAttribute(InternalConstants.CONTENT_TYPE_ATTRIBUTE_NAME, contentType);
- Page containerPage = _cache.get(parameters.getContainingPageName());
+ Page containerPage = cache.get(parameters.getContainingPageName());
ComponentPageElement element = containerPage.getComponentElementByNestedId(parameters.getNestedComponentId());
// In many cases, the triggered element is a Form that needs to be able to
// pass its event handler return values to the correct result processor.
- _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 (_queue.isPartialRenderInitialized())
+ if (queue.isPartialRenderInitialized())
{
- _partialRenderer.renderPartialPageMarkup();
+ partialRenderer.renderPartialPageMarkup();
return;
}
@@ -105,7 +105,7 @@
JSONObject reply = new JSONObject();
- _resultProcessor.processResultValue(reply);
+ resultProcessor.processResultValue(reply);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentInstanceEventResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentInstanceEventResultProcessor.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentInstanceEventResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentInstanceEventResultProcessor.java Wed May 7 08:40:57 2008
@@ -27,14 +27,14 @@
*/
public class AjaxComponentInstanceEventResultProcessor implements ComponentEventResultProcessor<Component>
{
- private final RequestPageCache _cache;
+ private final RequestPageCache cache;
- private final PageRenderQueue _pageRenderQueue;
+ private final PageRenderQueue pageRenderQueue;
public AjaxComponentInstanceEventResultProcessor(RequestPageCache cache, PageRenderQueue pageRenderQueue)
{
- _cache = cache;
- _pageRenderQueue = pageRenderQueue;
+ this.cache = cache;
+ this.pageRenderQueue = pageRenderQueue;
}
public void processResultValue(Component value) throws IOException
@@ -43,7 +43,7 @@
String pageName = resources.getPageName();
- Page page = _cache.get(pageName);
+ Page page = cache.get(pageName);
String nestedId = resources.getNestedId();
@@ -52,6 +52,6 @@
RenderCommand command = nestedId == null ? page.getRootElement() : page.getComponentElementByNestedId(nestedId);
- _pageRenderQueue.initializeForPartialPageRender(command);
+ pageRenderQueue.initializeForPartialPageRender(command);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java Wed May 7 08:40:57 2008
@@ -24,20 +24,20 @@
*/
public class AjaxFilter implements ComponentEventRequestFilter
{
- private final Request _request;
+ private final Request request;
- private final ComponentEventRequestHandler _ajaxHandler;
+ private final ComponentEventRequestHandler ajaxHandler;
public AjaxFilter(Request request, @Ajax ComponentEventRequestHandler ajaxHandler)
{
- _request = request;
- _ajaxHandler = ajaxHandler;
+ this.request = request;
+ this.ajaxHandler = ajaxHandler;
}
public void handle(ComponentEventRequestParameters parameters, ComponentEventRequestHandler handler)
throws IOException
{
- ComponentEventRequestHandler next = _request.isXHR() ? _ajaxHandler : handler;
+ ComponentEventRequestHandler next = request.isXHR() ? ajaxHandler : handler;
next.handle(parameters);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxPartialResponseRendererImpl.java Wed May 7 08:40:57 2008
@@ -28,21 +28,21 @@
public class AjaxPartialResponseRendererImpl implements AjaxPartialResponseRenderer
{
- private final MarkupWriterFactory _factory;
+ private final MarkupWriterFactory factory;
- private final Request _request;
+ private final Request request;
- private final Response _response;
+ private final Response response;
- private final PartialMarkupRenderer _partialMarkupRenderer;
+ private final PartialMarkupRenderer partialMarkupRenderer;
public AjaxPartialResponseRendererImpl(MarkupWriterFactory factory, Request request,
Response response, PartialMarkupRenderer partialMarkupRenderer)
{
- _factory = factory;
- _request = request;
- _response = response;
- _partialMarkupRenderer = partialMarkupRenderer;
+ this.factory = factory;
+ this.request = request;
+ this.response = response;
+ this.partialMarkupRenderer = partialMarkupRenderer;
}
public void renderPartialPageMarkup() throws IOException
@@ -51,22 +51,22 @@
// seperated, and trying to keep stateless and stateful (i.e., perthread scope) services
// seperated. So we inform the stateful queue service what it needs to do here ...
- ContentType pageContentType = (ContentType) _request.getAttribute(
+ ContentType pageContentType = (ContentType) request.getAttribute(
InternalConstants.CONTENT_TYPE_ATTRIBUTE_NAME);
String charset = pageContentType.getParameter(InternalConstants.CHARSET_CONTENT_TYPE_PARAMETER);
ContentType contentType = new ContentType(InternalConstants.JSON_MIME_TYPE);
contentType.setParameter(InternalConstants.CHARSET_CONTENT_TYPE_PARAMETER, charset);
- MarkupWriter writer = _factory.newMarkupWriter(pageContentType);
+ MarkupWriter writer = factory.newMarkupWriter(pageContentType);
JSONObject reply = new JSONObject();
// ... and here, the pipeline eventually reaches the PRQ to let it render the root render command.
- _partialMarkupRenderer.renderMarkup(writer, reply);
+ partialMarkupRenderer.renderMarkup(writer, reply);
- PrintWriter pw = _response.getPrintWriter(contentType.toString());
+ PrintWriter pw = response.getPrintWriter(contentType.toString());
pw.print(reply);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasImpl.java Wed May 7 08:40:57 2008
@@ -17,7 +17,7 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.Alias;
import org.apache.tapestry.services.AliasManager;
@@ -27,21 +27,21 @@
{
// Derived from the managers when first needed
- private final Map<Class, Object> _properties = newMap();
+ private final Map<Class, Object> properties = CollectionFactory.newMap();
- private final String _mode;
+ private final String mode;
- private boolean _initialized = false;
+ private boolean initialized = false;
- private AliasManager _masterManager;
+ private AliasManager masterManager;
- private AliasManager _overridesManager;
+ private AliasManager overridesManager;
public AliasImpl(AliasManager masterManager, String mode, AliasManager overridesManager)
{
- _masterManager = masterManager;
- _mode = mode;
- _overridesManager = overridesManager;
+ this.masterManager = masterManager;
+ this.mode = mode;
+ this.overridesManager = overridesManager;
}
public ObjectProvider getObjectProvider()
@@ -51,15 +51,15 @@
private synchronized void initialize()
{
- if (_initialized) return;
+ if (initialized) return;
- _properties.putAll(_masterManager.getAliasesForMode(_mode));
- _properties.putAll(_overridesManager.getAliasesForMode(_mode));
+ properties.putAll(masterManager.getAliasesForMode(mode));
+ properties.putAll(overridesManager.getAliasesForMode(mode));
- _masterManager = null;
- _overridesManager = null;
+ masterManager = null;
+ overridesManager = null;
- _initialized = true;
+ initialized = true;
}
public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
@@ -67,7 +67,7 @@
{
initialize();
- Object object = _properties.get(objectType);
+ Object object = properties.get(objectType);
// Let another provider handle this (probably the default object provider)
if (object == null) return null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java Wed May 7 08:40:57 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.AliasContribution;
import org.apache.tapestry.services.AliasManager;
import org.slf4j.Logger;
@@ -24,14 +24,14 @@
public class AliasManagerImpl implements AliasManager
{
- private final Logger _logger;
+ private final Logger logger;
- private final Collection<AliasContribution> _contributions;
+ private final Collection<AliasContribution> contributions;
public AliasManagerImpl(Logger logger, Collection<AliasContribution> contributions)
{
- _logger = logger;
- _contributions = contributions;
+ this.logger = logger;
+ this.contributions = contributions;
}
public Map<Class, Object> getAliasesForMode(String mode)
@@ -48,9 +48,9 @@
private Map<Class, Object> buildMapForMode(String mode)
{
- Map<Class, Object> result = newMap();
+ Map<Class, Object> result = CollectionFactory.newMap();
- for (AliasContribution ic : _contributions)
+ for (AliasContribution ic : contributions)
{
if (!ic.getMode().equalsIgnoreCase(mode)) continue;
@@ -60,7 +60,7 @@
if (existing != null)
{
- _logger.error(ServicesMessages.duplicateContribution(
+ logger.error(ServicesMessages.duplicateContribution(
ic.getObject(),
contributionType,
existing));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationGlobalsImpl.java Wed May 7 08:40:57 2008
@@ -21,27 +21,27 @@
public class ApplicationGlobalsImpl implements ApplicationGlobals
{
- private ServletContext _servletContext;
+ private ServletContext servletContext;
- private Context _context;
+ private Context context;
public void storeServletContext(ServletContext context)
{
- _servletContext = context;
+ servletContext = context;
}
public ServletContext getServletContext()
{
- return _servletContext;
+ return servletContext;
}
public Context getContext()
{
- return _context;
+ return context;
}
public void storeContext(Context context)
{
- _context = context;
+ this.context = context;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java Wed May 7 08:40:57 2008
@@ -26,33 +26,33 @@
static class ApplicationStateAdapter<T>
{
- private final Class<T> _asoClass;
+ private final Class<T> asoClass;
- private final ApplicationStatePersistenceStrategy _strategy;
+ private final ApplicationStatePersistenceStrategy strategy;
- private final ApplicationStateCreator<T> _creator;
+ private final ApplicationStateCreator<T> creator;
ApplicationStateAdapter(Class<T> asoClass, ApplicationStatePersistenceStrategy strategy,
ApplicationStateCreator<T> creator)
{
- _asoClass = asoClass;
- _strategy = strategy;
- _creator = creator;
+ this.asoClass = asoClass;
+ this.strategy = strategy;
+ this.creator = creator;
}
T getOrCreate()
{
- return _strategy.get(_asoClass, _creator);
+ return strategy.get(asoClass, creator);
}
void set(T aso)
{
- _strategy.set(_asoClass, aso);
+ strategy.set(asoClass, aso);
}
boolean exists()
{
- return _strategy.exists(_asoClass);
+ return strategy.exists(asoClass);
}
}
@@ -60,18 +60,18 @@
* The map will be extended periodically as new ASOs, not in the configuration, are encountered. Thut is is thread
* safe.
*/
- private final Map<Class, ApplicationStateAdapter> _classToAdapter = newConcurrentMap();
+ private final Map<Class, ApplicationStateAdapter> classToAdapter = newConcurrentMap();
- private final ApplicationStatePersistenceStrategySource _source;
+ private final ApplicationStatePersistenceStrategySource source;
- private final ObjectLocator _locator;
+ private final ObjectLocator locator;
@SuppressWarnings("unchecked")
public ApplicationStateManagerImpl(Map<Class, ApplicationStateContribution> configuration,
ApplicationStatePersistenceStrategySource source, ObjectLocator locator)
{
- _source = source;
- _locator = locator;
+ this.source = source;
+ this.locator = locator;
for (Class asoClass : configuration.keySet())
{
@@ -80,7 +80,7 @@
ApplicationStateAdapter adapter = newAdapter(asoClass, contribution.getStrategy(),
contribution.getCreator());
- _classToAdapter.put(asoClass, adapter);
+ classToAdapter.put(asoClass, adapter);
}
}
@@ -95,12 +95,12 @@
{
public T create()
{
- return _locator.autobuild(asoClass);
+ return locator.autobuild(asoClass);
}
};
}
- ApplicationStatePersistenceStrategy strategy = _source.get(strategyName);
+ ApplicationStatePersistenceStrategy strategy = source.get(strategyName);
return new ApplicationStateAdapter(asoClass, strategy, creator);
}
@@ -108,14 +108,14 @@
@SuppressWarnings("unchecked")
private <T> ApplicationStateAdapter<T> getAdapter(Class<T> asoClass)
{
- ApplicationStateAdapter<T> result = _classToAdapter.get(asoClass);
+ ApplicationStateAdapter<T> result = classToAdapter.get(asoClass);
// Not found is completely OK, we'll define it on the fly.
if (result == null)
{
result = newAdapter(asoClass, DEFAULT_STRATEGY, null);
- _classToAdapter.put(asoClass, result);
+ classToAdapter.put(asoClass, result);
}
return result;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImpl.java Wed May 7 08:40:57 2008
@@ -22,22 +22,21 @@
public class ApplicationStatePersistenceStrategySourceImpl implements
ApplicationStatePersistenceStrategySource
{
- private final Map<String, ApplicationStatePersistenceStrategy> _configuration;
+ private final Map<String, ApplicationStatePersistenceStrategy> configuration;
- public ApplicationStatePersistenceStrategySourceImpl(
- Map<String, ApplicationStatePersistenceStrategy> configuration)
+ public ApplicationStatePersistenceStrategySourceImpl(Map<String, ApplicationStatePersistenceStrategy> configuration)
{
- _configuration = configuration;
+ this.configuration = configuration;
}
public ApplicationStatePersistenceStrategy get(String name)
{
- ApplicationStatePersistenceStrategy result = _configuration.get(name);
+ ApplicationStatePersistenceStrategy result = configuration.get(name);
if (result == null)
throw new RuntimeException(ServicesMessages.missingApplicationStatePersistenceStrategy(
name,
- _configuration.keySet()));
+ configuration.keySet()));
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetDispatcher.java Wed May 7 08:40:57 2008
@@ -35,20 +35,20 @@
*/
public class AssetDispatcher implements Dispatcher
{
- private final ResourceStreamer _streamer;
+ private final ResourceStreamer streamer;
- private final ClasspathAssetAliasManager _aliasManager;
+ private final ClasspathAssetAliasManager aliasManager;
- private final ResourceCache _resourceCache;
+ private final ResourceCache resourceCache;
static final String IF_MODIFIED_SINCE_HEADER = "If-Modified-Since";
public AssetDispatcher(ResourceStreamer streamer, ClasspathAssetAliasManager aliasManager,
ResourceCache resourceCache)
{
- _streamer = streamer;
- _aliasManager = aliasManager;
- _resourceCache = resourceCache;
+ this.streamer = streamer;
+ this.aliasManager = aliasManager;
+ this.resourceCache = resourceCache;
}
public boolean dispatch(Request request, Response response) throws IOException
@@ -62,7 +62,7 @@
// ClassLoaders like their paths to start with a leading slash.
- String resourcePath = _aliasManager.toResourcePath(path);
+ String resourcePath = aliasManager.toResourcePath(path);
Resource resource = findResourceAndValidateDigest(response, resourcePath);
@@ -90,7 +90,7 @@
if (ifModifiedSince > 0)
{
- long modified = _resourceCache.getTimeModified(resource);
+ long modified = resourceCache.getTimeModified(resource);
if (ifModifiedSince >= modified)
{
@@ -99,7 +99,7 @@
}
}
- _streamer.streamResource(resource);
+ streamer.streamResource(resource);
return true;
}
@@ -115,7 +115,7 @@
{
Resource resource = new ClasspathResource(resourcePath);
- if (!_resourceCache.requiresDigest(resource)) return resource;
+ if (!resourceCache.requiresDigest(resource)) return resource;
String file = resource.getFile();
@@ -142,7 +142,7 @@
result = resource.forFile(realFile);
- String actualDigest = _resourceCache.getDigest(result);
+ String actualDigest = resourceCache.getDigest(result);
valid = requestDigest.equals(actualDigest);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetInjectionProvider.java Wed May 7 08:40:57 2008
@@ -31,14 +31,14 @@
*/
public class AssetInjectionProvider implements InjectionProvider
{
- private final SymbolSource _symbolSource;
+ private final SymbolSource symbolSource;
- private final AssetSource _assetSource;
+ private final AssetSource assetSource;
public AssetInjectionProvider(SymbolSource symbolSource, AssetSource assetSource)
{
- _symbolSource = symbolSource;
- _assetSource = assetSource;
+ this.symbolSource = symbolSource;
+ this.assetSource = assetSource;
}
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
@@ -48,9 +48,9 @@
if (path == null) return false;
- String expanded = _symbolSource.expandSymbols(path.value());
+ String expanded = symbolSource.expandSymbols(path.value());
- String sourceFieldName = transformation.addInjectedField(AssetSource.class, "assetSource", _assetSource);
+ String sourceFieldName = transformation.addInjectedField(AssetSource.class, "assetSource", assetSource);
String baseResourceFieldName = transformation.addInjectedField(Resource.class, "baseResource",
componentModel.getBaseResource());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java Wed May 7 08:40:57 2008
@@ -31,11 +31,11 @@
*/
public class AssetObjectProvider implements ObjectProvider
{
- private final AssetSource _source;
+ private final AssetSource source;
- private final TypeCoercer _typeCoercer;
+ private final TypeCoercer typeCoercer;
- private final SymbolSource _symbolSource;
+ private final SymbolSource symbolSource;
public AssetObjectProvider(@Core AssetSource source,
@@ -43,9 +43,9 @@
@Builtin SymbolSource symbolSource)
{
- _source = source;
- _typeCoercer = typeCoercer;
- _symbolSource = symbolSource;
+ this.source = source;
+ this.typeCoercer = typeCoercer;
+ this.symbolSource = symbolSource;
}
/**
@@ -61,10 +61,10 @@
if (path == null) return null;
- String expanded = _symbolSource.expandSymbols(path.value());
+ String expanded = symbolSource.expandSymbols(path.value());
- Asset asset = _source.getAsset(null, expanded, null);
+ Asset asset = source.getAsset(null, expanded, null);
- return _typeCoercer.coerce(asset, objectType);
+ return typeCoercer.coerce(asset, objectType);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java Wed May 7 08:40:57 2008
@@ -16,9 +16,8 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.services.AssetFactory;
@@ -31,21 +30,21 @@
{
private static final String CLASSPATH = "classpath";
- private final StrategyRegistry<AssetFactory> _registry;
+ private final StrategyRegistry<AssetFactory> registry;
- private final ThreadLocale _threadLocale;
+ private final ThreadLocale threadLocale;
- private final Map<String, Resource> _prefixToRootResource = newMap();
+ private final Map<String, Resource> prefixToRootResource = CollectionFactory.newMap();
- private final Map<Resource, Asset> _cache = newConcurrentMap();
+ private final Map<Resource, Asset> cache = CollectionFactory.newConcurrentMap();
public AssetSourceImpl(ThreadLocale threadLocale,
Map<String, AssetFactory> configuration)
{
- _threadLocale = threadLocale;
+ this.threadLocale = threadLocale;
- Map<Class, AssetFactory> byResourceClass = newMap();
+ Map<Class, AssetFactory> byResourceClass = CollectionFactory.newMap();
for (Map.Entry<String, AssetFactory> e : configuration.entrySet())
{
@@ -56,10 +55,10 @@
byResourceClass.put(rootResource.getClass(), factory);
- _prefixToRootResource.put(prefix, rootResource);
+ prefixToRootResource.put(prefix, rootResource);
}
- _registry = StrategyRegistry.newInstance(AssetFactory.class, byResourceClass);
+ registry = StrategyRegistry.newInstance(AssetFactory.class, byResourceClass);
}
public Asset getClasspathAsset(String path)
@@ -74,11 +73,11 @@
public Asset getAsset(Resource baseResource, String path, Locale locale)
{
- notBlank(path, "path");
+ Defense.notBlank(path, "path");
- if (baseResource == null) baseResource = _prefixToRootResource.get(CLASSPATH);
+ if (baseResource == null) baseResource = prefixToRootResource.get(CLASSPATH);
- if (locale == null) locale = _threadLocale.getLocale();
+ if (locale == null) locale = threadLocale.getLocale();
int colonx = path.indexOf(':');
@@ -86,7 +85,7 @@
String prefix = path.substring(0, colonx);
- Resource rootResource = _prefixToRootResource.get(prefix);
+ Resource rootResource = prefixToRootResource.get(prefix);
if (rootResource == null)
throw new IllegalArgumentException(ServicesMessages.unknownAssetPrefix(path));
@@ -107,12 +106,12 @@
private Asset getAssetForResource(Resource resource)
{
- Asset result = _cache.get(resource);
+ Asset result = cache.get(resource);
if (result == null)
{
result = createAssetFromResource(resource);
- _cache.put(resource, result);
+ cache.put(resource, result);
}
return result;
@@ -126,7 +125,7 @@
Class resourceClass = resource.getClass();
- AssetFactory factory = _registry.get(resourceClass);
+ AssetFactory factory = registry.get(resourceClass);
return factory.createAsset(resource);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AttributeExpansionBinding.java Wed May 7 08:40:57 2008
@@ -23,18 +23,18 @@
*/
public class AttributeExpansionBinding extends AbstractBinding
{
- private final StringProvider _provider;
+ private final StringProvider provider;
public AttributeExpansionBinding(StringProvider provider, Location location)
{
super(location);
- _provider = provider;
+ this.provider = provider;
}
public Object get()
{
- return _provider.provideString();
+ return provider.provideString();
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BasePropertyConduit.java Wed May 7 08:40:57 2008
@@ -26,11 +26,11 @@
*/
public abstract class BasePropertyConduit implements PropertyConduit
{
- private final Class _propertyType;
+ private final Class propertyType;
- private final AnnotationProvider _annotationProvider;
+ private final AnnotationProvider annotationProvider;
- private final String _description;
+ private final String description;
public BasePropertyConduit(Class propertyType, AnnotationProvider annotationProvider, String description)
{
@@ -38,24 +38,24 @@
Defense.notNull(annotationProvider, "annotationProvider");
Defense.notBlank(description, "description");
- _propertyType = propertyType;
- _annotationProvider = annotationProvider;
- _description = description;
+ this.propertyType = propertyType;
+ this.annotationProvider = annotationProvider;
+ this.description = description;
}
@Override
public String toString()
{
- return _description;
+ return description;
}
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
- return _annotationProvider.getAnnotation(annotationClass);
+ return annotationProvider.getAnnotation(annotationClass);
}
public Class getPropertyType()
{
- return _propertyType;
+ return propertyType;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BaseURLSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BaseURLSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BaseURLSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BaseURLSourceImpl.java Wed May 7 08:40:57 2008
@@ -19,15 +19,15 @@
public class BaseURLSourceImpl implements BaseURLSource
{
- private final Request _request;
+ private final Request request;
public BaseURLSourceImpl(Request request)
{
- _request = request;
+ this.request = request;
}
public String getBaseURL(boolean secure)
{
- return String.format("%s://%s", secure ? "https" : "http", _request.getServerName());
+ return String.format("%s://%s", secure ? "https" : "http", request.getServerName());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockOverrideSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockOverrideSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockOverrideSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockOverrideSourceImpl.java Wed May 7 08:40:57 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Block;
import org.apache.tapestry.internal.structure.Page;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.BeanBlockContribution;
import org.apache.tapestry.services.BeanBlockOverrideSource;
@@ -25,20 +25,20 @@
public class BeanBlockOverrideSourceImpl implements BeanBlockOverrideSource
{
- private final RequestPageCache _pageCache;
+ private final RequestPageCache pageCache;
- private final Map<String, BeanBlockContribution> _display = newCaseInsensitiveMap();
+ private final Map<String, BeanBlockContribution> display = CollectionFactory.newCaseInsensitiveMap();
- private final Map<String, BeanBlockContribution> _edit = newCaseInsensitiveMap();
+ private final Map<String, BeanBlockContribution> edit = CollectionFactory.newCaseInsensitiveMap();
public BeanBlockOverrideSourceImpl(RequestPageCache pageCache,
Collection<BeanBlockContribution> configuration)
{
- _pageCache = pageCache;
+ this.pageCache = pageCache;
for (BeanBlockContribution contribution : configuration)
{
- Map<String, BeanBlockContribution> map = contribution.isEdit() ? _edit : _display;
+ Map<String, BeanBlockContribution> map = contribution.isEdit() ? edit : display;
map.put(contribution.getDataType(), contribution);
}
@@ -46,26 +46,26 @@
public boolean hasDisplayBlock(String datatype)
{
- return _display.containsKey(datatype);
+ return display.containsKey(datatype);
}
public Block getDisplayBlock(String datatype)
{
- return toBlock(_display.get(datatype));
+ return toBlock(display.get(datatype));
}
private Block toBlock(BeanBlockContribution contribution)
{
if (contribution == null) return null;
- Page page = _pageCache.get(contribution.getPageName());
+ Page page = pageCache.get(contribution.getPageName());
return page.getRootElement().getBlock(contribution.getBlockId());
}
public Block getEditBlock(String datatype)
{
- return toBlock(_edit.get(datatype));
+ return toBlock(edit.get(datatype));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanBlockSourceImpl.java Wed May 7 08:40:57 2008
@@ -23,31 +23,29 @@
public class BeanBlockSourceImpl implements BeanBlockSource
{
- // This is checked before _masterSource
-
- private final BeanBlockOverrideSource _overrideSource;
-
- private final BeanBlockOverrideSource _masterSource;
+ // This is checked before masterSource
+ private final BeanBlockOverrideSource overrideSource;
+ private final BeanBlockOverrideSource masterSource;
public BeanBlockSourceImpl(RequestPageCache pageCache,
BeanBlockOverrideSource overrideSource, Collection<BeanBlockContribution> configuration)
{
- _overrideSource = overrideSource;
- _masterSource = new BeanBlockOverrideSourceImpl(pageCache, configuration);
+ this.overrideSource = overrideSource;
+ masterSource = new BeanBlockOverrideSourceImpl(pageCache, configuration);
}
public boolean hasDisplayBlock(String datatype)
{
- return _overrideSource.hasDisplayBlock(datatype) || _masterSource.hasDisplayBlock(datatype);
+ return overrideSource.hasDisplayBlock(datatype) || masterSource.hasDisplayBlock(datatype);
}
public Block getDisplayBlock(String datatype)
{
- Block result = _overrideSource.getDisplayBlock(datatype);
+ Block result = overrideSource.getDisplayBlock(datatype);
if (result == null)
- result = _masterSource.getDisplayBlock(datatype);
+ result = masterSource.getDisplayBlock(datatype);
if (result == null)
throw new RuntimeException(ServicesMessages.noDisplayForDataType(datatype));
@@ -57,10 +55,10 @@
public Block getEditBlock(String datatype)
{
- Block result = _overrideSource.getEditBlock(datatype);
+ Block result = overrideSource.getEditBlock(datatype);
if (result == null)
- result = _masterSource.getEditBlock(datatype);
+ result = masterSource.getEditBlock(datatype);
if (result == null)
throw new RuntimeException(ServicesMessages.noEditForDataType(datatype));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java Wed May 7 08:40:57 2008
@@ -23,9 +23,8 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.annotations.Primary;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.*;
import org.apache.tapestry.services.BeanModelSource;
import org.apache.tapestry.services.ComponentLayer;
@@ -37,48 +36,48 @@
public class BeanModelSourceImpl implements BeanModelSource
{
- private final LoggerSource _loggerSource;
+ private final LoggerSource loggerSource;
- private final TypeCoercer _typeCoercer;
+ private final TypeCoercer typeCoercer;
- private final PropertyAccess _propertyAccess;
+ private final PropertyAccess propertyAccess;
- private final PropertyConduitSource _propertyConduitSource;
+ private final PropertyConduitSource propertyConduitSource;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final DataTypeAnalyzer _dataTypeAnalyzer;
+ private final DataTypeAnalyzer dataTypeAnalyzer;
- private final ObjectLocator _locator;
+ private final ObjectLocator locator;
public BeanModelSourceImpl(LoggerSource loggerSource, TypeCoercer typeCoercer, PropertyAccess propertyAccess,
PropertyConduitSource propertyConduitSource, @ComponentLayer ClassFactory classFactory,
@Primary DataTypeAnalyzer dataTypeAnalyzer, ObjectLocator locator)
{
- _loggerSource = loggerSource;
- _typeCoercer = typeCoercer;
- _propertyAccess = propertyAccess;
- _propertyConduitSource = propertyConduitSource;
- _classFactory = classFactory;
- _dataTypeAnalyzer = dataTypeAnalyzer;
- _locator = locator;
+ this.loggerSource = loggerSource;
+ this.typeCoercer = typeCoercer;
+ this.propertyAccess = propertyAccess;
+ this.propertyConduitSource = propertyConduitSource;
+ this.classFactory = classFactory;
+ this.dataTypeAnalyzer = dataTypeAnalyzer;
+ this.locator = locator;
}
public <T> BeanModel<T> create(Class<T> beanClass, boolean filterReadOnlyProperties, ComponentResources resources)
{
- notNull(beanClass, "beanClass");
- notNull(resources, "resources");
+ Defense.notNull(beanClass, "beanClass");
+ Defense.notNull(resources, "resources");
Messages messages = resources.getMessages();
- ClassPropertyAdapter adapter = _propertyAccess.getAdapter(beanClass);
+ ClassPropertyAdapter adapter = propertyAccess.getAdapter(beanClass);
- final BeanModel<T> model = new BeanModelImpl<T>(beanClass, _propertyConduitSource, _typeCoercer, messages,
- _locator);
+ final BeanModel<T> model = new BeanModelImpl<T>(beanClass, propertyConduitSource, typeCoercer, messages,
+ locator);
- List<String> propertyNames = newList();
+ List<String> propertyNames = CollectionFactory.newList();
- Map<String, Runnable> worksheet = newMap();
+ Map<String, Runnable> worksheet = CollectionFactory.newMap();
for (final String propertyName : adapter.getPropertyNames())
{
@@ -90,7 +89,7 @@
if (filterReadOnlyProperties && !pa.isUpdate()) continue;
- final String dataType = _dataTypeAnalyzer.identifyDataType(pa);
+ final String dataType = dataTypeAnalyzer.identifyDataType(pa);
// If an unregistered type, then ignore the property.
@@ -114,8 +113,8 @@
// Determine the correct order to add the properties.
- List<String> orderedNames = TapestryInternalUtils.orderProperties(_loggerSource
- .getLogger(beanClass), adapter, _classFactory, propertyNames);
+ List<String> orderedNames = TapestryInternalUtils.orderProperties(loggerSource
+ .getLogger(beanClass), adapter, classFactory, propertyNames);
for (String propertyName : orderedNames)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java Wed May 7 08:40:57 2008
@@ -17,8 +17,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ioc.Location;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.services.BindingFactory;
@@ -28,11 +27,11 @@
public class BindingSourceImpl implements BindingSource
{
- private final Map<String, BindingFactory> _factories;
+ private final Map<String, BindingFactory> factories;
public BindingSourceImpl(Map<String, BindingFactory> factories)
{
- _factories = factories;
+ this.factories = factories;
}
public Binding newBinding(String description, ComponentResources container,
@@ -44,10 +43,10 @@
public Binding newBinding(String description, ComponentResources container,
ComponentResources component, String defaultPrefix, String expression, Location location)
{
- notBlank(description, "description");
- notNull(container, "container");
- notNull(component, "component");
- notBlank(defaultPrefix, "defaultPrefix");
+ Defense.notBlank(description, "description");
+ Defense.notNull(container, "container");
+ Defense.notNull(component, "component");
+ Defense.notBlank(defaultPrefix, "defaultPrefix");
if (InternalUtils.isBlank(expression))
throw new TapestryException(ServicesMessages.emptyBinding(description), location, null);
@@ -63,13 +62,13 @@
{
String prefix = expression.substring(0, colonx);
- factory = _factories.get(prefix);
+ factory = factories.get(prefix);
if (factory != null)
subexpression = expression.substring(colonx + 1);
}
if (factory == null)
- factory = _factories.get(defaultPrefix);
+ factory = factories.get(defaultPrefix);
// And if that's null, what then? We assume that the default prefix is a valid prefix,
// or we'll get an NPE below and report it like any other error.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CheckForUpdatesFilter.java Wed May 7 08:40:57 2008
@@ -32,36 +32,36 @@
*/
public class CheckForUpdatesFilter implements RequestFilter
{
- private long _lastCheck = 0;
+ private final long checkInterval;
- private final long _checkInterval;
+ private final long updateTimeout;
- private final long _updateTimeout;
+ private final UpdateListenerHub updateListenerHub;
- private final UpdateListenerHub _updateListenerHub;
+ private final ConcurrentBarrier barrier = new ConcurrentBarrier();
- private final ConcurrentBarrier _barrier = new ConcurrentBarrier();
-
- private final Runnable _checker = new Runnable()
+ private final Runnable checker = new Runnable()
{
public void run()
{
// On a race condition, multiple threads may hit this method briefly. If we've
// already done a check, don't run it again.
- if (System.currentTimeMillis() - _lastCheck >= _checkInterval)
+ if (System.currentTimeMillis() - lastCheck >= checkInterval)
{
// Fire the update event which will force a number of checks and then
// corresponding invalidation events.
- _updateListenerHub.fireUpdateEvent();
+ updateListenerHub.fireUpdateEvent();
- _lastCheck = System.currentTimeMillis();
+ lastCheck = System.currentTimeMillis();
}
}
};
+ private long lastCheck = 0;
+
/**
* @param updateListenerHub invoked, at intervals, to spur the process of detecting changes
* @param checkInterval interval, in milliseconds, between checks
@@ -69,9 +69,9 @@
*/
public CheckForUpdatesFilter(UpdateListenerHub updateListenerHub, long checkInterval, long updateTimeout)
{
- _updateListenerHub = updateListenerHub;
- _checkInterval = checkInterval;
- _updateTimeout = updateTimeout;
+ this.updateListenerHub = updateListenerHub;
+ this.checkInterval = checkInterval;
+ this.updateTimeout = updateTimeout;
}
public boolean service(final Request request, final Response response, final RequestHandler handler)
@@ -83,8 +83,8 @@
{
public Boolean invoke()
{
- if (System.currentTimeMillis() - _lastCheck >= _checkInterval)
- _barrier.tryWithWrite(_checker, _updateTimeout, TimeUnit.MILLISECONDS);
+ if (System.currentTimeMillis() - lastCheck >= checkInterval)
+ barrier.tryWithWrite(checker, updateTimeout, TimeUnit.MILLISECONDS);
// And, now, back to code within the read lock.
@@ -103,7 +103,7 @@
// Obtain a read lock while handling the request. This will not impair parallel operations, except when a file check
// is needed (the exclusive write lock will block threads attempting to get a read lock).
- boolean result = _barrier.withRead(invokable);
+ boolean result = barrier.withRead(invokable);
if (exceptionHolder.hasValue()) throw exceptionHolder.get();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassResultProcessor.java Wed May 7 08:40:57 2008
@@ -26,28 +26,28 @@
*/
public class ClassResultProcessor implements ComponentEventResultProcessor<Class>
{
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
- private final RequestPageCache _requestPageCache;
+ private final RequestPageCache requestPageCache;
- private final ActionRenderResponseGenerator _generator;
+ private final ActionRenderResponseGenerator generator;
public ClassResultProcessor(ComponentClassResolver resolver, RequestPageCache requestPageCache,
ActionRenderResponseGenerator generator)
{
- _resolver = resolver;
- _requestPageCache = requestPageCache;
- _generator = generator;
+ this.resolver = resolver;
+ this.requestPageCache = requestPageCache;
+ this.generator = generator;
}
public void processResultValue(Class value) throws IOException
{
String className = value.getName();
- String pageName = _resolver.resolvePageClassNameToPageName(className);
+ String pageName = resolver.resolvePageClassNameToPageName(className);
- Page page = _requestPageCache.get(pageName);
+ Page page = requestPageCache.get(pageName);
- _generator.generateResponse(page);
+ generator.generateResponse(page);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java?rev=654153&r1=654152&r2=654153&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImpl.java Wed May 7 08:40:57 2008
@@ -15,8 +15,7 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.TapestryConstants;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
import org.apache.tapestry.services.Request;
@@ -27,23 +26,23 @@
public class ClasspathAssetAliasManagerImpl implements ClasspathAssetAliasManager
{
- private final Request _request;
+ private final Request request;
- private final RequestPathOptimizer _optimizer;
+ private final RequestPathOptimizer optimizer;
/**
* Map from alias to path.
*/
- private final Map<String, String> _aliasToPathPrefix = newMap();
+ private final Map<String, String> aliasToPathPrefix = CollectionFactory.newMap();
/**
* Map from path to alias.
*/
- private final Map<String, String> _pathPrefixToAlias = newMap();
+ private final Map<String, String> pathPrefixToAlias = CollectionFactory.newMap();
- private final List<String> _sortedAliases;
+ private final List<String> sortedAliases;
- private final List<String> _sortedPathPrefixes;
+ private final List<String> sortedPathPrefixes;
/**
* Configuration is a map of aliases (short names) to complete names. Keys and values should end with a slash, but
@@ -55,16 +54,16 @@
Map<String, String> configuration)
{
- _request = request;
- _optimizer = optimizer;
+ this.request = request;
+ this.optimizer = optimizer;
for (Map.Entry<String, String> e : configuration.entrySet())
{
String alias = withSlash(e.getKey());
String path = withSlash(e.getValue());
- _aliasToPathPrefix.put(alias, path);
- _pathPrefixToAlias.put(path, alias);
+ aliasToPathPrefix.put(alias, path);
+ pathPrefixToAlias.put(path, alias);
}
@@ -76,11 +75,11 @@
}
};
- _sortedAliases = newList(_aliasToPathPrefix.keySet());
- Collections.sort(_sortedAliases, sortDescendingByLength);
+ sortedAliases = CollectionFactory.newList(aliasToPathPrefix.keySet());
+ Collections.sort(sortedAliases, sortDescendingByLength);
- _sortedPathPrefixes = newList(_aliasToPathPrefix.values());
- Collections.sort(_sortedPathPrefixes, sortDescendingByLength);
+ sortedPathPrefixes = CollectionFactory.newList(aliasToPathPrefix.values());
+ Collections.sort(sortedPathPrefixes, sortDescendingByLength);
}
private String withSlash(String input)
@@ -94,19 +93,19 @@
{
String path = toCompleteClientURI(resourcePath);
- return _optimizer.optimizePath(path);
+ return optimizer.optimizePath(path);
}
private String toCompleteClientURI(String resourcePath)
{
- StringBuilder builder = new StringBuilder(_request.getContextPath());
+ StringBuilder builder = new StringBuilder(request.getContextPath());
builder.append(TapestryConstants.ASSET_PATH_PREFIX);
- for (String pathPrefix : _sortedPathPrefixes)
+ for (String pathPrefix : sortedPathPrefixes)
{
if (resourcePath.startsWith(pathPrefix))
{
- String alias = _pathPrefixToAlias.get(pathPrefix);
+ String alias = pathPrefixToAlias.get(pathPrefix);
builder.append(alias);
builder.append(resourcePath.substring(pathPrefix.length()));
@@ -125,11 +124,11 @@
{
String basePath = clientURL.substring(TapestryConstants.ASSET_PATH_PREFIX.length());
- for (String alias : _sortedAliases)
+ for (String alias : sortedAliases)
{
if (basePath.startsWith(alias))
{
- return _aliasToPathPrefix.get(alias) + basePath.substring(alias.length());
+ return aliasToPathPrefix.get(alias) + basePath.substring(alias.length());
}
}