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 [3/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/PagePoolCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolCache.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolCache.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolCache.java Wed May 7 19:23:21 2008
@@ -59,23 +59,23 @@
/**
* Pages that are available for use.
*/
- private LinkedList<CachedPage> _available = CollectionFactory.newLinkedList();
+ private LinkedList<CachedPage> available = CollectionFactory.newLinkedList();
/**
* Pages that are currently in use.
*/
- private LinkedList<CachedPage> _inUse = CollectionFactory.newLinkedList();
+ private LinkedList<CachedPage> inUse = CollectionFactory.newLinkedList();
/**
* Guards access to the available and in use lists.
*/
- private final Lock _lock = new ReentrantLock();
+ private final Lock lock = new ReentrantLock();
/**
* Condition signalled whenever an in-use page is returned to the cache, which is useful if some other thread may be
* waiting for a page to be available.
*/
- private final Condition _pageAvailable = _lock.newCondition();
+ private final Condition pageAvailable = lock.newCondition();
/**
* Tracks the usage of a page instance, allowing a last access property to be associated with the page. CachedPage
@@ -133,7 +133,7 @@
{
// The only problem here is that *each* new page attached to the request
// may wait the soft limit. The alternative would be to timestamp the request
- // itself, and compute the wait period from that ... an dangerous and expensive option.
+ // itself, and compute the wait period from that ... a dangerous and expensive option.
long start = System.currentTimeMillis();
@@ -142,7 +142,7 @@
// releasing pages from the in use list back into the active list. We go to some trouble to
// ensure that the PageLoader is invoked OUTSIDE of the lock.
- _lock.lock();
+ lock.lock();
try
{
@@ -161,7 +161,7 @@
// which is largely accurate as long as there haven't been a lot
// of request exceptions. We'll take the count at face value.
- if (_inUse.size() < softLimit) break;
+ if (inUse.size() < softLimit) break;
// We'll wait for pages to be available, but careful that the
// total wait period is less than the soft wait limit.
@@ -176,7 +176,7 @@
{
// Note: await() will release the lock, but will re-acquire it
// before returning.
- _pageAvailable.await(waitMillis, TimeUnit.MILLISECONDS);
+ pageAvailable.await(waitMillis, TimeUnit.MILLISECONDS);
}
catch (InterruptedException ex)
{
@@ -195,12 +195,12 @@
// If past the hard limit, we don't try to create the page fresh.
- if (_inUse.size() >= hardLimit)
+ if (inUse.size() >= hardLimit)
throw new RuntimeException(ServicesMessages.pagePoolExausted(pageName, locale, hardLimit));
}
finally
{
- _lock.unlock();
+ lock.unlock();
}
// This may take a moment, so we're careful to do it outside of a write lock.
@@ -209,15 +209,15 @@
Page page = pageLoader.loadPage(pageName, locale);
- _lock.lock();
+ lock.lock();
try
{
- _inUse.addFirst(new CachedPage(page));
+ inUse.addFirst(new CachedPage(page));
}
finally
{
- _lock.unlock();
+ lock.unlock();
}
return page;
@@ -233,12 +233,11 @@
*/
private Page findAvailablePage()
{
+ if (available.isEmpty()) return null;
- if (_available.isEmpty()) return null;
+ CachedPage cachedPage = available.removeFirst();
- CachedPage cachedPage = _available.removeFirst();
-
- _inUse.addFirst(cachedPage);
+ inUse.addFirst(cachedPage);
return cachedPage.page;
}
@@ -248,13 +247,13 @@
*/
void release(Page page)
{
- _lock.lock();
+ lock.lock();
try
{
CachedPage cached = null;
- ListIterator<CachedPage> i = _inUse.listIterator();
+ ListIterator<CachedPage> i = inUse.listIterator();
while (i.hasNext())
{
@@ -280,14 +279,14 @@
cached.lastAccess = System.currentTimeMillis();
- _available.addFirst(cached);
+ available.addFirst(cached);
- _pageAvailable.signal();
+ pageAvailable.signal();
}
finally
{
- _lock.unlock();
+ lock.unlock();
}
}
@@ -297,11 +296,11 @@
*/
void remove(Page page)
{
- _lock.lock();
+ lock.lock();
try
{
- ListIterator<CachedPage> i = _inUse.listIterator();
+ ListIterator<CachedPage> i = inUse.listIterator();
while (i.hasNext())
{
@@ -317,7 +316,7 @@
}
finally
{
- _lock.unlock();
+ lock.unlock();
}
}
@@ -329,12 +328,12 @@
{
long cutoff = System.currentTimeMillis() - activeWindow;
- _lock.lock();
+ lock.lock();
try
{
- ListIterator<CachedPage> i = _available.listIterator();
+ ListIterator<CachedPage> i = available.listIterator();
while (i.hasNext())
{
@@ -345,7 +344,7 @@
}
finally
{
- _lock.unlock();
+ lock.unlock();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java Wed May 7 19:23:21 2008
@@ -50,23 +50,23 @@
*/
public class PagePoolImpl implements PagePool, InvalidationListener, UpdateListener
{
- private final Logger _logger;
+ private final Logger logger;
- private final PageLoader _pageLoader;
+ private final PageLoader pageLoader;
- private final ThreadLocale _threadLocale;
+ private final ThreadLocale threadLocale;
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
- private final int _softLimit;
+ private final int softLimit;
- private final long _softWait;
+ private final long softWait;
- private final int _hardLimit;
+ private final int hardLimit;
- private final long _activeWindow;
+ private final long activeWindow;
- private final Map<PageLocator, PagePoolCache> _pool = CollectionFactory.newMap();
+ private final Map<PageLocator, PagePoolCache> pool = CollectionFactory.newMap();
public PagePoolImpl(Logger logger,
@@ -88,21 +88,21 @@
@Symbol("tapestry.page-pool.active-window") @IntermediateType(TimeInterval.class)
long activeWindow)
{
- _logger = logger;
- _pageLoader = pageLoader;
- _threadLocale = threadLocale;
- _resolver = resolver;
- _softLimit = softLimit;
- _softWait = softWait;
- _hardLimit = hardLimit;
- _activeWindow = activeWindow;
+ this.logger = logger;
+ this.pageLoader = pageLoader;
+ this.threadLocale = threadLocale;
+ this.resolver = resolver;
+ this.softLimit = softLimit;
+ this.softWait = softWait;
+ this.hardLimit = hardLimit;
+ this.activeWindow = activeWindow;
}
public Page checkout(String logicalPageName)
{
- String canonicalPageName = _resolver.canonicalizePageName(logicalPageName);
+ String canonicalPageName = resolver.canonicalizePageName(logicalPageName);
- PagePoolCache cache = get(canonicalPageName, _threadLocale.getLocale());
+ PagePoolCache cache = get(canonicalPageName, threadLocale.getLocale());
return cache.checkout();
}
@@ -116,7 +116,7 @@
if (page.detached())
{
- _logger.error(ServicesMessages.pageIsDirty(page));
+ logger.error(ServicesMessages.pageIsDirty(page));
cache.remove(page);
@@ -131,15 +131,15 @@
{
PageLocator locator = new PageLocator(pageName, locale);
- PagePoolCache result = _pool.get(locator);
+ PagePoolCache result = pool.get(locator);
if (result == null)
{
// TODO: It might be nice to allow individual pages to override the default limits.
- result = new PagePoolCache(pageName, locale, _pageLoader, _softLimit, _softWait, _hardLimit, _activeWindow);
+ result = new PagePoolCache(pageName, locale, pageLoader, softLimit, softWait, hardLimit, activeWindow);
- _pool.put(locator, result);
+ pool.put(locator, result);
}
return result;
@@ -150,12 +150,12 @@
*/
public synchronized void objectWasInvalidated()
{
- _pool.clear();
+ pool.clear();
}
public synchronized void checkForUpdates()
{
- for (PagePoolCache cache : _pool.values())
+ for (PagePoolCache cache : pool.values())
{
cache.cleanup();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderDispatcher.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderDispatcher.java Wed May 7 19:23:21 2008
@@ -28,18 +28,18 @@
*/
public class PageRenderDispatcher implements Dispatcher
{
- private final ComponentClassResolver _componentClassResolver;
+ private final ComponentClassResolver componentClassResolver;
- private final PageRenderRequestHandler _handler;
+ private final PageRenderRequestHandler handler;
- private final ContextValueEncoder _contextValueEncoder;
+ private final ContextValueEncoder contextValueEncoder;
public PageRenderDispatcher(ComponentClassResolver componentClassResolver, PageRenderRequestHandler handler,
ContextValueEncoder contextValueEncoder)
{
- _componentClassResolver = componentClassResolver;
- _handler = handler;
- _contextValueEncoder = contextValueEncoder;
+ this.componentClassResolver = componentClassResolver;
+ this.handler = handler;
+ this.contextValueEncoder = contextValueEncoder;
}
public boolean dispatch(Request request, final Response response) throws IOException
@@ -85,16 +85,16 @@
private boolean process(String pageName, String pageActivationContext) throws IOException
{
- if (!_componentClassResolver.isPageName(pageName)) return false;
+ if (!componentClassResolver.isPageName(pageName)) return false;
String[] values = convertActivationContext(pageActivationContext);
EventContext activationContext
- = new URLEventContext(_contextValueEncoder, values);
+ = new URLEventContext(contextValueEncoder, values);
PageRenderRequestParameters parameters = new PageRenderRequestParameters(pageName, activationContext);
- _handler.handle(parameters);
+ handler.handle(parameters);
return true;
}
@@ -103,7 +103,6 @@
* Converts the "extra path", the portion after the page name (and after the slash seperating the page name from the
* activation context) into an array of strings. LinkFactory and friends URL encode each value, so we URL decode the
* value (we assume that page names are "URL safe").
- *
*/
private String[] convertActivationContext(String extraPath)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java Wed May 7 19:23:21 2008
@@ -31,14 +31,14 @@
@Scope(PERTHREAD_SCOPE)
public class PageRenderQueueImpl implements PageRenderQueue
{
- private Page _page;
+ private Page page;
- private RenderCommand _rootCommand;
+ private RenderCommand rootCommand;
public void initializeForCompletePage(Page page)
{
- _page = page;
- _rootCommand = page.getRootElement();
+ this.page = page;
+ rootCommand = page.getRootElement();
}
@@ -46,38 +46,38 @@
{
Defense.notNull(page, "page");
- _page = page;
+ this.page = page;
}
public boolean isPartialRenderInitialized()
{
- return _rootCommand != null;
+ return rootCommand != null;
}
public void initializeForPartialPageRender(RenderCommand rootCommand)
{
Defense.notNull(rootCommand, "rootCommand");
- if (_page == null) throw new IllegalStateException("Page must be specified before root render command.");
+ if (page == null) throw new IllegalStateException("Page must be specified before root render command.");
- _rootCommand = rootCommand;
+ this.rootCommand = rootCommand;
}
public RenderCommand getRootRenderCommand()
{
- return _rootCommand;
+ return rootCommand;
}
public Page getRenderingPage()
{
- return _page;
+ return page;
}
public void render(MarkupWriter writer)
{
- RenderQueueImpl queue = new RenderQueueImpl(_page.getLogger());
+ RenderQueueImpl queue = new RenderQueueImpl(page.getLogger());
- queue.push(_rootCommand);
+ queue.push(rootCommand);
// Run the queue until empty.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java Wed May 7 19:23:21 2008
@@ -28,26 +28,26 @@
*/
public class PageRenderRequestHandlerImpl implements PageRenderRequestHandler
{
- private final RequestPageCache _cache;
+ private final RequestPageCache cache;
- private final ComponentEventResultProcessor _resultProcessor;
+ private final ComponentEventResultProcessor resultProcessor;
- private final PageResponseRenderer _pageResponseRenderer;
+ private final PageResponseRenderer pageResponseRenderer;
public PageRenderRequestHandlerImpl(RequestPageCache cache,
@Traditional ComponentEventResultProcessor resultProcessor,
PageResponseRenderer pageResponseRenderer)
{
- _cache = cache;
- _resultProcessor = resultProcessor;
- _pageResponseRenderer = pageResponseRenderer;
+ this.cache = cache;
+ this.resultProcessor = resultProcessor;
+ this.pageResponseRenderer = pageResponseRenderer;
}
public void handle(PageRenderRequestParameters parameters) throws IOException
{
- Page page = _cache.get(parameters.getLogicalPageName());
+ Page page = cache.get(parameters.getLogicalPageName());
- ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(_resultProcessor);
+ ComponentResultProcessorWrapper callback = new ComponentResultProcessorWrapper(resultProcessor);
page.getRootElement().triggerContextEvent(TapestryConstants.ACTIVATE_EVENT, parameters.getActivationContext(),
callback);
@@ -56,6 +56,6 @@
if (callback.isAborted()) return;
- _pageResponseRenderer.renderPageResponse(page);
+ pageResponseRenderer.renderPageResponse(page);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java Wed May 7 19:23:21 2008
@@ -31,19 +31,19 @@
public class PageRenderSupportImpl implements PageRenderSupport
{
- private final IdAllocator _idAllocator;
+ private final IdAllocator idAllocator;
- private final DocumentLinker _linker;
+ private final DocumentLinker linker;
- private final SymbolSource _symbolSource;
+ private final SymbolSource symbolSource;
- private final AssetSource _assetSource;
+ private final AssetSource assetSource;
- private final List<String> _coreScripts;
+ private final List<String> coreScripts;
- private boolean _coreAssetsAdded;
+ private boolean coreAssetsAdded;
- private final JSONObject _init = new JSONObject();
+ private final JSONObject init = new JSONObject();
/**
* @param linker Used to assemble JavaScript includes and snippets
@@ -73,17 +73,17 @@
AssetSource assetSource, IdAllocator idAllocator, String... coreScripts)
{
- _linker = linker;
- _symbolSource = symbolSource;
- _assetSource = assetSource;
- _idAllocator = idAllocator;
+ this.linker = linker;
+ this.symbolSource = symbolSource;
+ this.assetSource = assetSource;
+ this.idAllocator = idAllocator;
- _coreScripts = Arrays.asList(coreScripts);
+ this.coreScripts = Arrays.asList(coreScripts);
}
public String allocateClientId(String id)
{
- return _idAllocator.allocateId(id);
+ return idAllocator.allocateId(id);
}
public String allocateClientId(ComponentResources resources)
@@ -99,7 +99,7 @@
{
notNull(asset, "scriptAsset");
- _linker.addScriptLink(asset.toClientURL());
+ linker.addScriptLink(asset.toClientURL());
}
}
@@ -113,11 +113,11 @@
private void addScriptLinkFromClasspath(String path)
{
- String expanded = _symbolSource.expandSymbols(path);
+ String expanded = symbolSource.expandSymbols(path);
- Asset asset = _assetSource.getAsset(null, expanded, null);
+ Asset asset = assetSource.getAsset(null, expanded, null);
- _linker.addScriptLink(asset.toClientURL());
+ linker.addScriptLink(asset.toClientURL());
}
public void addScript(String format, Object... arguments)
@@ -128,7 +128,7 @@
String script = format(format, arguments);
- _linker.addScript(script);
+ linker.addScript(script);
}
public void addInit(String functionName, JSONArray parameterList)
@@ -164,12 +164,12 @@
Defense.notBlank(functionName, "functionName");
Defense.notNull(parameters, "parameters");
- JSONArray invocations = _init.has(functionName) ? _init.getJSONArray(functionName) : null;
+ JSONArray invocations = init.has(functionName) ? init.getJSONArray(functionName) : null;
if (invocations == null)
{
invocations = new JSONArray();
- _init.put(functionName, invocations);
+ init.put(functionName, invocations);
}
invocations.put(parameters);
@@ -180,9 +180,9 @@
*/
public void commit()
{
- if (_init.length() > 0)
+ if (init.length() > 0)
{
- addScript("Tapestry.init(%s);", _init);
+ addScript("Tapestry.init(%s);", init);
}
}
@@ -190,17 +190,17 @@
{
notNull(stylesheet, "stylesheet");
- _linker.addStylesheetLink(stylesheet.toClientURL(), media);
+ linker.addStylesheetLink(stylesheet.toClientURL(), media);
}
private void addCore()
{
- if (!_coreAssetsAdded)
+ if (!coreAssetsAdded)
{
- for (String path : _coreScripts)
+ for (String path : coreScripts)
addScriptLinkFromClasspath(path);
- _coreAssetsAdded = true;
+ coreAssetsAdded = true;
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java Wed May 7 19:23:21 2008
@@ -26,37 +26,37 @@
public class PageResponseRendererImpl implements PageResponseRenderer
{
- private final PageMarkupRenderer _markupRenderer;
+ private final PageMarkupRenderer markupRenderer;
- private final MarkupWriterFactory _markupWriterFactory;
+ private final MarkupWriterFactory markupWriterFactory;
- private final PageContentTypeAnalyzer _pageContentTypeAnalyzer;
+ private final PageContentTypeAnalyzer pageContentTypeAnalyzer;
- private final Response _response;
+ private final Response response;
public PageResponseRendererImpl(MarkupWriterFactory markupWriterFactory, PageMarkupRenderer markupRenderer,
PageContentTypeAnalyzer pageContentTypeAnalyzer, Response response)
{
- _markupWriterFactory = markupWriterFactory;
- _markupRenderer = markupRenderer;
- _pageContentTypeAnalyzer = pageContentTypeAnalyzer;
- _response = response;
+ this.markupWriterFactory = markupWriterFactory;
+ this.markupRenderer = markupRenderer;
+ this.pageContentTypeAnalyzer = pageContentTypeAnalyzer;
+ this.response = response;
}
public void renderPageResponse(Page page) throws IOException
{
Defense.notNull(page, "page");
- ContentType contentType = _pageContentTypeAnalyzer.findContentType(page);
+ ContentType contentType = pageContentTypeAnalyzer.findContentType(page);
// For the moment, the content type is all that's used determine the model for the markup writer.
// It's something of a can of worms.
- MarkupWriter writer = _markupWriterFactory.newMarkupWriter(contentType);
+ MarkupWriter writer = markupWriterFactory.newMarkupWriter(contentType);
- _markupRenderer.renderPageMarkup(page, writer);
+ markupRenderer.renderPageMarkup(page, writer);
- PrintWriter pw = _response.getPrintWriter(contentType.toString());
+ PrintWriter pw = response.getPrintWriter(contentType.toString());
writer.toMarkup(pw);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java Wed May 7 19:23:21 2008
@@ -25,14 +25,14 @@
public class PageTemplateLocatorImpl implements PageTemplateLocator
{
- private final Resource _contextRoot;
+ private final Resource contextRoot;
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
public PageTemplateLocatorImpl(Resource contextRoot, ComponentClassResolver resolver)
{
- _contextRoot = contextRoot;
- _resolver = resolver;
+ this.contextRoot = contextRoot;
+ this.resolver = resolver;
}
public Resource findPageTemplateResource(ComponentModel model, Locale locale)
@@ -43,7 +43,7 @@
if (!className.contains(".pages.")) return null;
- String logicalName = _resolver.resolvePageClassNameToPageName(className);
+ String logicalName = resolver.resolvePageClassNameToPageName(className);
int slashx = logicalName.lastIndexOf('/');
@@ -59,7 +59,7 @@
String path = format("%s.%s", logicalName, InternalConstants.TEMPLATE_EXTENSION);
- return _contextRoot.forFile(path).forLocale(locale);
+ return contextRoot.forFile(path).forLocale(locale);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java Wed May 7 19:23:21 2008
@@ -1,20 +1,20 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
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.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldChange;
@@ -26,7 +26,7 @@
/**
* Keyed on componentId + fieldName.
*/
- private final Map<String, Object> _values = newMap();
+ private final Map<String, Object> values = CollectionFactory.newMap();
public PersistentFieldBundleImpl(Collection<PersistentFieldChange> changes)
{
@@ -34,7 +34,7 @@
{
String key = buildKey(change.getComponentId(), change.getFieldName());
- _values.put(key, change.getValue());
+ values.put(key, change.getValue());
}
}
@@ -52,14 +52,14 @@
{
String key = buildKey(componentId, fieldName);
- return _values.containsKey(key);
+ return values.containsKey(key);
}
public Object getValue(String componentId, String fieldName)
{
String key = buildKey(componentId, fieldName);
- return _values.get(key);
+ return values.get(key);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java Wed May 7 19:23:21 2008
@@ -20,11 +20,11 @@
public class PersistentFieldChangeImpl implements PersistentFieldChange
{
- private final String _componentId;
+ private final String componentId;
- private final String _fieldName;
+ private final String fieldName;
- private final Object _value;
+ private final Object value;
public PersistentFieldChangeImpl(final String componentId, final String fieldName,
final Object value)
@@ -32,23 +32,23 @@
notNull(componentId, "componentId");
notBlank(fieldName, "fieldName");
- _componentId = componentId;
- _fieldName = fieldName;
- _value = value;
+ this.componentId = componentId;
+ this.fieldName = fieldName;
+ this.value = value;
}
public String getComponentId()
{
- return _componentId;
+ return componentId;
}
public String getFieldName()
{
- return _fieldName;
+ return fieldName;
}
public Object getValue()
{
- return _value;
+ return value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java Wed May 7 19:23:21 2008
@@ -32,26 +32,26 @@
public static final String DEFAULT_STRATEGY = "session";
- private final MetaDataLocator _metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
- private final Map<String, PersistentFieldStrategy> _strategies;
+ private final Map<String, PersistentFieldStrategy> strategies;
public PersistentFieldManagerImpl(MetaDataLocator locator,
Map<String, PersistentFieldStrategy> strategies)
{
- _metaDataLocator = locator;
+ metaDataLocator = locator;
- _strategies = strategies;
+ this.strategies = strategies;
}
private PersistentFieldStrategy getStrategy(String strategyName)
{
- PersistentFieldStrategy result = _strategies.get(strategyName);
+ PersistentFieldStrategy result = strategies.get(strategyName);
if (result == null)
throw new RuntimeException(ServicesMessages.unknownPersistentFieldStrategy(
strategyName,
- _strategies.keySet()));
+ strategies.keySet()));
return result;
}
@@ -60,7 +60,7 @@
{
Collection<PersistentFieldChange> allChanges = CollectionFactory.newList();
- for (PersistentFieldStrategy strategy : _strategies.values())
+ for (PersistentFieldStrategy strategy : strategies.values())
{
allChanges.addAll(strategy.gatherFieldChanges(pageName));
}
@@ -70,7 +70,7 @@
public void discardChanges(String pageName)
{
- for (PersistentFieldStrategy strategy : _strategies.values())
+ for (PersistentFieldStrategy strategy : strategies.values())
{
strategy.discardChanges(pageName);
}
@@ -93,6 +93,6 @@
if (InternalUtils.isNonBlank(strategy)) return strategy;
- return _metaDataLocator.findMeta(META_KEY, resources, String.class);
+ return metaDataLocator.findMeta(META_KEY, resources, String.class);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java Wed May 7 19:23:21 2008
@@ -26,16 +26,16 @@
*/
private static final String LOCALE_COOKIE_NAME = "org.apache.tapestry.locale";
- private final Cookies _cookieSource;
+ private final Cookies cookieSource;
public PersistentLocaleImpl(Cookies cookieSource)
{
- _cookieSource = cookieSource;
+ this.cookieSource = cookieSource;
}
public void set(Locale locale)
{
- _cookieSource.writeCookieValue(LOCALE_COOKIE_NAME, locale.toString());
+ cookieSource.writeCookieValue(LOCALE_COOKIE_NAME, locale.toString());
}
public Locale get()
@@ -47,7 +47,7 @@
private String getCookieValue()
{
- return _cookieSource.readCookieValue(LOCALE_COOKIE_NAME);
+ return cookieSource.readCookieValue(LOCALE_COOKIE_NAME);
}
public boolean isSet()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java Wed May 7 19:23:21 2008
@@ -78,16 +78,16 @@
private static final String PARENS = "()";
- private final PropertyAccess _access;
+ private final PropertyAccess access;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final Map<Class, Class> _classToEffectiveClass = newConcurrentMap();
+ private final Map<Class, Class> classToEffectiveClass = newConcurrentMap();
/**
* Keyed on combination of root class and expression.
*/
- private final Map<MultiKey, PropertyConduit> _cache = newConcurrentMap();
+ private final Map<MultiKey, PropertyConduit> cache = newConcurrentMap();
private static final MethodSignature GET_SIGNATURE = new MethodSignature(Object.class, "get",
new Class[] { Object.class }, null);
@@ -100,8 +100,8 @@
public PropertyConduitSourceImpl(PropertyAccess access, @ComponentLayer ClassFactory classFactory)
{
- _access = access;
- _classFactory = classFactory;
+ this.access = access;
+ this.classFactory = classFactory;
}
public PropertyConduit create(Class rootClass, String expression)
@@ -113,12 +113,12 @@
MultiKey key = new MultiKey(effectiveClass, expression);
- PropertyConduit result = _cache.get(key);
+ PropertyConduit result = cache.get(key);
if (result == null)
{
result = build(effectiveClass, expression);
- _cache.put(key, result);
+ cache.put(key, result);
}
@@ -127,13 +127,13 @@
private Class toEffectiveClass(Class rootClass)
{
- Class result = _classToEffectiveClass.get(rootClass);
+ Class result = classToEffectiveClass.get(rootClass);
if (result == null)
{
- result = _classFactory.importClass(rootClass);
+ result = classFactory.importClass(rootClass);
- _classToEffectiveClass.put(rootClass, result);
+ classToEffectiveClass.put(rootClass, result);
}
return result;
@@ -146,8 +146,8 @@
*/
public void objectWasInvalidated()
{
- _cache.clear();
- _classToEffectiveClass.clear();
+ cache.clear();
+ classToEffectiveClass.clear();
}
@@ -164,7 +164,7 @@
{
String name = ClassFabUtils.generateClassName("PropertyConduit");
- ClassFab classFab = _classFactory.newClass(name, BasePropertyConduit.class);
+ ClassFab classFab = classFactory.newClass(name, BasePropertyConduit.class);
classFab.addConstructor(new Class[] { Class.class, AnnotationProvider.class, String.class }, null,
"super($$);");
@@ -398,7 +398,7 @@
{
if (term.endsWith(PARENS)) return null;
- ClassPropertyAdapter classAdapter = _access.getAdapter(activeType);
+ ClassPropertyAdapter classAdapter = access.getAdapter(activeType);
PropertyAdapter adapter = classAdapter.getPropertyAdapter(term);
if (adapter == null) throw new RuntimeException(
@@ -456,7 +456,7 @@
// Otherwise, just a property name.
- ClassPropertyAdapter classAdapter = _access.getAdapter(activeType);
+ ClassPropertyAdapter classAdapter = access.getAdapter(activeType);
final PropertyAdapter adapter = classAdapter.getPropertyAdapter(term);
if (adapter == null) throw new RuntimeException(
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java Wed May 7 19:23:21 2008
@@ -27,9 +27,9 @@
{
private static final int INITIAL_QUEUE_DEPTH = 100;
- private final Stack<RenderCommand> _queue = CollectionFactory.newStack(INITIAL_QUEUE_DEPTH);
+ private final Stack<RenderCommand> queue = CollectionFactory.newStack(INITIAL_QUEUE_DEPTH);
- private final Stack<ComponentResources> _renderingComponents = CollectionFactory.newStack();
+ private final Stack<ComponentResources> renderingComponents = CollectionFactory.newStack();
private final Logger _logger;
@@ -40,7 +40,7 @@
public void push(RenderCommand command)
{
- _queue.push(command);
+ queue.push(command);
}
public void run(MarkupWriter writer)
@@ -57,9 +57,9 @@
try
{
- while (!_queue.isEmpty())
+ while (!queue.isEmpty())
{
- command = _queue.pop();
+ command = queue.pop();
commandCount++;
@@ -77,7 +77,7 @@
_logger.error(message, ex);
- throw new RenderQueueException(message, _renderingComponents.getSnapshot(), ex);
+ throw new RenderQueueException(message, renderingComponents.getSnapshot(), ex);
}
long endNanos = System.nanoTime();
@@ -99,11 +99,11 @@
{
Defense.notNull(resources, "resources");
- _renderingComponents.push(resources);
+ renderingComponents.push(resources);
}
public void endComponent()
{
- _renderingComponents.pop();
+ renderingComponents.pop();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java Wed May 7 19:23:21 2008
@@ -23,34 +23,34 @@
public class RequestEncodingInitializerImpl implements RequestEncodingInitializer
{
- private final RequestPageCache _cache;
+ private final RequestPageCache cache;
- private final MetaDataLocator _locator;
+ private final MetaDataLocator locator;
- private final Request _request;
+ private final Request request;
public RequestEncodingInitializerImpl(RequestPageCache cache, MetaDataLocator locator, Request request)
{
- _cache = cache;
- _locator = locator;
- _request = request;
+ this.cache = cache;
+ this.locator = locator;
+ this.request = request;
}
public void initializeRequestEncoding(String pageName)
{
- Page page = _cache.get(pageName);
+ Page page = cache.get(pageName);
ComponentResources pageResources = page.getRootElement().getComponentResources();
- String contentTypeString = _locator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
- String.class);
+ String contentTypeString = locator.findMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, pageResources,
+ String.class);
ContentType contentType = new ContentType(contentTypeString);
String encoding = contentType.getParameter("charset");
if (encoding == null)
- encoding = _locator.findMeta(TapestryConstants.RESPONSE_ENCODING, pageResources, String.class);
+ encoding = locator.findMeta(TapestryConstants.RESPONSE_ENCODING, pageResources, String.class);
- _request.setEncoding(encoding);
+ request.setEncoding(encoding);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestErrorFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestErrorFilter.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestErrorFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestErrorFilter.java Wed May 7 19:23:21 2008
@@ -9,13 +9,13 @@
*/
public class RequestErrorFilter implements RequestFilter
{
- private final InternalRequestGlobals _internalRequestGlobals;
- private final RequestExceptionHandler _exceptionHandler;
+ private final InternalRequestGlobals internalRequestGlobals;
+ private final RequestExceptionHandler exceptionHandler;
public RequestErrorFilter(InternalRequestGlobals internalRequestGlobals, RequestExceptionHandler exceptionHandler)
{
- _internalRequestGlobals = internalRequestGlobals;
- _exceptionHandler = exceptionHandler;
+ this.internalRequestGlobals = internalRequestGlobals;
+ this.exceptionHandler = exceptionHandler;
}
public boolean service(Request request, Response response, RequestHandler handler) throws IOException
@@ -36,9 +36,9 @@
// a NoClassDefFoundError with no cause; here we're trying to link the cause back in.
// TAPESTRY-2078
- Throwable exceptionToReport = attachNewCause(ex, _internalRequestGlobals.getClassLoaderException());
+ Throwable exceptionToReport = attachNewCause(ex, internalRequestGlobals.getClassLoaderException());
- _exceptionHandler.handleRequestException(exceptionToReport);
+ exceptionHandler.handleRequestException(exceptionToReport);
// We assume a reponse has been sent and there's no need to handle the request
// further.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java Wed May 7 19:23:21 2008
@@ -29,44 +29,44 @@
@Scope(PERTHREAD_SCOPE)
public class RequestGlobalsImpl implements RequestGlobals
{
- private HttpServletRequest _servletRequest;
+ private HttpServletRequest servletRequest;
- private HttpServletResponse _servletResponse;
+ private HttpServletResponse servletResponse;
- private Request _request;
+ private Request request;
- private Response _response;
+ private Response response;
public void storeServletRequestResponse(HttpServletRequest request, HttpServletResponse response)
{
- _servletRequest = request;
- _servletResponse = response;
+ servletRequest = request;
+ servletResponse = response;
}
public HttpServletRequest getHTTPServletRequest()
{
- return _servletRequest;
+ return servletRequest;
}
public HttpServletResponse getHTTPServletResponse()
{
- return _servletResponse;
+ return servletResponse;
}
public void storeRequestResponse(Request request, Response response)
{
- _request = request;
- _response = response;
+ this.request = request;
+ this.response = response;
}
public Request getRequest()
{
- return _request;
+ return request;
}
public Response getResponse()
{
- return _response;
+ return response;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java Wed May 7 19:23:21 2008
@@ -34,43 +34,43 @@
static final String XML_HTTP_REQUEST = "XMLHttpRequest";
- private final HttpServletRequest _request;
+ private final HttpServletRequest request;
public RequestImpl(HttpServletRequest request)
{
- _request = request;
+ this.request = request;
}
public List<String> getParameterNames()
{
- return InternalUtils.toList(_request.getParameterNames());
+ return InternalUtils.toList(request.getParameterNames());
}
public List<String> getHeaderNames()
{
- return InternalUtils.toList(_request.getHeaderNames());
+ return InternalUtils.toList(request.getHeaderNames());
}
public String getParameter(String name)
{
- return _request.getParameter(name);
+ return request.getParameter(name);
}
public String[] getParameters(String name)
{
- return _request.getParameterValues(name);
+ return request.getParameterValues(name);
}
public String getHeader(String name)
{
- return _request.getHeader(name);
+ return request.getHeader(name);
}
public String getPath()
{
- String pathInfo = _request.getPathInfo();
+ String pathInfo = request.getPathInfo();
- if (pathInfo == null) return _request.getServletPath();
+ if (pathInfo == null) return request.getServletPath();
// Websphere 6.1 is a bit wonky (see TAPESTRY-1713), and tends to return the empty string
// for the servlet path, and return the true path in pathInfo.
@@ -80,31 +80,31 @@
public String getContextPath()
{
- return _request.getContextPath();
+ return request.getContextPath();
}
public Session getSession(boolean create)
{
- HttpSession session = _request.getSession(create);
+ HttpSession session = request.getSession(create);
return session == null ? null : new SessionImpl(session);
}
public Locale getLocale()
{
- return _request.getLocale();
+ return request.getLocale();
}
public long getDateHeader(String name)
{
- return _request.getDateHeader(name);
+ return request.getDateHeader(name);
}
public void setEncoding(String requestEncoding)
{
try
{
- _request.setCharacterEncoding(requestEncoding);
+ request.setCharacterEncoding(requestEncoding);
}
catch (UnsupportedEncodingException ex)
{
@@ -114,31 +114,31 @@
public boolean isXHR()
{
- return XML_HTTP_REQUEST.equals(_request.getHeader(REQUESTED_WITH_HEADER));
+ return XML_HTTP_REQUEST.equals(request.getHeader(REQUESTED_WITH_HEADER));
}
public boolean isSecure()
{
- return _request.isSecure();
+ return request.isSecure();
}
public boolean isRequestedSessionIdValid()
{
- return _request.isRequestedSessionIdValid();
+ return request.isRequestedSessionIdValid();
}
public Object getAttribute(String name)
{
- return _request.getAttribute(name);
+ return request.getAttribute(name);
}
public void setAttribute(String name, Object value)
{
- _request.setAttribute(name, value);
+ request.setAttribute(name, value);
}
public String getServerName()
{
- return _request.getServerName();
+ return request.getServerName();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java Wed May 7 19:23:21 2008
@@ -19,6 +19,10 @@
/**
* Per-thread service that caches page instances for the duration of the request, and is also responsible for tracking
* the active page (the page which will ultimately render the response).
+ * <p/>
+ * <p/>
+ * Since {@link org.apache.tapestry.internal.structure.Page} is internal, most user-code should use the {@link
+ * org.apache.tapestry.services.ComponentSource} service instead.
*/
public interface RequestPageCache
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java Wed May 7 19:23:21 2008
@@ -15,36 +15,36 @@
package org.apache.tapestry.internal.services;
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.ioc.services.ThreadCleanupListener;
import java.util.Map;
public class RequestPageCacheImpl implements RequestPageCache, ThreadCleanupListener
{
- private final PagePool _pagePool;
+ private final PagePool pagePool;
/**
* Keyed on logical page name (case insensitive).
*/
- private final Map<String, Page> _cache = newCaseInsensitiveMap();
+ private final Map<String, Page> cache = CollectionFactory.newCaseInsensitiveMap();
public RequestPageCacheImpl(PagePool pagePool)
{
- _pagePool = pagePool;
+ this.pagePool = pagePool;
}
public Page get(String logicalPageName)
{
- Page page = _cache.get(logicalPageName);
+ Page page = cache.get(logicalPageName);
if (page == null)
{
- page = _pagePool.checkout(logicalPageName);
+ page = pagePool.checkout(logicalPageName);
page.attached();
- _cache.put(logicalPageName, page);
+ cache.put(logicalPageName, page);
}
return page;
@@ -56,7 +56,7 @@
*/
public void threadDidCleanup()
{
- for (Page p : _cache.values())
- _pagePool.release(p);
+ for (Page p : cache.values())
+ pagePool.release(p);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java Wed May 7 19:23:21 2008
@@ -22,9 +22,9 @@
public class RequestPathOptimizerImpl implements RequestPathOptimizer
{
- private final Request _request;
+ private final Request request;
- private final boolean _forceAbsolute;
+ private final boolean forceAbsolute;
/**
* Used to split a URI up into individual folder/file names. Any number of consecutive slashes is treated as a
@@ -37,20 +37,20 @@
@Symbol(TapestryConstants.FORCE_ABSOLUTE_URIS_SYMBOL)
boolean forceAbsolute)
{
- _request = request;
+ this.request = request;
- _forceAbsolute = forceAbsolute;
+ this.forceAbsolute = forceAbsolute;
}
public String optimizePath(String absolutePath)
{
- if (_forceAbsolute || _request.isXHR()) return absolutePath;
+ if (forceAbsolute || request.isXHR()) return absolutePath;
- String requestPath = _request.getPath();
+ String requestPath = request.getPath();
StringBuilder builder = new StringBuilder();
- builder.append(_request.getContextPath());
+ builder.append(request.getContextPath());
builder.append(requestPath);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java Wed May 7 19:23:21 2008
@@ -26,61 +26,61 @@
public class RequestSecurityManagerImpl implements RequestSecurityManager
{
- private final Request _request;
+ private final Request request;
- private final Response _response;
+ private final Response response;
- private final LinkFactory _linkFactory;
+ private final LinkFactory linkFactory;
- private final MetaDataLocator _locator;
+ private final MetaDataLocator locator;
- private final BaseURLSource _baseURLSource;
+ private final BaseURLSource baseURLSource;
- private final RequestPageCache _requestPageCache;
+ private final RequestPageCache requestPageCache;
public RequestSecurityManagerImpl(Request request, Response response, LinkFactory linkFactory,
MetaDataLocator locator, BaseURLSource baseURLSource,
RequestPageCache requestPageCache)
{
- _request = request;
- _response = response;
- _linkFactory = linkFactory;
- _locator = locator;
- _baseURLSource = baseURLSource;
- _requestPageCache = requestPageCache;
+ this.request = request;
+ this.response = response;
+ this.linkFactory = linkFactory;
+ this.locator = locator;
+ this.baseURLSource = baseURLSource;
+ this.requestPageCache = requestPageCache;
}
public boolean checkForInsecureRequest(String pageName) throws IOException
{
// We don't (at this time) redirect from secure to insecure, just form insecure to secure.
- if (_request.isSecure()) return false;
+ if (request.isSecure()) return false;
- Page page = _requestPageCache.get(pageName);
+ Page page = requestPageCache.get(pageName);
if (!isSecure(page)) return false;
// Page is secure but request is not, so redirect.
- Link link = _linkFactory.createPageLink(page, false);
+ Link link = linkFactory.createPageLink(page, false);
- _response.sendRedirect(link);
+ response.sendRedirect(link);
return true;
}
private boolean isSecure(Page page)
{
- return _locator.findMeta(TapestryConstants.SECURE_PAGE,
- page.getRootComponent().getComponentResources(), Boolean.class);
+ return locator.findMeta(TapestryConstants.SECURE_PAGE,
+ page.getRootComponent().getComponentResources(), Boolean.class);
}
public String getBaseURL(Page page)
{
boolean securePage = isSecure(page);
- if (securePage == _request.isSecure()) return null;
+ if (securePage == request.isSecure()) return null;
- return _baseURLSource.getBaseURL(securePage);
+ return baseURLSource.getBaseURL(securePage);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java Wed May 7 19:23:21 2008
@@ -18,7 +18,7 @@
import org.apache.tapestry.internal.events.UpdateListener;
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.services.ResourceDigestGenerator;
import java.net.URL;
@@ -27,25 +27,25 @@
public class ResourceCacheImpl extends InvalidationEventHubImpl implements ResourceCache,
UpdateListener
{
- private final URLChangeTracker _tracker;
+ private final URLChangeTracker tracker;
- private final ResourceDigestGenerator _digestGenerator;
+ private final ResourceDigestGenerator digestGenerator;
- private final Map<Resource, Cached> _cache = newConcurrentMap();
+ private final Map<Resource, Cached> cache = CollectionFactory.newConcurrentMap();
final static long MISSING_RESOURCE_TIME_MODIFIED = -1L;
private class Cached
{
- final boolean _requiresDigest;
+ final boolean requiresDigest;
- final String _digest;
+ final String digest;
- final long _timeModified;
+ final long timeModified;
Cached(Resource resource)
{
- _requiresDigest = _digestGenerator.requiresDigest(resource.getPath());
+ requiresDigest = digestGenerator.requiresDigest(resource.getPath());
URL url = resource.toURL();
@@ -55,25 +55,25 @@
// no underlying file exists. Subsequently, we'll strip out the digest and resolve
// to an actual resource.
- _digest = (_requiresDigest && url != null) ? _digestGenerator.generateDigest(url)
- : null;
+ digest = (requiresDigest && url != null) ? digestGenerator.generateDigest(url)
+ : null;
- _timeModified = url != null ? _tracker.add(url) : MISSING_RESOURCE_TIME_MODIFIED;
+ timeModified = url != null ? tracker.add(url) : MISSING_RESOURCE_TIME_MODIFIED;
}
}
public ResourceCacheImpl(final ResourceDigestGenerator digestGenerator)
{
- _digestGenerator = digestGenerator;
- _tracker = new URLChangeTracker(true);
+ this.digestGenerator = digestGenerator;
+ tracker = new URLChangeTracker(true);
}
public void checkForUpdates()
{
- if (_tracker.containsChanges())
+ if (tracker.containsChanges())
{
- _cache.clear();
- _tracker.clear();
+ cache.clear();
+ tracker.clear();
fireInvalidationEvent();
}
@@ -81,12 +81,12 @@
private Cached get(Resource resource)
{
- Cached result = _cache.get(resource);
+ Cached result = cache.get(resource);
if (result == null)
{
result = new Cached(resource);
- _cache.put(resource, result);
+ cache.put(resource, result);
}
return result;
@@ -94,17 +94,17 @@
public String getDigest(Resource resource)
{
- return get(resource)._digest;
+ return get(resource).digest;
}
public long getTimeModified(Resource resource)
{
- return get(resource)._timeModified;
+ return get(resource).timeModified;
}
public boolean requiresDigest(Resource resource)
{
- return get(resource)._requiresDigest;
+ return get(resource).requiresDigest;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java Wed May 7 19:23:21 2008
@@ -34,11 +34,11 @@
{
private static final int BUFFER_SIZE = 5000;
- private final Set<String> _digestExtensions;
+ private final Set<String> digestExtensions;
public ResourceDigestGeneratorImpl(Collection<String> configuration)
{
- _digestExtensions = CollectionFactory.newSet(configuration);
+ digestExtensions = CollectionFactory.newSet(configuration);
}
public String generateDigest(URL url)
@@ -93,7 +93,7 @@
int dotx = path.lastIndexOf('.');
String extension = path.substring(dotx + 1).toLowerCase();
- return _digestExtensions.contains(extension);
+ return digestExtensions.contains(extension);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java Wed May 7 19:23:21 2008
@@ -29,18 +29,18 @@
public class ResourceStreamerImpl implements ResourceStreamer
{
- private final Response _response;
+ private static final long TEN_YEARS = new TimeInterval("10y").milliseconds();
- private final Map<String, String> _configuration;
+ private static final int BUFFER_SIZE = 5000;
- private final int _bufferSize = 1000;
+ private final Response response;
- private static final long TEN_YEARS = new TimeInterval("10y").milliseconds();
+ private final Map<String, String> configuration;
public ResourceStreamerImpl(final Response response, Map<String, String> configuration)
{
- _response = response;
- _configuration = configuration;
+ this.response = response;
+ this.configuration = configuration;
}
public void streamResource(Resource resource) throws IOException
@@ -51,15 +51,15 @@
int contentLength = connection.getContentLength();
- if (contentLength >= 0) _response.setContentLength(contentLength);
+ if (contentLength >= 0) response.setContentLength(contentLength);
// Could get this from the ResourceCache, but can't imagine
// it's very expensive.
long lastModified = connection.getLastModified();
- _response.setDateHeader("Last-Modified", lastModified);
- _response.setDateHeader("Expires", lastModified + TEN_YEARS);
+ response.setDateHeader("Last-Modified", lastModified);
+ response.setDateHeader("Expires", lastModified + TEN_YEARS);
String contentType = connection.getContentType();
@@ -74,7 +74,7 @@
{
String extension = file.substring(dotx + 1);
- contentType = _configuration.get(extension);
+ contentType = configuration.get(extension);
}
if (contentType == null) contentType = "application/octet-stream";
@@ -88,9 +88,9 @@
is = new BufferedInputStream(connection.getInputStream());
- OutputStream os = _response.getOutputStream(contentType);
+ OutputStream os = response.getOutputStream(contentType);
- byte[] buffer = new byte[_bufferSize];
+ byte[] buffer = new byte[BUFFER_SIZE];
while (true)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java Wed May 7 19:23:21 2008
@@ -29,37 +29,37 @@
*/
public class ResponseImpl implements Response
{
- private final HttpServletResponse _response;
+ private final HttpServletResponse response;
public ResponseImpl(HttpServletResponse response)
{
Defense.notNull(response, "response");
- _response = response;
+ this.response = response;
}
public PrintWriter getPrintWriter(String contentType) throws IOException
{
notBlank(contentType, "contentType");
- _response.setContentType(contentType);
+ response.setContentType(contentType);
- return _response.getWriter();
+ return response.getWriter();
}
public String encodeURL(String URL)
{
- return _response.encodeURL(URL);
+ return response.encodeURL(URL);
}
public String encodeRedirectURL(String URL)
{
- return _response.encodeRedirectURL(URL);
+ return response.encodeRedirectURL(URL);
}
public void sendRedirect(String URL) throws IOException
{
- _response.sendRedirect(URL);
+ response.sendRedirect(URL);
}
public void sendRedirect(Link link) throws IOException
@@ -75,38 +75,38 @@
{
notBlank(contentType, "contentType");
- _response.setContentType(contentType);
+ response.setContentType(contentType);
- return _response.getOutputStream();
+ return response.getOutputStream();
}
public void sendError(int sc, String message) throws IOException
{
- _response.sendError(sc, message);
+ response.sendError(sc, message);
}
public void setContentLength(int length)
{
- _response.setContentLength(length);
+ response.setContentLength(length);
}
public void setDateHeader(String name, long date)
{
- _response.setDateHeader(name, date);
+ response.setDateHeader(name, date);
}
public void setHeader(String name, String value)
{
- _response.setHeader(name, value);
+ response.setHeader(name, value);
}
public void setIntHeader(String name, int value)
{
- _response.setIntHeader(name, value);
+ response.setIntHeader(name, value);
}
public boolean isCommitted()
{
- return _response.isCommitted();
+ return response.isCommitted();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseRendererImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseRendererImpl.java Wed May 7 19:23:21 2008
@@ -23,18 +23,18 @@
public class ResponseRendererImpl implements ResponseRenderer
{
- private final RequestPageCache _pageCache;
+ private final RequestPageCache pageCache;
- private final PageContentTypeAnalyzer _pageContentAnalyzer;
+ private final PageContentTypeAnalyzer pageContentAnalyzer;
- private final PageResponseRenderer _renderer;
+ private final PageResponseRenderer renderer;
public ResponseRendererImpl(RequestPageCache pageCache, PageContentTypeAnalyzer pageContentAnalyzer,
PageResponseRenderer renderer)
{
- _pageCache = pageCache;
- _pageContentAnalyzer = pageContentAnalyzer;
- _renderer = renderer;
+ this.pageCache = pageCache;
+ this.pageContentAnalyzer = pageContentAnalyzer;
+ this.renderer = renderer;
}
public ContentType findContentType(Object component)
@@ -43,15 +43,15 @@
String pageName = c.getComponentResources().getPageName();
- Page page = _pageCache.get(pageName);
+ Page page = pageCache.get(pageName);
- return _pageContentAnalyzer.findContentType(page);
+ return pageContentAnalyzer.findContentType(page);
}
public void renderPageMarkupResponse(String pageName) throws IOException
{
- Page page = _pageCache.get(pageName);
+ Page page = pageCache.get(pageName);
- _renderer.renderPageResponse(page);
+ renderer.renderPageResponse(page);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java Wed May 7 19:23:21 2008
@@ -24,19 +24,19 @@
/**
* Recognizes a request for the application root (i.e., "/") and handles this the same as a render request for the
- * "Start" page.
+ * "Start" page. Support for the Start page is kept for legacy purposes, Index pages are the correct approach.
*/
public class RootPathDispatcher implements Dispatcher
{
- private final ComponentClassResolver _componentClassResolver;
+ private static final EventContext EMPTY_CONTEXT = new EmptyEventContext();
- private final PageRenderRequestHandler _handler;
+ private final ComponentClassResolver componentClassResolver;
- private final String _startPageName;
+ private final PageRenderRequestHandler handler;
- private static final EventContext EMPTY_CONTEXT = new EmptyEventContext();
+ private final String startPageName;
- private final PageRenderRequestParameters _parameters;
+ private final PageRenderRequestParameters parameters;
public RootPathDispatcher(ComponentClassResolver componentClassResolver,
@@ -45,20 +45,20 @@
@Inject @Symbol("tapestry.start-page-name")
String startPageName)
{
- _componentClassResolver = componentClassResolver;
- _handler = handler;
- _startPageName = startPageName;
+ this.componentClassResolver = componentClassResolver;
+ this.handler = handler;
+ this.startPageName = startPageName;
- _parameters = new PageRenderRequestParameters(_startPageName, EMPTY_CONTEXT);
+ parameters = new PageRenderRequestParameters(this.startPageName, EMPTY_CONTEXT);
}
public boolean dispatch(Request request, final Response response) throws IOException
{
// Only match the root path
- if (request.getPath().equals("/") && _componentClassResolver.isPageName(_startPageName))
+ if (request.getPath().equals("/") && componentClassResolver.isPageName(startPageName))
{
- _handler.handle(_parameters);
+ handler.handle(parameters);
return true;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java Wed May 7 19:23:21 2008
@@ -26,18 +26,18 @@
*/
public class ServiceInjectionProvider implements InjectionProvider
{
- private final ObjectLocator _locator;
+ private final ObjectLocator locator;
public ServiceInjectionProvider(ObjectLocator locator)
{
- _locator = locator;
+ this.locator = locator;
}
@SuppressWarnings("unchecked")
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
ClassTransformation transformation, MutableComponentModel componentModel)
{
- Object inject = _locator.getService(fieldType);
+ Object inject = this.locator.getService(fieldType);
assert inject != null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java Wed May 7 19:23:21 2008
@@ -30,16 +30,16 @@
{
static final String PREFIX = "aso:";
- private final Request _request;
+ private final Request request;
public SessionApplicationStatePersistenceStrategy(Request request)
{
- _request = request;
+ this.request = request;
}
private Session getSession()
{
- return _request.getSession(true);
+ return request.getSession(true);
}
@SuppressWarnings("unchecked")
@@ -76,7 +76,7 @@
{
String key = buildKey(asoClass);
- Session session = _request.getSession(false);
+ Session session = request.getSession(false);
return session != null && session.getAttribute(key) != null;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java Wed May 7 19:23:21 2008
@@ -28,33 +28,33 @@
*/
public class SessionImpl implements Session
{
- private final HttpSession _session;
+ private final HttpSession session;
public SessionImpl(HttpSession session)
{
- _session = session;
+ this.session = session;
}
public Object getAttribute(String name)
{
- return _session.getAttribute(name);
+ return session.getAttribute(name);
}
public List<String> getAttributeNames()
{
- return InternalUtils.toList(_session.getAttributeNames());
+ return InternalUtils.toList(session.getAttributeNames());
}
public void setAttribute(String name, Object value)
{
- _session.setAttribute(name, value);
+ session.setAttribute(name, value);
}
public List<String> getAttributeNames(String prefix)
{
List<String> result = newList();
- Enumeration e = _session.getAttributeNames();
+ Enumeration e = session.getAttributeNames();
while (e.hasMoreElements())
{
String name = (String) e.nextElement();
@@ -69,17 +69,17 @@
public int getMaxInactiveInterval()
{
- return _session.getMaxInactiveInterval();
+ return session.getMaxInactiveInterval();
}
public void invalidate()
{
- _session.invalidate();
+ session.invalidate();
}
public void setMaxInactiveInterval(int seconds)
{
- _session.setMaxInactiveInterval(seconds);
+ session.setMaxInactiveInterval(seconds);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java Wed May 7 19:23:21 2008
@@ -27,11 +27,11 @@
*/
public class StaticFilesFilter implements RequestFilter
{
- private final Context _context;
+ private final Context context;
public StaticFilesFilter(Context context)
{
- _context = context;
+ this.context = context;
}
public boolean service(Request request, Response response, RequestHandler handler)
@@ -53,7 +53,7 @@
if (dotx > 0)
{
- URL url = _context.getResource(path);
+ URL url = context.getResource(path);
if (url != null)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java Wed May 7 19:23:21 2008
@@ -28,11 +28,11 @@
{
private static final int BUFFER_SIZE = 5000;
- private final Response _response;
+ private final Response response;
public StreamResponseResultProcessor(Response response)
{
- _response = response;
+ this.response = response;
}
public void processResultValue(StreamResponse streamResponse)
@@ -41,13 +41,13 @@
OutputStream os = null;
InputStream is = null;
- streamResponse.prepareResponse(_response);
+ streamResponse.prepareResponse(response);
try
{
is = new BufferedInputStream(streamResponse.getStream());
- os = _response.getOutputStream(streamResponse.getContentType());
+ os = response.getOutputStream(streamResponse.getContentType());
byte[] buffer = new byte[BUFFER_SIZE];
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java Wed May 7 19:23:21 2008
@@ -25,21 +25,21 @@
*/
public class StringResultProcessor implements ComponentEventResultProcessor<String>
{
- private final RequestPageCache _requestPageCache;
+ private final RequestPageCache requestPageCache;
- private final ActionRenderResponseGenerator _generator;
+ private final ActionRenderResponseGenerator generator;
public StringResultProcessor(RequestPageCache requestPageCache, ActionRenderResponseGenerator generator)
{
- _requestPageCache = requestPageCache;
- _generator = generator;
+ this.requestPageCache = requestPageCache;
+ this.generator = generator;
}
public void processResultValue(String value) throws IOException
{
- Page page = _requestPageCache.get(value);
+ Page page = requestPageCache.get(value);
- _generator.generateResponse(page);
+ generator.generateResponse(page);
}
}