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/08 04:23:23 UTC
svn commit: r654390 [2/5] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/internal/services/
tapestry-core/src/main/java/org/apache/tapestry/internal/structure/
tapestry-c...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java Wed May 7 19:23:21 2008
@@ -37,25 +37,25 @@
public class LinkFactoryImpl implements LinkFactory
{
- private final Request _request;
+ private final Request request;
- private final Response _response;
+ private final Response response;
- private final ComponentInvocationMap _componentInvocationMap;
+ private final ComponentInvocationMap componentInvocationMap;
- private final RequestPageCache _pageCache;
+ private final RequestPageCache pageCache;
- private final ContextValueEncoder _contextValueEncoder;
+ private final ContextValueEncoder contextValueEncoder;
- private final RequestPathOptimizer _optimizer;
+ private final RequestPathOptimizer optimizer;
- private final PageRenderQueue _pageRenderQueue;
+ private final PageRenderQueue pageRenderQueue;
- private final RequestSecurityManager _requestSecurityManager;
+ private final RequestSecurityManager requestSecurityManager;
- private final List<LinkFactoryListener> _listeners = newThreadSafeList();
+ private final List<LinkFactoryListener> listeners = newThreadSafeList();
- private final StrategyRegistry<PassivateContextHandler> _registry;
+ private final StrategyRegistry<PassivateContextHandler> registry;
private interface PassivateContextHandler<T>
@@ -72,14 +72,14 @@
ContextValueEncoder contextValueEncoder,
RequestSecurityManager requestSecurityManager)
{
- _request = request;
- _response = response;
- _componentInvocationMap = componentInvocationMap;
- _pageCache = pageCache;
- _optimizer = optimizer;
- _pageRenderQueue = pageRenderQueue;
- _contextValueEncoder = contextValueEncoder;
- _requestSecurityManager = requestSecurityManager;
+ this.request = request;
+ this.response = response;
+ this.componentInvocationMap = componentInvocationMap;
+ this.pageCache = pageCache;
+ this.optimizer = optimizer;
+ this.pageRenderQueue = pageRenderQueue;
+ this.contextValueEncoder = contextValueEncoder;
+ this.requestSecurityManager = requestSecurityManager;
Map<Class, PassivateContextHandler> registrations = newMap();
@@ -111,12 +111,12 @@
}
});
- _registry = StrategyRegistry.newInstance(PassivateContextHandler.class, registrations);
+ registry = StrategyRegistry.newInstance(PassivateContextHandler.class, registrations);
}
public void addListener(LinkFactoryListener listener)
{
- _listeners.add(listener);
+ listeners.add(listener);
}
public Link createActionLink(Page page, String nestedId, String eventType, boolean forForm, Object... context)
@@ -124,7 +124,7 @@
notNull(page, "page");
notBlank(eventType, "action");
- Page activePage = _pageRenderQueue.getRenderingPage();
+ Page activePage = pageRenderQueue.getRenderingPage();
// See TAPESTRY-2184
if (activePage == null) activePage = page;
@@ -137,9 +137,9 @@
ComponentInvocation invocation = new ComponentInvocationImpl(target, contextStrings, activationContext);
- String baseURL = _requestSecurityManager.getBaseURL(activePage);
+ String baseURL = requestSecurityManager.getBaseURL(activePage);
- Link link = new LinkImpl(_response, _optimizer, baseURL, _request.getContextPath(), invocation, forForm);
+ Link link = new LinkImpl(response, optimizer, baseURL, request.getContextPath(), invocation, forForm);
// TAPESTRY-2044: Sometimes the active page drags in components from another page and we
// need to differentiate that.
@@ -151,9 +151,9 @@
addActivationContextToLink(link, activationContext, forForm);
- _componentInvocationMap.store(link, invocation);
+ componentInvocationMap.store(link, invocation);
- for (LinkFactoryListener listener : _listeners)
+ for (LinkFactoryListener listener : listeners)
listener.createdActionLink(link);
return link;
@@ -205,13 +205,13 @@
ComponentInvocation invocation = new ComponentInvocationImpl(target, context, null);
- String baseURL = _requestSecurityManager.getBaseURL(page);
+ String baseURL = requestSecurityManager.getBaseURL(page);
- Link link = new LinkImpl(_response, _optimizer, baseURL, _request.getContextPath(), invocation, false);
+ Link link = new LinkImpl(response, optimizer, baseURL, request.getContextPath(), invocation, false);
- _componentInvocationMap.store(link, invocation);
+ componentInvocationMap.store(link, invocation);
- for (LinkFactoryListener listener : _listeners)
+ for (LinkFactoryListener listener : listeners)
listener.createdPageLink(link);
return link;
@@ -230,7 +230,7 @@
@SuppressWarnings("unchecked")
public boolean handleResult(Object result)
{
- PassivateContextHandler contextHandler = _registry.getByInstance(result);
+ PassivateContextHandler contextHandler = registry.getByInstance(result);
contextHandler.handle(result, context);
@@ -256,7 +256,7 @@
Object value = context[i];
- String encoded = value == null ? null : _contextValueEncoder.toClient(value);
+ String encoded = value == null ? null : contextValueEncoder.toClient(value);
if (InternalUtils.isBlank(encoded))
throw new RuntimeException(ServicesMessages.contextValueMayNotBeNull());
@@ -270,7 +270,7 @@
public Link createPageLink(String logicalPageName, boolean override, Object... context)
{
// This verifies that the page name is valid.
- Page page = _pageCache.get(logicalPageName);
+ Page page = pageCache.get(logicalPageName);
return createPageLink(page, override, context);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java Wed May 7 19:23:21 2008
@@ -21,25 +21,25 @@
import java.util.List;
/**
- * Default implementation of {@link Link}.
+ * Default implementation of {@link org.apache.tapestry.Link}.
*/
public class LinkImpl implements Link
{
private static final int BUFFER_SIZE = 100;
- private final String _baseURL;
+ private final String baseURL;
- private final String _contextPath;
+ private final String contextPath;
- private final Response _response;
+ private final Response response;
- private final RequestPathOptimizer _optimizer;
+ private final RequestPathOptimizer optimizer;
- private final ComponentInvocation _invocation;
+ private final ComponentInvocation invocation;
- private final boolean _forForm;
+ private final boolean forForm;
- private String _anchor;
+ private String anchor;
LinkImpl(Response response, RequestPathOptimizer optimizer, String contextPath, String targetPath)
{
@@ -66,75 +66,75 @@
public LinkImpl(Response response, RequestPathOptimizer optimizer, String baseURL, String contextPath,
ComponentInvocation invocation, boolean forForm)
{
- _response = response;
- _optimizer = optimizer;
- _baseURL = baseURL;
- _contextPath = contextPath;
- _invocation = invocation;
- _forForm = forForm;
+ this.response = response;
+ this.optimizer = optimizer;
+ this.baseURL = baseURL;
+ this.contextPath = contextPath;
+ this.invocation = invocation;
+ this.forForm = forForm;
}
public void addParameter(String parameterName, String value)
{
- _invocation.addParameter(parameterName, value);
+ invocation.addParameter(parameterName, value);
}
public List<String> getParameterNames()
{
- return _invocation.getParameterNames();
+ return invocation.getParameterNames();
}
public String getParameterValue(String name)
{
- return _invocation.getParameterValue(name);
+ return invocation.getParameterValue(name);
}
public String toURI()
{
- return _response.encodeURL(buildURI(false));
+ return response.encodeURL(buildURI(false));
}
public String toAbsoluteURI()
{
- return _response.encodeURL(buildURI(true));
+ return response.encodeURL(buildURI(true));
}
private String buildURI(boolean full)
{
- boolean absolute = full | _baseURL != null;
+ boolean absolute = full | baseURL != null;
StringBuilder builder = new StringBuilder(BUFFER_SIZE);
- if (_baseURL != null) builder.append(_baseURL);
+ if (baseURL != null) builder.append(baseURL);
- builder.append(_contextPath);
+ builder.append(contextPath);
builder.append("/");
- builder.append(_invocation.buildURI(_forForm));
+ builder.append(invocation.buildURI(forForm));
- if (InternalUtils.isNonBlank(_anchor))
+ if (InternalUtils.isNonBlank(anchor))
{
builder.append("#");
- builder.append(_anchor);
+ builder.append(anchor);
}
String fullURI = builder.toString();
- return absolute ? fullURI : _optimizer.optimizePath(fullURI);
+ return absolute ? fullURI : optimizer.optimizePath(fullURI);
}
public String toRedirectURI()
{
- return _response.encodeRedirectURL(buildURI(true));
+ return response.encodeRedirectURL(buildURI(true));
}
public String getAnchor()
{
- return _anchor;
+ return anchor;
}
public void setAnchor(String anchor)
{
- _anchor = anchor;
+ this.anchor = anchor;
}
@Override
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationFilter.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationFilter.java Wed May 7 19:23:21 2008
@@ -27,17 +27,17 @@
*/
public class LocalizationFilter implements RequestFilter
{
- private final LocalizationSetter _setter;
+ private final LocalizationSetter setter;
public LocalizationFilter(LocalizationSetter setter)
{
- _setter = setter;
+ this.setter = setter;
}
public boolean service(Request request, Response response, RequestHandler handler)
throws IOException
{
- _setter.setThreadLocale(request.getLocale());
+ setter.setThreadLocale(request.getLocale());
return handler.service(request, response);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java Wed May 7 19:23:21 2008
@@ -16,8 +16,7 @@
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.Symbol;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.services.PersistentLocale;
@@ -31,40 +30,40 @@
*/
public class LocalizationSetterImpl implements LocalizationSetter
{
- private final ThreadLocale _threadLocale;
+ private final ThreadLocale threadLocale;
- private final Locale _defaultLocale;
+ private final Locale defaultLocale;
- private final Set<String> _acceptedLocaleNames;
+ private final Set<String> acceptedLocaleNames;
- private final Map<String, Locale> _localeCache = newConcurrentMap();
+ private final Map<String, Locale> localeCache = CollectionFactory.newConcurrentMap();
- private final PersistentLocale _persistentLocale;
+ private final PersistentLocale persistentLocale;
public LocalizationSetterImpl(PersistentLocale persistentLocale, ThreadLocale threadLocale,
@Inject
@Symbol("tapestry.supported-locales")
String acceptedLocaleNames)
{
- _persistentLocale = persistentLocale;
+ this.persistentLocale = persistentLocale;
- _threadLocale = threadLocale;
+ this.threadLocale = threadLocale;
String[] names = acceptedLocaleNames.split(",");
- _defaultLocale = toLocale(names[0]);
+ defaultLocale = toLocale(names[0]);
- _acceptedLocaleNames = newSet(names);
+ this.acceptedLocaleNames = CollectionFactory.newSet(names);
}
Locale toLocale(String localeName)
{
- Locale result = _localeCache.get(localeName);
+ Locale result = localeCache.get(localeName);
if (result == null)
{
result = constructLocale(localeName);
- _localeCache.put(localeName, result);
+ localeCache.put(localeName, result);
}
return result;
@@ -94,11 +93,11 @@
public void setThreadLocale(Locale desiredLocale)
{
- if (_persistentLocale.get() != null) desiredLocale = _persistentLocale.get();
+ if (persistentLocale.get() != null) desiredLocale = persistentLocale.get();
Locale locale = findClosestAcceptedLocale(desiredLocale);
- _threadLocale.setLocale(locale);
+ threadLocale.setLocale(locale);
}
private Locale findClosestAcceptedLocale(Locale desiredLocale)
@@ -107,14 +106,14 @@
while (true)
{
- if (_acceptedLocaleNames.contains(localeName)) return toLocale(localeName);
+ if (acceptedLocaleNames.contains(localeName)) return toLocale(localeName);
localeName = stripTerm(localeName);
if (localeName.length() == 0) break;
}
- return _defaultLocale;
+ return defaultLocale;
}
static String stripTerm(String localeName)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MapMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MapMessages.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MapMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MapMessages.java Wed May 7 19:23:21 2008
@@ -30,7 +30,7 @@
*/
public class MapMessages extends AbstractMessages
{
- private final Map<String, String> _properties;
+ private final Map<String, String> properties;
/**
@@ -39,13 +39,14 @@
public MapMessages(Locale locale, Map<String, String> properties)
{
super(locale);
- _properties = properties;
+
+ this.properties = properties;
}
@Override
protected String valueForKey(String key)
{
- return _properties.get(key);
+ return properties.get(key);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterFactoryImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterFactoryImpl.java Wed May 7 19:23:21 2008
@@ -23,15 +23,15 @@
public class MarkupWriterFactoryImpl implements MarkupWriterFactory
{
- private final MarkupModel _htmlModel = new DefaultMarkupModel();
+ private final MarkupModel htmlModel = new DefaultMarkupModel();
- private final MarkupModel _xmlModel = new XMLMarkupModel();
+ private final MarkupModel xmlModel = new XMLMarkupModel();
public MarkupWriter newMarkupWriter(ContentType contentType)
{
boolean isHTML = contentType.getMimeType().equalsIgnoreCase("text/html");
- MarkupModel model = isHTML ? _htmlModel : _xmlModel;
+ MarkupModel model = isHTML ? htmlModel : xmlModel;
// The charset parameter sets the encoding attribute of the XML declaration, if
// not null and if using the XML model.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterImpl.java Wed May 7 19:23:21 2008
@@ -26,11 +26,11 @@
public class MarkupWriterImpl implements MarkupWriter
{
- private final Document _document;
+ private final Document document;
- private Element _current;
+ private Element current;
- private Text _currentText;
+ private Text currentText;
private final List<MarkupWriterListener> _listeners = CollectionFactory.newList();
@@ -46,55 +46,55 @@
public MarkupWriterImpl(MarkupModel model, String encoding)
{
- _document = new Document(model, encoding);
+ document = new Document(model, encoding);
}
public void toMarkup(PrintWriter writer)
{
- _document.toMarkup(writer);
+ document.toMarkup(writer);
}
@Override
public String toString()
{
- return _document.toString();
+ return document.toString();
}
public Document getDocument()
{
- return _document;
+ return document;
}
public Element getElement()
{
- return _current;
+ return current;
}
public void cdata(String content)
{
ensureCurrentElement();
- _current.cdata(content);
+ current.cdata(content);
- _currentText = null;
+ currentText = null;
}
public void write(String text)
{
// Whitespace before and after the root element is quietly ignored.
- if (_current == null && InternalUtils.isBlank(text)) return;
+ if (current == null && InternalUtils.isBlank(text)) return;
ensureCurrentElement();
if (text == null) return;
- if (_currentText == null)
+ if (currentText == null)
{
- _currentText = _current.text(text);
+ currentText = current.text(text);
return;
}
- _currentText.write(text);
+ currentText.write(text);
}
public void writef(String format, Object... args)
@@ -102,7 +102,7 @@
// A bit of a cheat:
write("");
- _currentText.writef(format, args);
+ currentText.writef(format, args);
}
public void attributes(Object... namesAndValues)
@@ -120,37 +120,37 @@
if (value == null) continue;
- _current.attribute(name, value.toString());
+ current.attribute(name, value.toString());
}
}
private void ensureCurrentElement()
{
- if (_current == null) throw new IllegalStateException(ServicesMessages.markupWriterNoCurrentElement());
+ if (current == null) throw new IllegalStateException(ServicesMessages.markupWriterNoCurrentElement());
}
public Element element(String name, Object... namesAndValues)
{
- if (_current == null) _current = _document.newRootElement(name);
- else _current = _current.element(name);
+ if (current == null) current = document.newRootElement(name);
+ else current = current.element(name);
attributes(namesAndValues);
- _currentText = null;
+ currentText = null;
fireElementDidStart();
- return _current;
+ return current;
}
public void writeRaw(String text)
{
ensureCurrentElement();
- _currentText = null;
+ currentText = null;
- _current.raw(text);
+ current.raw(text);
}
public Element end()
@@ -159,51 +159,51 @@
fireElementDidEnd();
- _current = _current.getParent();
+ current = current.getParent();
- _currentText = null;
+ currentText = null;
- return _current;
+ return current;
}
public void comment(String text)
{
ensureCurrentElement();
- _current.comment(text);
+ current.comment(text);
- _currentText = null;
+ currentText = null;
}
public Element attributeNS(String namespace, String attributeName, String attributeValue)
{
ensureCurrentElement();
- _current.attribute(namespace, attributeName, attributeValue);
+ current.attribute(namespace, attributeName, attributeValue);
- return _current;
+ return current;
}
public Element defineNamespace(String namespace, String namespacePrefix)
{
ensureCurrentElement();
- _current.defineNamespace(namespace, namespacePrefix);
+ current.defineNamespace(namespace, namespacePrefix);
- return _current;
+ return current;
}
public Element elementNS(String namespace, String elementName)
{
- if (_current == null) _current = _document.newRootElement(namespace, elementName);
- else _current = _current.elementNS(namespace, elementName);
+ if (current == null) current = document.newRootElement(namespace, elementName);
+ else current = current.elementNS(namespace, elementName);
- _currentText = null;
+ currentText = null;
fireElementDidStart();
- return _current;
+ return current;
}
public void addListener(MarkupWriterListener listener)
@@ -222,7 +222,7 @@
{
for (MarkupWriterListener l : _listeners)
{
- l.elementDidStart(_current);
+ l.elementDidStart(current);
}
}
@@ -230,7 +230,7 @@
{
for (MarkupWriterListener l : _listeners)
{
- l.elementDidEnd(_current);
+ l.elementDidEnd(current);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java Wed May 7 19:23:21 2008
@@ -19,7 +19,7 @@
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
@@ -34,40 +34,40 @@
*/
public class MessagesSourceImpl extends InvalidationEventHubImpl implements MessagesSource
{
- private final URLChangeTracker _tracker;
+ private final URLChangeTracker tracker;
/**
* Keyed on bundle id and locale.
*/
- private final Map<MultiKey, Messages> _messagesByBundleIdAndLocale = newConcurrentMap();
+ private final Map<MultiKey, Messages> messagesByBundleIdAndLocale = CollectionFactory.newConcurrentMap();
/**
* Keyed on bundle id and locale, the coooked properties include properties inherited from less locale-specific
* properties files, or inherited from parent bundles.
*/
- private final Map<MultiKey, Map<String, String>> _cookedProperties = newConcurrentMap();
+ private final Map<MultiKey, Map<String, String>> cookedProperties = CollectionFactory.newConcurrentMap();
/**
* Raw properties represent just the properties read from a specific properties file, in isolation.
*/
- private final Map<Resource, Map<String, String>> _rawProperties = newConcurrentMap();
+ private final Map<Resource, Map<String, String>> rawProperties = CollectionFactory.newConcurrentMap();
- private final Map<String, String> _emptyMap = Collections.emptyMap();
+ private final Map<String, String> emptyMap = Collections.emptyMap();
public MessagesSourceImpl(URLChangeTracker tracker)
{
- _tracker = tracker;
+ this.tracker = tracker;
}
public void checkForUpdates()
{
- if (_tracker.containsChanges())
+ if (tracker.containsChanges())
{
- _messagesByBundleIdAndLocale.clear();
- _cookedProperties.clear();
- _rawProperties.clear();
+ messagesByBundleIdAndLocale.clear();
+ cookedProperties.clear();
+ rawProperties.clear();
- _tracker.clear();
+ tracker.clear();
fireInvalidationEvent();
}
@@ -77,12 +77,12 @@
{
MultiKey key = new MultiKey(bundle.getId(), locale);
- Messages result = _messagesByBundleIdAndLocale.get(key);
+ Messages result = messagesByBundleIdAndLocale.get(key);
if (result == null)
{
result = buildMessages(bundle, locale);
- _messagesByBundleIdAndLocale.put(key, result);
+ messagesByBundleIdAndLocale.put(key, result);
}
return result;
@@ -102,11 +102,11 @@
*/
private Map<String, String> findBundleProperties(MessagesBundle bundle, Locale locale)
{
- if (bundle == null) return _emptyMap;
+ if (bundle == null) return emptyMap;
MultiKey key = new MultiKey(bundle.getId(), locale);
- Map<String, String> existing = _cookedProperties.get(key);
+ Map<String, String> existing = cookedProperties.get(key);
if (existing != null) return existing;
@@ -116,7 +116,7 @@
Resource propertiesResource = bundle.getBaseResource().withExtension("properties");
- List<Resource> localizations = newList();
+ List<Resource> localizations = CollectionFactory.newList();
for (String localizedFile : new LocalizedNameGenerator(propertiesResource.getFile(), locale))
{
@@ -138,13 +138,13 @@
{
Map<String, String> rawProperties = getRawProperties(localization);
- // Woould be nice to write into the _cookedProperties cache here,
+ // Woould be nice to write into the cookedProperties cache here,
// but we can't because we don't know the locale part of the MultiKey.
previous = extend(previous, rawProperties);
}
- _cookedProperties.put(key, previous);
+ cookedProperties.put(key, previous);
return previous;
}
@@ -159,7 +159,7 @@
// Make a copy of the base Map
- Map<String, String> result = newCaseInsensitiveMap(base);
+ Map<String, String> result = CollectionFactory.newCaseInsensitiveMap(base);
// Add or overwrite properties to the copy
@@ -170,13 +170,13 @@
private Map<String, String> getRawProperties(Resource localization)
{
- Map<String, String> result = _rawProperties.get(localization);
+ Map<String, String> result = rawProperties.get(localization);
if (result == null)
{
result = readProperties(localization);
- _rawProperties.put(localization, result);
+ rawProperties.put(localization, result);
}
return result;
@@ -187,11 +187,11 @@
*/
private Map<String, String> readProperties(Resource resource)
{
- if (!resource.exists()) return _emptyMap;
+ if (!resource.exists()) return emptyMap;
- _tracker.add(resource.toURL());
+ tracker.add(resource.toURL());
- Map<String, String> result = newCaseInsensitiveMap();
+ Map<String, String> result = CollectionFactory.newCaseInsensitiveMap();
Properties p = new Properties();
InputStream is = null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java Wed May 7 19:23:21 2008
@@ -17,8 +17,6 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.services.MetaDataLocator;
@@ -27,25 +25,25 @@
public class MetaDataLocatorImpl implements MetaDataLocator, InvalidationListener
{
- private final SymbolSource _symbolSource;
+ private final SymbolSource symbolSource;
- private final TypeCoercer _typeCoercer;
+ private final TypeCoercer typeCoercer;
- private final Map<String, Map<String, String>> _defaultsByFolder = newCaseInsensitiveMap();
+ private final Map<String, Map<String, String>> defaultsByFolder = CollectionFactory.newCaseInsensitiveMap();
- private final Map<String, String> _cache = newConcurrentMap();
+ private final Map<String, String> cache = CollectionFactory.newConcurrentMap();
public MetaDataLocatorImpl(SymbolSource symbolSource, TypeCoercer typeCoercer, Map<String, String> configuration)
{
- _symbolSource = symbolSource;
- _typeCoercer = typeCoercer;
+ this.symbolSource = symbolSource;
+ this.typeCoercer = typeCoercer;
loadDefaults(configuration);
}
public void objectWasInvalidated()
{
- _cache.clear();
+ cache.clear();
}
private void loadDefaults(Map<String, String> configuration)
@@ -58,12 +56,12 @@
String folderKey = colonx < 0 ? "" : key.substring(0, colonx);
- Map<String, String> forFolder = _defaultsByFolder.get(folderKey);
+ Map<String, String> forFolder = defaultsByFolder.get(folderKey);
if (forFolder == null)
{
forFolder = CollectionFactory.newCaseInsensitiveMap();
- _defaultsByFolder.put(folderKey, forFolder);
+ defaultsByFolder.put(folderKey, forFolder);
}
String defaultKey = colonx < 0 ? key : key.substring(colonx + 1);
@@ -76,28 +74,28 @@
{
String value = getSymbolExpandedValueFromCache(key, resources);
- return _typeCoercer.coerce(value, expectedType);
+ return typeCoercer.coerce(value, expectedType);
}
private String getSymbolExpandedValueFromCache(String key, ComponentResources resources)
{
String cacheKey = resources.getCompleteId() + "/" + key;
- if (_cache.containsKey(cacheKey)) return _cache.get(cacheKey);
+ if (cache.containsKey(cacheKey)) return cache.get(cacheKey);
String value = locate(key, resources);
if (value == null)
{
- value = _symbolSource.valueForSymbol(key);
+ value = symbolSource.valueForSymbol(key);
}
else
{
- value = _symbolSource.expandSymbols(value);
+ value = symbolSource.expandSymbols(value);
}
- _cache.put(cacheKey, value);
+ cache.put(cacheKey, value);
return value;
}
@@ -135,7 +133,7 @@
String folderKey = lastSlashx < 0 ? "" : path.substring(0, lastSlashx);
- Map<String, String> forFolder = _defaultsByFolder.get(folderKey);
+ Map<String, String> forFolder = defaultsByFolder.get(folderKey);
if (forFolder != null && forFolder.containsKey(key)) return forFolder.get(key);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodCompileException.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodCompileException.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodCompileException.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodCompileException.java Wed May 7 19:23:21 2008
@@ -22,17 +22,17 @@
{
private static final long serialVersionUID = -2803586049370974986L;
- private final String _methodBody;
+ private final String methodBody;
public MethodCompileException(String message, String methodBody, Throwable cause)
{
super(message, cause);
- _methodBody = methodBody;
+ this.methodBody = methodBody;
}
public String getMethodBody()
{
- return _methodBody;
+ return methodBody;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodInvocationInfo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodInvocationInfo.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodInvocationInfo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodInvocationInfo.java Wed May 7 19:23:21 2008
@@ -27,81 +27,81 @@
*/
public class MethodInvocationInfo
{
- private final TransformMethodSignature _methodSignature;
+ private final TransformMethodSignature methodSignature;
- private final ComponentClassCache _componentClassCache;
+ private final ComponentClassCache componentClassCache;
- private final List<ComponentMethodAdvice> _advice = CollectionFactory.newList();
+ private final List<ComponentMethodAdvice> advice = CollectionFactory.newList();
- private Class _effectiveResultType;
+ private Class effectiveResultType;
public MethodInvocationInfo(TransformMethodSignature methodSignature, ComponentClassCache componentClassCache)
{
- _methodSignature = methodSignature;
- _componentClassCache = componentClassCache;
+ this.methodSignature = methodSignature;
+ this.componentClassCache = componentClassCache;
}
public String getMethodName()
{
- return _methodSignature.getMethodName();
+ return methodSignature.getMethodName();
}
public Class getResultType()
{
- return _componentClassCache.forName(_methodSignature.getReturnType());
+ return componentClassCache.forName(methodSignature.getReturnType());
}
public synchronized Class getEffectiveResultType()
{
- if (_effectiveResultType == null)
+ if (effectiveResultType == null)
{
Class resultType = getResultType();
- _effectiveResultType = resultType.isPrimitive() ? ClassFabUtils.getWrapperType(resultType) : resultType;
+ effectiveResultType = resultType.isPrimitive() ? ClassFabUtils.getWrapperType(resultType) : resultType;
}
- return _effectiveResultType;
+ return effectiveResultType;
}
public int getParameterCount()
{
- return _methodSignature.getParameterTypes().length;
+ return methodSignature.getParameterTypes().length;
}
public Class getParameterType(int index)
{
- return _componentClassCache.forName(_methodSignature.getParameterTypes()[index]);
+ return componentClassCache.forName(methodSignature.getParameterTypes()[index]);
}
public int getAdviceCount()
{
- return _advice.size();
+ return advice.size();
}
public ComponentMethodAdvice getAdvice(int index)
{
- return _advice.get(index);
+ return advice.get(index);
}
public void addAdvice(ComponentMethodAdvice advice)
{
// Ultimately, the mutable portion of this object's lifecycle all occurs inside a synchronized block defined by
- // the class loader. After that the _advice list is only accessed for reads. I don't think there
+ // the class loader. After that the advice list is only accessed for reads. I don't think there
// are any concurrency issues with this approach.
- _advice.add(advice);
+ this.advice.add(advice);
}
public Class[] getExceptionTypes()
{
- String[] exceptionTypes = _methodSignature.getExceptionTypes();
+ String[] exceptionTypes = methodSignature.getExceptionTypes();
int count = exceptionTypes.length;
Class[] result = new Class[count];
for (int i = 0; i < count; i++)
{
- result[i] = _componentClassCache.forName(exceptionTypes[i]);
+ result[i] = componentClassCache.forName(exceptionTypes[i]);
}
return result;
@@ -109,6 +109,6 @@
public Class getExceptionType(int index)
{
- return _componentClassCache.forName(_methodSignature.getExceptionTypes()[index]);
+ return componentClassCache.forName(methodSignature.getExceptionTypes()[index]);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/NullFieldStrategySourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/NullFieldStrategySourceImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/NullFieldStrategySourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/NullFieldStrategySourceImpl.java Wed May 7 19:23:21 2008
@@ -21,20 +21,20 @@
public class NullFieldStrategySourceImpl implements NullFieldStrategySource
{
- private final Map<String, NullFieldStrategy> _configuration;
+ private final Map<String, NullFieldStrategy> configuration;
public NullFieldStrategySourceImpl(Map<String, NullFieldStrategy> configuration)
{
- _configuration = configuration;
+ this.configuration = configuration;
}
public NullFieldStrategy get(String name)
{
- NullFieldStrategy result = _configuration.get(name);
+ NullFieldStrategy result = configuration.get(name);
if (result != null) return result;
throw new IllegalArgumentException(
- ServicesMessages.unknownNullFieldStrategyName(name, _configuration.keySet()));
+ ServicesMessages.unknownNullFieldStrategyName(name, configuration.keySet()));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessor.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessor.java Wed May 7 19:23:21 2008
@@ -24,17 +24,17 @@
*/
public class ObjectComponentEventResultProcessor implements ComponentEventResultProcessor<Object>
{
- private final Collection<Class> _configuredClasses;
+ private final Collection<Class> configuredClasses;
public ObjectComponentEventResultProcessor(Collection<Class> configuredClasses)
{
- _configuredClasses = configuredClasses;
+ this.configuredClasses = configuredClasses;
}
public void processResultValue(Object value) throws IOException
{
String message = ServicesMessages.invalidComponentEventResult(value,
- _configuredClasses);
+ configuredClasses);
throw new RuntimeException(message);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java Wed May 7 19:23:21 2008
@@ -19,16 +19,16 @@
*/
public class OpaqueConstantTarget implements InvocationTarget
{
- private final String _path;
+ private final String path;
public OpaqueConstantTarget(String path)
{
- this._path = path;
+ this.path = path;
}
public String getPath()
{
- return _path;
+ return path;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java Wed May 7 19:23:21 2008
@@ -23,19 +23,19 @@
public class PageContentTypeAnalyzerImpl implements PageContentTypeAnalyzer
{
- private final MetaDataLocator _metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
public PageContentTypeAnalyzerImpl(MetaDataLocator metaDataLocator)
{
- _metaDataLocator = metaDataLocator;
+ this.metaDataLocator = metaDataLocator;
}
public ContentType findContentType(Page page)
{
ComponentResources pageResources = page.getRootComponent().getComponentResources();
- String contentTypeString = _metaDataLocator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
- String.class);
+ String contentTypeString = metaDataLocator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
+ String.class);
ContentType contentType = new ContentType(contentTypeString);
// Make sure thre's always a charset specified.
@@ -44,7 +44,7 @@
if (encoding == null)
{
- encoding = _metaDataLocator
+ encoding = metaDataLocator
.findMeta(TapestryConstants.RESPONSE_ENCODING, pageResources, String.class);
contentType.setParameter(InternalConstants.CHARSET_CONTENT_TYPE_PARAMETER, encoding);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java Wed May 7 19:23:21 2008
@@ -36,15 +36,15 @@
public class PageElementFactoryImpl implements PageElementFactory
{
- private final ComponentInstantiatorSource _componentInstantiatorSource;
+ private final ComponentInstantiatorSource componentInstantiatorSource;
- private final ComponentClassResolver _componentClassResolver;
+ private final ComponentClassResolver componentClassResolver;
- private final TypeCoercer _typeCoercer;
+ private final TypeCoercer typeCoercer;
- private final BindingSource _bindingSource;
+ private final BindingSource bindingSource;
- private final PageResourcesSource _pageResourcesSource;
+ private final PageResourcesSource pageResourcesSource;
private static final String EXPANSION_START = "${";
@@ -67,11 +67,11 @@
ComponentClassResolver resolver, TypeCoercer typeCoercer, BindingSource bindingSource,
PageResourcesSource pageResourcesSource)
{
- _componentInstantiatorSource = componentInstantiatorSource;
- _componentClassResolver = resolver;
- _typeCoercer = typeCoercer;
- _bindingSource = bindingSource;
- _pageResourcesSource = pageResourcesSource;
+ this.componentInstantiatorSource = componentInstantiatorSource;
+ componentClassResolver = resolver;
+ this.typeCoercer = typeCoercer;
+ this.bindingSource = bindingSource;
+ this.pageResourcesSource = pageResourcesSource;
}
public PageElement newAttributeElement(ComponentResources componentResources, AttributeToken token)
@@ -124,8 +124,8 @@
String expansion = expression.substring(expansionx + 2, endx);
- final Binding binding = _bindingSource.newBinding("attribute expansion", resources, resources,
- PROP_BINDING_PREFIX, expansion, location);
+ final Binding binding = bindingSource.newBinding("attribute expansion", resources, resources,
+ PROP_BINDING_PREFIX, expansion, location);
final StringProvider provider = new StringProvider()
{
@@ -135,7 +135,7 @@
{
Object raw = binding.get();
- return _typeCoercer.coerce(raw, String.class);
+ return typeCoercer.coerce(raw, String.class);
}
catch (Exception ex)
{
@@ -173,10 +173,10 @@
public PageElement newExpansionElement(ComponentResources componentResources, ExpansionToken token)
{
- Binding binding = _bindingSource.newBinding("expansion", componentResources, componentResources,
- PROP_BINDING_PREFIX, token.getExpression(), token.getLocation());
+ Binding binding = bindingSource.newBinding("expansion", componentResources, componentResources,
+ PROP_BINDING_PREFIX, token.getExpression(), token.getLocation());
- return new ExpansionPageElement(binding, _typeCoercer);
+ return new ExpansionPageElement(binding, typeCoercer);
}
public ComponentPageElement newComponentElement(Page page, ComponentPageElement container, String id,
@@ -199,7 +199,7 @@
try
{
- finalClassName = _componentClassResolver
+ finalClassName = componentClassResolver
.resolveComponentTypeToClassName(componentType);
}
catch (IllegalArgumentException ex)
@@ -208,7 +208,7 @@
}
}
- Instantiator instantiator = _componentInstantiatorSource
+ Instantiator instantiator = componentInstantiatorSource
.findInstantiator(finalClassName);
// This is actually a good place to check for recursive templates, here where we've
@@ -254,9 +254,9 @@
public ComponentPageElement newRootComponentElement(Page page, String componentType, Locale locale)
{
- Instantiator instantiator = _componentInstantiatorSource.findInstantiator(componentType);
+ Instantiator instantiator = componentInstantiatorSource.findInstantiator(componentType);
- PageResources pageResources = _pageResourcesSource.get(locale);
+ PageResources pageResources = pageResourcesSource.get(locale);
ComponentPageElement result = new ComponentPageElementImpl(page, instantiator, pageResources);
@@ -276,14 +276,14 @@
public void addMixinByTypeName(ComponentPageElement component, String mixinType)
{
- String mixinClassName = _componentClassResolver.resolveMixinTypeToClassName(mixinType);
+ String mixinClassName = componentClassResolver.resolveMixinTypeToClassName(mixinType);
addMixinByClassName(component, mixinClassName);
}
public void addMixinByClassName(ComponentPageElement component, String mixinClassName)
{
- Instantiator mixinInstantiator = _componentInstantiatorSource.findInstantiator(mixinClassName);
+ Instantiator mixinInstantiator = componentInstantiatorSource.findInstantiator(mixinClassName);
component.addMixin(mixinInstantiator);
}
@@ -301,7 +301,7 @@
return new AttributeExpansionBinding(provider, location);
}
- return _bindingSource.newBinding(parameterName, loadingComponentResources,
- embeddedComponentResources, defaultBindingPrefix, expression, location);
+ return bindingSource.newBinding(parameterName, loadingComponentResources,
+ embeddedComponentResources, defaultBindingPrefix, expression, location);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLinkTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLinkTarget.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLinkTarget.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLinkTarget.java Wed May 7 19:23:21 2008
@@ -22,22 +22,22 @@
*/
public class PageLinkTarget implements InvocationTarget
{
- private final String _pageName;
+ private final String pageName;
public PageLinkTarget(String pageName)
{
- _pageName = pageName;
+ this.pageName = pageName;
}
public String getPath()
{
- return _pageName.toLowerCase();
+ return pageName.toLowerCase();
}
public String getPageName()
{
- return _pageName;
+ return pageName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java Wed May 7 19:23:21 2008
@@ -24,25 +24,25 @@
public class PageLoaderImpl extends InvalidationEventHubImpl implements PageLoader,
InvalidationListener
{
- private final ComponentTemplateSource _templateSource;
+ private final ComponentTemplateSource templateSource;
- private final PageElementFactory _pageElementFactory;
+ private final PageElementFactory pageElementFactory;
- private final LinkFactory _linkFactory;
+ private final LinkFactory linkFactory;
- private final PersistentFieldManager _persistentFieldManager;
+ private final PersistentFieldManager persistentFieldManager;
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
public PageLoaderImpl(ComponentTemplateSource templateSource,
PageElementFactory pageElementFactory, LinkFactory linkFactory,
PersistentFieldManager persistentFieldManager, ComponentClassResolver resolver)
{
- _templateSource = templateSource;
- _pageElementFactory = pageElementFactory;
- _linkFactory = linkFactory;
- _persistentFieldManager = persistentFieldManager;
- _resolver = resolver;
+ this.templateSource = templateSource;
+ this.pageElementFactory = pageElementFactory;
+ this.linkFactory = linkFactory;
+ this.persistentFieldManager = persistentFieldManager;
+ this.resolver = resolver;
}
public Page loadPage(String logicalPageName, Locale locale)
@@ -50,11 +50,11 @@
// For the moment, the processors are used once and discarded. Perhaps it is worth the
// effort to pool them for reuse, but not too likely.
- PageLoaderProcessor processor = new PageLoaderProcessor(_templateSource,
- _pageElementFactory, _linkFactory,
- _persistentFieldManager);
+ PageLoaderProcessor processor = new PageLoaderProcessor(templateSource,
+ pageElementFactory, linkFactory,
+ persistentFieldManager);
- String pageClassName = _resolver.resolvePageNameToClassName(logicalPageName);
+ String pageClassName = resolver.resolvePageNameToClassName(logicalPageName);
return processor.loadPage(logicalPageName, pageClassName, locale);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java Wed May 7 19:23:21 2008
@@ -23,7 +23,8 @@
import org.apache.tapestry.internal.structure.*;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import static org.apache.tapestry.ioc.internal.util.InternalUtils.isBlank;
import static org.apache.tapestry.ioc.internal.util.InternalUtils.isNonBlank;
@@ -64,48 +65,48 @@
private static final Pattern COMMA_PATTERN = Pattern.compile(",");
- private Stack<ComponentPageElement> _activeElementStack = newStack();
+ private Stack<ComponentPageElement> activeElementStack = CollectionFactory.newStack();
- private boolean _addAttributesAsComponentBindings = false;
+ private boolean addAttributesAsComponentBindings = false;
- private boolean _dtdAdded;
+ private boolean dtdAdded;
- private final Stack<BodyPageElement> _bodyPageElementStack = newStack();
+ private final Stack<BodyPageElement> bodyPageElementStack = CollectionFactory.newStack();
// You can use a stack as a queue
- private final Stack<ComponentPageElement> _componentQueue = newStack();
+ private final Stack<ComponentPageElement> componentQueue = CollectionFactory.newStack();
- private final Stack<Boolean> _discardEndTagStack = newStack();
+ private final Stack<Boolean> discardEndTagStack = CollectionFactory.newStack();
- private final Stack<Runnable> _endElementCommandStack = newStack();
+ private final Stack<Runnable> endElementCommandStack = CollectionFactory.newStack();
/**
* Used as a queue of Runnable objects used to handle final setup.
*/
- private final List<Runnable> _finalization = CollectionFactory.newList();
+ private final List<Runnable> finalization = CollectionFactory.newList();
- private final IdAllocator _idAllocator = new IdAllocator();
+ private final IdAllocator idAllocator = new IdAllocator();
- private final LinkFactory _linkFactory;
+ private final LinkFactory linkFactory;
- private ComponentModel _loadingComponentModel;
+ private ComponentModel loadingComponentModel;
- private ComponentPageElement _loadingElement;
+ private ComponentPageElement loadingElement;
- private final Map<String, Map<String, Binding>> _componentIdToBindingMap = newMap();
+ private final Map<String, Map<String, Binding>> componentIdToBindingMap = CollectionFactory.newMap();
- private Locale _locale;
+ private Locale locale;
- private final OneShotLock _lock = new OneShotLock();
+ private final OneShotLock lock = new OneShotLock();
- private Page _page;
+ private Page page;
- private final PageElementFactory _pageElementFactory;
+ private final PageElementFactory pageElementFactory;
- private final PersistentFieldManager _persistentFieldManager;
+ private final PersistentFieldManager persistentFieldManager;
- private final ComponentTemplateSource _templateSource;
+ private final ComponentTemplateSource templateSource;
private static final PageElement END_ELEMENT = new PageElement()
{
@@ -123,32 +124,32 @@
private static class RenderBodyElement implements PageElement
{
- private final ComponentPageElement _component;
+ private final ComponentPageElement component;
public RenderBodyElement(ComponentPageElement component)
{
- _component = component;
+ this.component = component;
}
public void render(MarkupWriter writer, RenderQueue queue)
{
- _component.enqueueBeforeRenderBody(queue);
+ component.enqueueBeforeRenderBody(queue);
}
@Override
public String toString()
{
- return String.format("RenderBody[%s]", _component.getNestedId());
+ return String.format("RenderBody[%s]", component.getNestedId());
}
}
PageLoaderProcessor(ComponentTemplateSource templateSource, PageElementFactory pageElementFactory,
LinkFactory linkFactory, PersistentFieldManager persistentFieldManager)
{
- _templateSource = templateSource;
- _pageElementFactory = pageElementFactory;
- _linkFactory = linkFactory;
- _persistentFieldManager = persistentFieldManager;
+ this.templateSource = templateSource;
+ this.pageElementFactory = pageElementFactory;
+ this.linkFactory = linkFactory;
+ this.persistentFieldManager = persistentFieldManager;
}
private void bindParameterFromTemplate(ComponentPageElement component, AttributeToken token)
@@ -167,14 +168,14 @@
String defaultBindingPrefix = determineDefaultBindingPrefix(component, name,
TapestryConstants.LITERAL_BINDING_PREFIX);
- Binding binding = findBinding(_loadingElement, component, name, token.getValue(), defaultBindingPrefix,
+ Binding binding = findBinding(loadingElement, component, name, token.getValue(), defaultBindingPrefix,
token.getLocation());
if (binding != null)
{
component.bindParameter(name, binding);
- Map<String, Binding> bindingMap = _componentIdToBindingMap.get(component
+ Map<String, Binding> bindingMap = componentIdToBindingMap.get(component
.getCompleteId());
bindingMap.put(name, binding);
}
@@ -185,13 +186,13 @@
if (model != null)
{
for (String mixinClassName : model.getMixinClassNames())
- _pageElementFactory.addMixinByClassName(component, mixinClassName);
+ pageElementFactory.addMixinByClassName(component, mixinClassName);
}
if (mixins != null)
{
for (String type : COMMA_PATTERN.split(mixins))
- _pageElementFactory.addMixinByTypeName(component, type);
+ pageElementFactory.addMixinByTypeName(component, type);
}
}
@@ -241,7 +242,7 @@
if (value.startsWith(INHERIT_PREFIX))
{
String loadingParameterName = value.substring(INHERIT_PREFIX.length());
- Map<String, Binding> loadingComponentBindingMap = _componentIdToBindingMap
+ Map<String, Binding> loadingComponentBindingMap = componentIdToBindingMap
.get(loadingComponent.getCompleteId());
// This may return null if the parameter is not bound in the loading component.
@@ -261,8 +262,8 @@
return new InheritedBinding(description, existing, location);
}
- return _pageElementFactory.newBinding(name, loadingComponent.getComponentResources(),
- component.getComponentResources(), defaultBindingPrefix, value, location);
+ return pageElementFactory.newBinding(name, loadingComponent.getComponentResources(),
+ component.getComponentResources(), defaultBindingPrefix, value, location);
}
/**
@@ -284,7 +285,7 @@
private void addToBody(PageElement element)
{
- _bodyPageElementStack.peek().addToBody(element);
+ bodyPageElementStack.peek().addToBody(element);
}
private void attribute(AttributeToken token)
@@ -292,15 +293,15 @@
// This kind of bookkeeping is ugly, we probably should have distinct (if very similar)
// tokens for attributes and for parameter bindings.
- if (_addAttributesAsComponentBindings)
+ if (addAttributesAsComponentBindings)
{
- ComponentPageElement activeElement = _activeElementStack.peek();
+ ComponentPageElement activeElement = activeElementStack.peek();
bindParameterFromTemplate(activeElement, token);
return;
}
- PageElement element = _pageElementFactory.newAttributeElement(_loadingElement
+ PageElement element = pageElementFactory.newAttributeElement(loadingElement
.getComponentResources(), token);
addToBody(element);
@@ -308,7 +309,7 @@
private void body()
{
- addToBody(new RenderBodyElement(_loadingElement));
+ addToBody(new RenderBodyElement(loadingElement));
// BODY tokens are *not* matched by END_ELEMENT tokens. Nor will there be
// text or comment content "inside" the BODY.
@@ -330,8 +331,8 @@
*/
private void configureEnd(boolean discard, Runnable command)
{
- _discardEndTagStack.push(discard);
- _endElementCommandStack.push(command);
+ discardEndTagStack.push(discard);
+ endElementCommandStack.push(command);
}
private void endElement()
@@ -339,11 +340,11 @@
// discard will be false if the matching start token was for a static element, and will be
// true otherwise (component, block, parameter).
- boolean discard = _discardEndTagStack.pop();
+ boolean discard = discardEndTagStack.pop();
if (!discard) addToBody(END_ELEMENT);
- Runnable command = _endElementCommandStack.pop();
+ Runnable command = endElementCommandStack.pop();
// Used to return environment to prior state.
@@ -352,7 +353,7 @@
private void expansion(ExpansionToken token)
{
- PageElement element = _pageElementFactory.newExpansionElement(_loadingElement
+ PageElement element = pageElementFactory.newExpansionElement(loadingElement
.getComponentResources(), token);
addToBody(element);
@@ -381,11 +382,11 @@
{
// Ensure that loadPage() may only be invoked once.
- _lock.lock();
+ lock.lock();
- _locale = locale;
+ this.locale = locale;
- _page = new PageImpl(logicalPageName, _locale, _linkFactory, _persistentFieldManager);
+ page = new PageImpl(logicalPageName, this.locale, linkFactory, persistentFieldManager);
loadRootComponent(pageClassName);
@@ -393,7 +394,7 @@
// Take care of any finalization logic that's been deferred out.
- for (Runnable r : _finalization)
+ for (Runnable r : finalization)
{
r.run();
}
@@ -402,18 +403,18 @@
// This is to help ensure that no client-specific information leaks
// into the page.
- _page.loaded();
+ page.loaded();
- return _page;
+ return page;
}
private void loadRootComponent(String className)
{
- ComponentPageElement rootComponent = _pageElementFactory.newRootComponentElement(_page, className, _locale);
+ ComponentPageElement rootComponent = pageElementFactory.newRootComponentElement(page, className, locale);
- _page.setRootElement(rootComponent);
+ page.setRootElement(rootComponent);
- _componentQueue.push(rootComponent);
+ componentQueue.push(rootComponent);
}
/**
@@ -421,45 +422,45 @@
* large and hard to test. I think a lot of instance and local variables need to be bundled up into some kind of
* process object. This code is effectively too big to be tested except through integration testing.
*/
- private void loadTemplateForComponent(ComponentPageElement loadingElement)
+ private void loadTemplateForComponent(final ComponentPageElement loadingElement)
{
- _loadingElement = loadingElement;
- _loadingComponentModel = loadingElement.getComponentResources().getComponentModel();
+ this.loadingElement = loadingElement;
+ loadingComponentModel = loadingElement.getComponentResources().getComponentModel();
- String componentClassName = _loadingComponentModel.getComponentClassName();
- ComponentTemplate template = _templateSource.getTemplate(_loadingComponentModel, _locale);
+ String componentClassName = loadingComponentModel.getComponentClassName();
+ ComponentTemplate template = templateSource.getTemplate(loadingComponentModel, locale);
// When the template for a component is missing, we pretend it consists of just a RenderBody
// phase. Missing is not an error ... many component simply do not have a template.
if (template.isMissing())
{
- _loadingElement.addToTemplate(new RenderBodyElement(_loadingElement));
+ this.loadingElement.addToTemplate(new RenderBodyElement(this.loadingElement));
return;
}
// Pre-allocate ids to avoid later name collisions.
- Logger logger = _loadingComponentModel.getLogger();
+ Logger logger = loadingComponentModel.getLogger();
// Don't have a case-insensitive Set, so we'll make due with a Map
Map<String, Boolean> embeddedIds = newCaseInsensitiveMap();
- for (String id : _loadingComponentModel.getEmbeddedComponentIds())
+ for (String id : loadingComponentModel.getEmbeddedComponentIds())
embeddedIds.put(id, true);
- _idAllocator.clear();
+ idAllocator.clear();
for (String id : template.getComponentIds())
{
- _idAllocator.allocateId(id);
+ idAllocator.allocateId(id);
embeddedIds.remove(id);
}
if (!embeddedIds.isEmpty())
logger.error(ServicesMessages.embeddedComponentsNotInTemplate(embeddedIds.keySet(), componentClassName));
- _addAttributesAsComponentBindings = false;
+ addAttributesAsComponentBindings = false;
// The outermost elements of the template belong in the loading component's template list,
// not its body list. This shunt allows everyone else to not have to make that decision,
@@ -470,11 +471,11 @@
{
public void addToBody(PageElement element)
{
- _loadingElement.addToTemplate(element);
+ loadingElement.addToTemplate(element);
}
};
- _bodyPageElementStack.push(shunt);
+ bodyPageElementStack.push(shunt);
for (TemplateToken token : template.getTokens())
{
@@ -539,7 +540,7 @@
// For neatness / symmetry:
- _bodyPageElementStack.pop(); // the shunt
+ bodyPageElementStack.pop(); // the shunt
// TODO: Check that all stacks are empty. That should never happen, as long
// as the ComponentTemplate is valid.
@@ -582,20 +583,20 @@
// TODO: Check that the t:parameter doesn't appear outside of an embedded component.
- _activeElementStack.peek().bindParameter(name, binding);
+ activeElementStack.peek().bindParameter(name, binding);
setupBlock(block);
}
private void setupBlock(BodyPageElement block)
{
- _bodyPageElementStack.push(block);
+ bodyPageElementStack.push(block);
Runnable cleanup = new Runnable()
{
public void run()
{
- _bodyPageElementStack.pop();
+ bodyPageElementStack.pop();
}
};
@@ -611,7 +612,7 @@
String id = token.getId();
- if (id != null) _loadingElement.addBlock(id, block);
+ if (id != null) loadingElement.addBlock(id, block);
setupBlock(block);
}
@@ -629,9 +630,9 @@
// We know that if embeddedId is null, embeddedType is not.
- if (embeddedId == null) embeddedId = generateEmbeddedId(embeddedType, _idAllocator);
+ if (embeddedId == null) embeddedId = generateEmbeddedId(embeddedType, idAllocator);
- final EmbeddedComponentModel embeddedModel = _loadingComponentModel
+ final EmbeddedComponentModel embeddedModel = loadingComponentModel
.getEmbeddedComponentModel(embeddedId);
if (embeddedModel != null)
@@ -640,7 +641,7 @@
if (isNonBlank(modelType) && embeddedType != null)
{
- Logger log = _loadingComponentModel.getLogger();
+ Logger log = loadingComponentModel.getLogger();
log.error(ServicesMessages.compTypeConflict(embeddedId, embeddedType, modelType));
}
@@ -649,40 +650,40 @@
}
if (isBlank(embeddedType) && isBlank(embeddedComponentClassName)) throw new TapestryException(
- ServicesMessages.noTypeForEmbeddedComponent(embeddedId, _loadingComponentModel.getComponentClassName()),
+ ServicesMessages.noTypeForEmbeddedComponent(embeddedId, loadingComponentModel.getComponentClassName()),
token, null);
- final ComponentPageElement newComponent = _pageElementFactory.newComponentElement(_page, _loadingElement,
- embeddedId, embeddedType,
- embeddedComponentClassName,
- elementName,
- token.getLocation());
+ final ComponentPageElement newComponent = pageElementFactory.newComponentElement(page, loadingElement,
+ embeddedId, embeddedType,
+ embeddedComponentClassName,
+ elementName,
+ token.getLocation());
addMixinsToComponent(newComponent, embeddedModel, token.getMixins());
final Map<String, Binding> newComponentBindings = newMap();
- _componentIdToBindingMap.put(newComponent.getCompleteId(), newComponentBindings);
+ componentIdToBindingMap.put(newComponent.getCompleteId(), newComponentBindings);
if (embeddedModel != null)
- bindParametersFromModel(embeddedModel, _loadingElement, newComponent, newComponentBindings);
+ bindParametersFromModel(embeddedModel, loadingElement, newComponent, newComponentBindings);
addToBody(newComponent);
// Remember to load the template for this new component
- _componentQueue.push(newComponent);
+ componentQueue.push(newComponent);
// Any attribute tokens that immediately follow should be
// used to bind parameters.
- _addAttributesAsComponentBindings = true;
+ addAttributesAsComponentBindings = true;
// Any attributes (including component parameters) that come up belong on this component.
- _activeElementStack.push(newComponent);
+ activeElementStack.push(newComponent);
// Set things up so that content inside the component is added to the component's body.
- _bodyPageElementStack.push(newComponent);
+ bodyPageElementStack.push(newComponent);
// And clean that up when the end element is reached.
@@ -696,7 +697,7 @@
if (embeddedModel != null && embeddedModel.getInheritInformalParameters() && newComponentModel.getSupportsInformalParameters())
{
- final ComponentPageElement loadingElement = _loadingElement;
+ final ComponentPageElement loadingElement = this.loadingElement;
Runnable finalizer = new Runnable()
{
@@ -708,7 +709,7 @@
}
};
- _finalization.add(finalizer);
+ finalization.add(finalizer);
}
@@ -719,8 +720,8 @@
// May need a separate queue for this, to execute at the very end of page loading.
- _activeElementStack.pop();
- _bodyPageElementStack.pop();
+ activeElementStack.pop();
+ bodyPageElementStack.pop();
}
};
@@ -764,7 +765,7 @@
addToBody(element);
// Controls how attributes are interpretted.
- _addAttributesAsComponentBindings = false;
+ addAttributesAsComponentBindings = false;
// Index will be matched by end:
@@ -783,16 +784,16 @@
private void dtd(DTDToken token)
{
// first DTD encountered wins.
- if (_dtdAdded) return;
+ if (dtdAdded) return;
PageElement element = new DTDPageElement(token.getName(), token.getPublicId(), token.getSystemId());
// since rendering via the markup writer is to the document tree,
// we don't really care where this gets placed in the tree; the
// DTDPageElement will set the dtd of the document directly, rather than
// writing anything to the markup writer
- _page.getRootElement().addToTemplate(element);
+ page.getRootElement().addToTemplate(element);
- _dtdAdded = true;
+ dtdAdded = true;
}
/**
@@ -800,9 +801,9 @@
*/
private void workComponentQueue()
{
- while (!_componentQueue.isEmpty())
+ while (!componentQueue.isEmpty())
{
- ComponentPageElement componentElement = _componentQueue.pop();
+ ComponentPageElement componentElement = componentQueue.pop();
loadTemplateForComponent(componentElement);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLocator.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLocator.java Wed May 7 19:23:21 2008
@@ -21,14 +21,14 @@
*/
public class PageLocator
{
- private final String _pageName;
+ private final String pageName;
- private final Locale _locale;
+ private final Locale locale;
public PageLocator(String pageName, Locale locale)
{
- _pageName = pageName;
- _locale = locale;
+ this.pageName = pageName;
+ this.locale = locale;
}
@Override
@@ -39,19 +39,19 @@
return false;
}
PageLocator locator = (PageLocator) obj;
- return _pageName.equals(locator._pageName) && _locale.equals(locator._locale);
+ return pageName.equals(locator.pageName) && locale.equals(locator.locale);
}
@Override
public int hashCode()
{
- return _pageName.hashCode() * 17 + _locale.hashCode();
+ return pageName.hashCode() * 17 + locale.hashCode();
}
@Override
public String toString()
{
- return String.format("%s[%s, %s]", getClass().getSimpleName(), _pageName, _locale
+ return String.format("%s[%s, %s]", getClass().getSimpleName(), pageName, locale
.toString());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java Wed May 7 19:23:21 2008
@@ -21,11 +21,11 @@
public class PageMarkupRendererImpl implements PageMarkupRenderer
{
- private final Environment _environment;
+ private final Environment environment;
- private final PageRenderQueue _pageRenderQueue;
+ private final PageRenderQueue pageRenderQueue;
- private final MarkupRenderer _markupRendererPipeline;
+ private final MarkupRenderer markupRendererPipeline;
public PageMarkupRendererImpl(MarkupRenderer markupRendererPipeline, PageRenderQueue pageRenderQueue,
Environment environment)
@@ -36,23 +36,23 @@
// - This service is the bridge between public and private
- _pageRenderQueue = pageRenderQueue;
- _environment = environment;
+ this.pageRenderQueue = pageRenderQueue;
+ this.environment = environment;
- _markupRendererPipeline = markupRendererPipeline;
+ this.markupRendererPipeline = markupRendererPipeline;
}
public void renderPageMarkup(Page page, MarkupWriter writer)
{
- _environment.clear();
+ environment.clear();
// This is why the PRQ is scope perthread; we tell it what to render here ...
- _pageRenderQueue.initializeForCompletePage(page);
+ pageRenderQueue.initializeForCompletePage(page);
- // ... then our fixed pipeline is able to (eventually) call into it.
+ // ... then our statically fixed pipeline is able to (eventually) call into it.
- _markupRendererPipeline.renderMarkup(writer);
+ markupRendererPipeline.renderMarkup(writer);
if (writer.getDocument().getRootElement() == null)
throw new RuntimeException(ServicesMessages.noMarkupFromPageRender(page));