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 08:31:41 UTC
svn commit: r654427 [1/2] - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry:
internal/test/ internal/transform/ internal/util/ json/ runtime/ services/
Author: hlship
Date: Wed May 7 23:31:40 2008
New Revision: 654427
URL: http://svn.apache.org/viewvc?rev=654427&view=rev
Log:
Remove leading underscores from field names
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PageLifecycleAnnotationWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RenderCommandWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64ObjectOutputStream.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Holder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MultiKey.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/NotificationEventCallback.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/SelectModelRenderer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/StringParameterBuilder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentEventException.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateContribution.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BeanBlockContribution.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/LibraryMapping.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PageRenderRequestParameters.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformUtils.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java Wed May 7 23:31:40 2008
@@ -24,11 +24,11 @@
*/
public class CodeEq implements IArgumentMatcher
{
- private final String _code;
+ private final String code;
public CodeEq(String input)
{
- _code = strip(input);
+ code = strip(input);
}
public boolean matches(Object argument)
@@ -36,13 +36,13 @@
String string = (String) argument;
String stripped = strip(string);
- return _code.equals(stripped);
+ return code.equals(stripped);
}
public void appendTo(StringBuffer buffer)
{
buffer.append("codeEq(");
- buffer.append(_code);
+ buffer.append(code);
buffer.append(")");
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java Wed May 7 23:31:40 2008
@@ -32,24 +32,24 @@
*/
public class PageLinkInvoker implements ComponentInvoker
{
- private final Registry _registry;
+ private final Registry registry;
- private final PageRenderRequestHandler _pageRenderRequestHandler;
+ private final PageRenderRequestHandler pageRenderRequestHandler;
- private final TestableMarkupWriterFactory _markupWriterFactory;
+ private final TestableMarkupWriterFactory markupWriterFactory;
- private final TestableResponse _response;
+ private final TestableResponse response;
- private final ContextValueEncoder _contextValueEncoder;
+ private final ContextValueEncoder contextValueEncoder;
public PageLinkInvoker(Registry registry)
{
- _registry = registry;
+ this.registry = registry;
- _pageRenderRequestHandler = _registry.getService(PageRenderRequestHandler.class);
- _markupWriterFactory = _registry.getService(TestableMarkupWriterFactory.class);
- _response = _registry.getService(TestableResponse.class);
- _contextValueEncoder = _registry.getService(ContextValueEncoder.class);
+ pageRenderRequestHandler = this.registry.getService(PageRenderRequestHandler.class);
+ markupWriterFactory = this.registry.getService(TestableMarkupWriterFactory.class);
+ response = this.registry.getService(TestableResponse.class);
+ contextValueEncoder = this.registry.getService(ContextValueEncoder.class);
}
/**
@@ -67,13 +67,13 @@
PageLinkTarget pageLinkTarget = (PageLinkTarget) target;
EventContext activationContext
- = new URLEventContext(_contextValueEncoder, invocation.getContext());
+ = new URLEventContext(contextValueEncoder, invocation.getContext());
PageRenderRequestParameters parameters = new PageRenderRequestParameters(pageLinkTarget.getPageName(),
activationContext);
- _pageRenderRequestHandler.handle(parameters);
+ pageRenderRequestHandler.handle(parameters);
- return _markupWriterFactory.getLatestMarkupWriter().getDocument();
+ return markupWriterFactory.getLatestMarkupWriter().getDocument();
}
catch (IOException ex)
{
@@ -81,9 +81,9 @@
}
finally
{
- _response.clear();
+ response.clear();
- _registry.cleanupThread();
+ registry.cleanupThread();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java Wed May 7 23:31:40 2008
@@ -19,7 +19,7 @@
import org.apache.tapestry.internal.services.ComponentInvocation;
import org.apache.tapestry.internal.services.ComponentInvocationMap;
import org.apache.tapestry.internal.services.NoOpComponentInvocationMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.test.PageTester;
import java.util.Map;
@@ -30,36 +30,36 @@
*/
public class PageTesterComponentInvocationMap implements ComponentInvocationMap
{
- private final Map<Element, Link> _elementToLink = newMap();
+ private final Map<Element, Link> elementToLink = CollectionFactory.newMap();
- private final Map<Link, ComponentInvocation> _linkToInvocation = newMap();
+ private final Map<Link, ComponentInvocation> linkToInvocation = CollectionFactory.newMap();
public void store(Element element, Link link)
{
- _elementToLink.put(element, link);
+ elementToLink.put(element, link);
}
public void store(Link link, ComponentInvocation invocation)
{
- _linkToInvocation.put(link, invocation);
+ linkToInvocation.put(link, invocation);
}
public void clear()
{
- _elementToLink.clear();
- _linkToInvocation.clear();
+ elementToLink.clear();
+ linkToInvocation.clear();
}
public ComponentInvocation get(Element element)
{
- Link link = _elementToLink.get(element);
+ Link link = elementToLink.get(element);
return get(link);
}
public ComponentInvocation get(Link link)
{
- return _linkToInvocation.get(link);
+ return linkToInvocation.get(link);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java Wed May 7 23:31:40 2008
@@ -24,11 +24,11 @@
public class PageTesterContext implements Context
{
- private final File _contextRoot;
+ private final File contextRoot;
public PageTesterContext(String contextRoot)
{
- _contextRoot = new File(TapestryTestConstants.MODULE_BASE_DIR, contextRoot);
+ this.contextRoot = new File(TapestryTestConstants.MODULE_BASE_DIR, contextRoot);
}
public String getInitParameter(String name)
@@ -38,7 +38,7 @@
public URL getResource(String path)
{
- File f = new File(_contextRoot + path);
+ File f = new File(contextRoot + path);
if (!f.exists() || !f.isFile())
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java Wed May 7 23:31:40 2008
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.test;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.Session;
@@ -24,11 +24,11 @@
public class PageTesterSession implements Session
{
- private final Map<String, Object> _attributes = newMap();
+ private final Map<String, Object> attributes = CollectionFactory.newMap();
public List<String> getAttributeNames()
{
- return InternalUtils.sortedKeys(_attributes);
+ return InternalUtils.sortedKeys(attributes);
}
public List<String> getAttributeNames(String prefix)
@@ -43,18 +43,18 @@
public Object getAttribute(String name)
{
- return _attributes.get(name);
+ return attributes.get(name);
}
public void setAttribute(String name, Object value)
{
if (value == null)
{
- _attributes.remove(name);
+ attributes.remove(name);
}
else
{
- _attributes.put(name, value);
+ attributes.put(name, value);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java Wed May 7 23:31:40 2008
@@ -23,16 +23,16 @@
public class TestableCookieSinkSource implements CookieSource, CookieSink
{
- private final Map<String, Cookie> _cookies = CollectionFactory.newMap();
+ private final Map<String, Cookie> cookies = CollectionFactory.newMap();
public Cookie[] getCookies()
{
- return _cookies.values().toArray(new Cookie[_cookies.size()]);
+ return cookies.values().toArray(new Cookie[cookies.size()]);
}
public void addCookie(Cookie cookie)
{
- _cookies.put(cookie.getName(), cookie);
+ cookies.put(cookie.getName(), cookie);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java Wed May 7 23:31:40 2008
@@ -24,28 +24,28 @@
@Scope(PERTHREAD_SCOPE)
public class TestableMarkupWriterFactoryImpl implements TestableMarkupWriterFactory
{
- private final MarkupWriterFactory _delegate;
+ private final MarkupWriterFactory delegate;
- private MarkupWriter _lastCreated;
+ private MarkupWriter lastCreated;
/**
* Using Core annotation to reference to framework-provided version, which this implementation wraps around.
*/
public TestableMarkupWriterFactoryImpl(@Core MarkupWriterFactory delegate)
{
- _delegate = delegate;
+ this.delegate = delegate;
}
public MarkupWriter getLatestMarkupWriter()
{
- return _lastCreated;
+ return lastCreated;
}
public MarkupWriter newMarkupWriter(ContentType contentType)
{
- MarkupWriter result = _delegate.newMarkupWriter(contentType);
+ MarkupWriter result = delegate.newMarkupWriter(contentType);
- _lastCreated = result;
+ lastCreated = result;
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java Wed May 7 23:31:40 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.test;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.Session;
@@ -24,13 +24,13 @@
public class TestableRequestImpl implements TestableRequest
{
- private final String _contextPath;
+ private final String contextPath;
- private final Map<String, String> _parameters = newMap();
+ private final Map<String, String> parameters = CollectionFactory.newMap();
- private final Map<String, Object> _attributes = newMap();
+ private final Map<String, Object> attributes = CollectionFactory.newMap();
- private Session _session;
+ private Session session;
public TestableRequestImpl()
{
@@ -39,7 +39,7 @@
public TestableRequestImpl(String contextPath)
{
- _contextPath = contextPath;
+ this.contextPath = contextPath;
}
private <T> T nyi(String methodName)
@@ -50,17 +50,17 @@
public void clear()
{
- _parameters.clear();
+ parameters.clear();
}
public void loadParameter(String parameterName, String parameterValue)
{
- _parameters.put(parameterName, parameterValue);
+ parameters.put(parameterName, parameterValue);
}
public void loadParameters(Map<String, String> parameterValues)
{
- _parameters.putAll(parameterValues);
+ parameters.putAll(parameterValues);
}
public long getDateHeader(String name)
@@ -86,7 +86,7 @@
public List<String> getParameterNames()
{
- return InternalUtils.sortedKeys(_parameters);
+ return InternalUtils.sortedKeys(parameters);
}
public String[] getParameters(String name)
@@ -103,21 +103,21 @@
public String getContextPath()
{
- return _contextPath;
+ return contextPath;
}
public String getParameter(String name)
{
- return _parameters.get(name);
+ return parameters.get(name);
}
public Session getSession(boolean create)
{
- if (!create) return _session;
+ if (!create) return session;
- if (_session == null) _session = new PageTesterSession();
+ if (session == null) session = new PageTesterSession();
- return _session;
+ return session;
}
public void setEncoding(String requestEncoding)
@@ -147,12 +147,12 @@
public Object getAttribute(String name)
{
- return _attributes.get(name);
+ return attributes.get(name);
}
public void setAttribute(String name, Object value)
{
- _attributes.put(name, value);
+ attributes.put(name, value);
}
public String getServerName()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java Wed May 7 23:31:40 2008
@@ -23,9 +23,9 @@
public class TestableResponseImpl implements TestableResponse
{
- private Link _link;
+ private Link link;
- private boolean _committed;
+ private boolean committed;
private void nyi(String methodName)
{
@@ -41,7 +41,7 @@
public PrintWriter getPrintWriter(String contentType) throws IOException
{
- _committed = true;
+ committed = true;
// Well, the output isn't accessible, but I guess we see that it could be generated from
// the DOM.
@@ -80,9 +80,9 @@
public void sendRedirect(Link link) throws IOException
{
- _committed = true;
+ committed = true;
- _link = link;
+ this.link = link;
}
public String encodeRedirectURL(String URL)
@@ -97,17 +97,17 @@
public Link getRedirectLink()
{
- return _link;
+ return link;
}
public boolean isCommitted()
{
- return _committed;
+ return committed;
}
public void clear()
{
- _committed = false;
- _link = null;
+ committed = false;
+ link = null;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/AbstractIncludeAssetWorker.java Wed May 7 23:31:40 2008
@@ -35,13 +35,14 @@
*/
public abstract class AbstractIncludeAssetWorker implements ComponentClassTransformWorker
{
- private final AssetSource _assetSource;
- private final SymbolSource _symbolSource;
+ private final AssetSource assetSource;
+
+ private final SymbolSource symbolSource;
public AbstractIncludeAssetWorker(AssetSource assetSource, SymbolSource symbolSource)
{
- _assetSource = assetSource;
- _symbolSource = symbolSource;
+ this.assetSource = assetSource;
+ this.symbolSource = symbolSource;
}
/**
@@ -59,7 +60,7 @@
for (String value : assetPaths)
{
- String expanded = _symbolSource.expandSymbols(value);
+ String expanded = symbolSource.expandSymbols(value);
paths.add(expanded);
}
@@ -76,7 +77,7 @@
for (String assetPath : paths)
{
- Asset asset = _assetSource.getAsset(model.getBaseResource(), assetPath, locale);
+ Asset asset = assetSource.getAsset(model.getBaseResource(), assetPath, locale);
handleAsset(asset);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ApplicationStateWorker.java Wed May 7 23:31:40 2008
@@ -32,15 +32,15 @@
*/
public class ApplicationStateWorker implements ComponentClassTransformWorker
{
- private final ApplicationStateManager _applicationStateManager;
+ private final ApplicationStateManager applicationStateManager;
- private final ComponentClassCache _componentClassCache;
+ private final ComponentClassCache componentClassCache;
public ApplicationStateWorker(ApplicationStateManager applicationStateManager,
ComponentClassCache componentClassCache)
{
- _applicationStateManager = applicationStateManager;
- _componentClassCache = componentClassCache;
+ this.applicationStateManager = applicationStateManager;
+ this.componentClassCache = componentClassCache;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -50,7 +50,7 @@
if (names.isEmpty()) return;
String managerFieldName = transformation.addInjectedField(ApplicationStateManager.class,
- "applicationStateManager", _applicationStateManager);
+ "applicationStateManager", applicationStateManager);
for (String fieldName : names)
{
@@ -62,7 +62,7 @@
{
String fieldType = transformation.getFieldType(fieldName);
- Class fieldClass = _componentClassCache.forName(fieldType);
+ Class fieldClass = componentClassCache.forName(fieldType);
String typeFieldName = transformation.addInjectedField(Class.class, fieldName + "_type", fieldClass);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/CachedWorker.java Wed May 7 23:31:40 2008
@@ -29,11 +29,11 @@
*/
public class CachedWorker implements ComponentClassTransformWorker
{
- private final BindingSource _bindingSource;
+ private final BindingSource bindingSource;
public CachedWorker(BindingSource bindingSource)
{
- _bindingSource = bindingSource;
+ this.bindingSource = bindingSource;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -70,7 +70,7 @@
String bindingSourceField = transformation.addInjectedField(BindingSource.class,
fieldName + "$bindingsource",
- _bindingSource);
+ bindingSource);
String body = String.format("%s = %s.newBinding(\"Watch expression\", %s, \"%s\", \"%s\");",
bindingField,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentLifecycleMethodWorker.java Wed May 7 23:31:40 2008
@@ -36,15 +36,15 @@
{
private static final String CHECK_ABORT_FLAG = "if ($2.isAborted()) return;";
- private final Class<? extends Annotation> _methodAnnotation;
+ private final Class<? extends Annotation> methodAnnotation;
- private final TransformMethodSignature _lifecycleMethodSignature;
+ private final TransformMethodSignature lifecycleMethodSignature;
- private final String _lifecycleMethodName;
+ private final String lifecycleMethodName;
- private final boolean _reverse;
+ private final boolean reverse;
- private final MethodInvocationBuilder _invocationBuilder = new MethodInvocationBuilder();
+ private final MethodInvocationBuilder invocationBuilder = new MethodInvocationBuilder();
/**
* Normal method invocation: parent class, then methods in ascending alphabetical order. Reverse order: method in
@@ -57,22 +57,22 @@
public ComponentLifecycleMethodWorker(TransformMethodSignature lifecycleMethodSignature,
Class<? extends Annotation> methodAnnotation, boolean reverse)
{
- _lifecycleMethodSignature = lifecycleMethodSignature;
- _methodAnnotation = methodAnnotation;
- _reverse = reverse;
- _lifecycleMethodName = lifecycleMethodSignature.getMethodName();
+ this.lifecycleMethodSignature = lifecycleMethodSignature;
+ this.methodAnnotation = methodAnnotation;
+ this.reverse = reverse;
+ lifecycleMethodName = lifecycleMethodSignature.getMethodName();
// If we ever add more parameters to the methods, then we can add more to the invocation
// builder.
// *Never* expose the Event parameter ($2), it is for internal use only.
- _invocationBuilder.addParameter(MarkupWriter.class.getName(), "$1");
+ invocationBuilder.addParameter(MarkupWriter.class.getName(), "$1");
}
@Override
public String toString()
{
- return String.format("ComponentLifecycleMethodWorker[%s]", _methodAnnotation.getName());
+ return String.format("ComponentLifecycleMethodWorker[%s]", methodAnnotation.getName());
}
public void transform(final ClassTransformation transformation, MutableComponentModel model)
@@ -85,14 +85,14 @@
// we don't
// include this filter, then we get endless loops.
- if (signature.equals(_lifecycleMethodSignature)) return false;
+ if (signature.equals(lifecycleMethodSignature)) return false;
// A degenerate case would be a method, say beginRender(), with an conflicting
// annotation, say @AfterRender. In that case, this code is broken, as the method
// will be invoked for both phases!
- return signature.getMethodName().equals(_lifecycleMethodName)
- || transformation.getMethodAnnotation(signature, _methodAnnotation) != null;
+ return signature.getMethodName().equals(lifecycleMethodName)
+ || transformation.getMethodAnnotation(signature, methodAnnotation) != null;
}
};
@@ -108,13 +108,13 @@
// If in a subclass, and in normal order mode, invoke the super class version first.
- if (!(_reverse || model.isRootClass()))
+ if (!(reverse || model.isRootClass()))
{
- builder.addln("super.%s($$);", _lifecycleMethodName);
+ builder.addln("super.%s($$);", lifecycleMethodName);
builder.addln(CHECK_ABORT_FLAG);
}
- Iterator<TransformMethodSignature> i = _reverse ? InternalUtils.reverseIterator(methods) : methods
+ Iterator<TransformMethodSignature> i = reverse ? InternalUtils.reverseIterator(methods) : methods
.iterator();
builder.addln("try");
@@ -125,7 +125,7 @@
// In reverse order in a a subclass, invoke the super method last.
- if (_reverse && !model.isRootClass()) builder.addln("super.%s($$);", _lifecycleMethodName);
+ if (reverse && !model.isRootClass()) builder.addln("super.%s($$);", lifecycleMethodName);
builder.end(); // try
@@ -142,7 +142,7 @@
// non-empty
// method "on top of it".
- transformation.addMethod(_lifecycleMethodSignature, builder.toString());
+ transformation.addMethod(lifecycleMethodSignature, builder.toString());
}
private void addMethodCallToBody(BodyBuilder builder, TransformMethodSignature sig,
@@ -164,7 +164,7 @@
// like how javac enables access to private members for inner classes (by introducing
// synthetic, static methods).
- builder.add(_invocationBuilder.buildMethodInvocation(sig, transformation));
+ builder.add(invocationBuilder.buildMethodInvocation(sig, transformation));
// Now, if non void ...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ComponentWorker.java Wed May 7 23:31:40 2008
@@ -36,11 +36,11 @@
*/
public class ComponentWorker implements ComponentClassTransformWorker
{
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
public ComponentWorker(final ComponentClassResolver resolver)
{
- _resolver = resolver;
+ this.resolver = resolver;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -98,7 +98,7 @@
for (String typeName : annotation.value())
{
- String mixinClassName = _resolver.resolveMixinTypeToClassName(typeName);
+ String mixinClassName = resolver.resolveMixinTypeToClassName(typeName);
model.addMixin(mixinClassName);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/EnvironmentalWorker.java Wed May 7 23:31:40 2008
@@ -30,11 +30,11 @@
*/
public class EnvironmentalWorker implements ComponentClassTransformWorker
{
- private final Environment _environment;
+ private final Environment environment;
public EnvironmentalWorker(Environment environment)
{
- _environment = environment;
+ this.environment = environment;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -51,7 +51,7 @@
String envField = transformation.addInjectedField(
Environment.class,
"environment",
- _environment);
+ environment);
for (String name : names)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeJavaScriptLibraryWorker.java Wed May 7 23:31:40 2008
@@ -28,15 +28,14 @@
*/
public class IncludeJavaScriptLibraryWorker extends AbstractIncludeAssetWorker
{
-
- private final PageRenderSupport _pageRenderSupport;
+ private final PageRenderSupport pageRenderSupport;
public IncludeJavaScriptLibraryWorker(AssetSource assetSource, PageRenderSupport pageRenderSupport,
SymbolSource symbolSource)
{
super(assetSource, symbolSource);
- _pageRenderSupport = pageRenderSupport;
+ this.pageRenderSupport = pageRenderSupport;
}
public void transform(ClassTransformation transformation, final MutableComponentModel model)
@@ -48,6 +47,6 @@
protected void handleAsset(Asset asset)
{
- _pageRenderSupport.addScriptLink(asset);
+ pageRenderSupport.addScriptLink(asset);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/IncludeStylesheetWorker.java Wed May 7 23:31:40 2008
@@ -28,15 +28,14 @@
*/
public class IncludeStylesheetWorker extends AbstractIncludeAssetWorker
{
-
- private final PageRenderSupport _pageRenderSupport;
+ private final PageRenderSupport pageRenderSupport;
public IncludeStylesheetWorker(AssetSource assetSource, PageRenderSupport pageRenderSupport,
SymbolSource symbolSource)
{
super(assetSource, symbolSource);
- _pageRenderSupport = pageRenderSupport;
+ this.pageRenderSupport = pageRenderSupport;
}
public void transform(ClassTransformation transformation, final MutableComponentModel model)
@@ -49,6 +48,6 @@
protected void handleAsset(Asset asset)
{
- _pageRenderSupport.addStylesheetLink(asset, null);
+ pageRenderSupport.addStylesheetLink(asset, null);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectComponentWorker.java Wed May 7 23:31:40 2008
@@ -28,7 +28,6 @@
*/
public class InjectComponentWorker implements ComponentClassTransformWorker
{
-
public void transform(ClassTransformation transformation,
MutableComponentModel model)
{
@@ -55,6 +54,5 @@
transformation.extendMethod(TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE, body);
}
-
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectPageWorker.java Wed May 7 23:31:40 2008
@@ -18,11 +18,7 @@
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.util.BodyBuilder;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.ComponentSource;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry.services.*;
import java.lang.reflect.Modifier;
import java.util.List;
@@ -34,14 +30,14 @@
*/
public class InjectPageWorker implements ComponentClassTransformWorker
{
- private final ComponentSource _componentSource;
+ private final ComponentSource componentSource;
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
public InjectPageWorker(ComponentSource componentSource, ComponentClassResolver resolver)
{
- _componentSource = componentSource;
- _resolver = resolver;
+ this.componentSource = componentSource;
+ this.resolver = resolver;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -50,10 +46,10 @@
if (names.isEmpty()) return;
- String componentSource = transformation.addInjectedField(ComponentSource.class, "_componentSource",
- _componentSource);
-
-
+ String componentSource = transformation.addInjectedField(ComponentSource.class, "componentSource",
+ this.componentSource);
+
+
for (String name : names)
addInjectedPage(transformation, name, componentSource);
@@ -68,7 +64,7 @@
String fieldType = transformation.getFieldType(fieldName);
String methodName = transformation.newMemberName("read_inject_page", fieldName);
- String injectedPageName = InternalUtils.isBlank(pageName) ? _resolver
+ String injectedPageName = InternalUtils.isBlank(pageName) ? resolver
.resolvePageClassNameToPageName(fieldType) : pageName;
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, fieldType, methodName, null,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/InjectWorker.java Wed May 7 23:31:40 2008
@@ -30,16 +30,16 @@
*/
public class InjectWorker implements ComponentClassTransformWorker
{
- private final ObjectLocator _locator;
+ private final ObjectLocator locator;
// Really, a chain of command
- private final InjectionProvider _injectionProvider;
+ private final InjectionProvider injectionProvider;
public InjectWorker(ObjectLocator locator, InjectionProvider injectionProvider)
{
- _locator = locator;
- _injectionProvider = injectionProvider;
+ this.locator = locator;
+ this.injectionProvider = injectionProvider;
}
public final void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -54,10 +54,10 @@
Class type = transformation.toClass(fieldType);
- boolean success = _injectionProvider.provideInjection(
+ boolean success = injectionProvider.provideInjection(
fieldName,
type,
- _locator,
+ locator,
transformation,
model);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/LogWorker.java Wed May 7 23:31:40 2008
@@ -30,11 +30,11 @@
*/
public class LogWorker implements ComponentClassTransformWorker
{
- private final ExceptionTracker _exceptionTracker;
+ private final ExceptionTracker exceptionTracker;
public LogWorker(ExceptionTracker exceptionTracker)
{
- _exceptionTracker = exceptionTracker;
+ this.exceptionTracker = exceptionTracker;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -44,7 +44,7 @@
if (signatures.isEmpty()) return;
// Re-use the logging advice from LoggingDecorator
- final MethodAdvice loggingAdvice = new LoggingAdvice(model.getLogger(), _exceptionTracker);
+ final MethodAdvice loggingAdvice = new LoggingAdvice(model.getLogger(), exceptionTracker);
// ... but wrap it for use at the component level.
ComponentMethodAdvice advice = new ComponentMethodAdvice()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/MixinWorker.java Wed May 7 23:31:40 2008
@@ -31,11 +31,11 @@
*/
public class MixinWorker implements ComponentClassTransformWorker
{
- private final ComponentClassResolver _resolver;
+ private final ComponentClassResolver resolver;
public MixinWorker(final ComponentClassResolver resolver)
{
- _resolver = resolver;
+ this.resolver = resolver;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
@@ -50,7 +50,7 @@
String fieldType = transformation.getFieldType(fieldName);
- String mixinClassName = InternalUtils.isBlank(mixinType) ? fieldType : _resolver
+ String mixinClassName = InternalUtils.isBlank(mixinType) ? fieldType : resolver
.resolveMixinTypeToClassName(mixinType);
model.addMixinClassName(mixinClassName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PageLifecycleAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PageLifecycleAnnotationWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PageLifecycleAnnotationWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PageLifecycleAnnotationWorker.java Wed May 7 23:31:40 2008
@@ -29,21 +29,21 @@
*/
public class PageLifecycleAnnotationWorker implements ComponentClassTransformWorker
{
- private final Class<? extends Annotation> _methodAnnotationClass;
+ private final Class<? extends Annotation> methodAnnotationClass;
- private final TransformMethodSignature _lifecycleMethodSignature;
+ private final TransformMethodSignature lifecycleMethodSignature;
- private final String _methodAlias;
+ private final String methodAlias;
- private final MethodInvocationBuilder _invocationBuilder = new MethodInvocationBuilder();
+ private final MethodInvocationBuilder invocationBuilder = new MethodInvocationBuilder();
public PageLifecycleAnnotationWorker(final Class<? extends Annotation> methodAnnotationClass,
final TransformMethodSignature lifecycleMethodSignature,
final String methodAlias)
{
- _methodAnnotationClass = methodAnnotationClass;
- _lifecycleMethodSignature = lifecycleMethodSignature;
- _methodAlias = methodAlias;
+ this.methodAnnotationClass = methodAnnotationClass;
+ this.lifecycleMethodSignature = lifecycleMethodSignature;
+ this.methodAlias = methodAlias;
}
public void transform(final ClassTransformation transformation, MutableComponentModel model)
@@ -52,10 +52,10 @@
{
public boolean accept(TransformMethodSignature signature)
{
- if (signature.getMethodName().equals(_methodAlias))
+ if (signature.getMethodName().equals(methodAlias))
return true;
- return transformation.getMethodAnnotation(signature, _methodAnnotationClass) != null;
+ return transformation.getMethodAnnotation(signature, methodAnnotationClass) != null;
}
};
@@ -69,9 +69,9 @@
// moment, we just invoke the method anyway, and ignore the result. Also, MethodInvocationBuilder
// is very forgiving (and silent) about unexpected parameters (passing null/0/false).
- String body = _invocationBuilder.buildMethodInvocation(signature, transformation);
+ String body = invocationBuilder.buildMethodInvocation(signature, transformation);
- transformation.extendMethod(_lifecycleMethodSignature, body + ";");
+ transformation.extendMethod(lifecycleMethodSignature, body + ";");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/ParameterWorker.java Wed May 7 23:31:40 2008
@@ -34,11 +34,11 @@
{
private static final String BIND_METHOD_NAME = ParameterWorker.class.getName() + ".bind";
- private final BindingSource _bindingSource;
+ private final BindingSource bindingSource;
public ParameterWorker(BindingSource bindingSource)
{
- _bindingSource = bindingSource;
+ this.bindingSource = bindingSource;
}
public void transform(final ClassTransformation transformation, MutableComponentModel model)
@@ -159,7 +159,7 @@
builder.addln("if (! %s.isBound(\"%s\"))", resourcesFieldName, parameterName);
String bindingFactoryFieldName = transformation.addInjectedField(BindingSource.class, "bindingSource",
- _bindingSource);
+ bindingSource);
builder
.addln(" %s.bindParameter(\"%s\", %s.newBinding(\"default %2$s\", %1$s, \"%s\", \"%s\"));",
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RenderCommandWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RenderCommandWorker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RenderCommandWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/RenderCommandWorker.java Wed May 7 23:31:40 2008
@@ -30,9 +30,9 @@
*/
public class RenderCommandWorker implements ComponentClassTransformWorker
{
- private final TransformMethodSignature RENDER_SIGNATURE = new TransformMethodSignature(Modifier.PUBLIC, "void",
- "render", new String[] {
- MarkupWriter.class.getName(), RenderQueue.class.getName() }, null);
+ private final TransformMethodSignature RENDER_SIGNATURE =
+ new TransformMethodSignature(Modifier.PUBLIC, "void", "render", new String[] {
+ MarkupWriter.class.getName(), RenderQueue.class.getName() }, null);
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64ObjectOutputStream.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64ObjectOutputStream.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64ObjectOutputStream.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64ObjectOutputStream.java Wed May 7 23:31:40 2008
@@ -27,13 +27,13 @@
*/
public class Base64ObjectOutputStream extends ObjectOutputStream
{
- private final Base64OutputStream _output;
+ private final Base64OutputStream output;
private Base64ObjectOutputStream(Base64OutputStream output) throws IOException
{
super(new BufferedOutputStream(new GZIPOutputStream(output)));
- _output = output;
+ this.output = output;
}
public Base64ObjectOutputStream() throws IOException
@@ -43,6 +43,6 @@
public String toBase64()
{
- return _output.toBase64();
+ return output.toBase64();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Holder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Holder.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Holder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Holder.java Wed May 7 23:31:40 2008
@@ -25,21 +25,21 @@
*/
public class Holder<T>
{
- private T _held;
+ private T held;
public void put(T object)
{
- _held = object;
+ held = object;
}
public T get()
{
- return _held;
+ return held;
}
public boolean hasValue()
{
- return _held != null;
+ return held != null;
}
public static <T> Holder<T> create()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java Wed May 7 23:31:40 2008
@@ -22,21 +22,21 @@
*/
public final class IntegerRange implements Iterable<Integer>
{
- private final int _start;
+ private final int start;
- private final int _finish;
+ private final int finish;
private class RangeIterator implements Iterator<Integer>
{
private final int _increment;
- private int _value = _start;
+ private int _value = start;
private boolean _hasNext = true;
RangeIterator()
{
- _increment = _start < _finish ? +1 : -1;
+ _increment = start < finish ? +1 : -1;
}
public boolean hasNext()
@@ -50,7 +50,7 @@
int result = _value;
- _hasNext = _value != _finish;
+ _hasNext = _value != finish;
_value += _increment;
@@ -66,24 +66,24 @@
public IntegerRange(final int start, final int finish)
{
- _start = start;
- _finish = finish;
+ this.start = start;
+ this.finish = finish;
}
public int getFinish()
{
- return _finish;
+ return finish;
}
public int getStart()
{
- return _start;
+ return start;
}
@Override
public String toString()
{
- return String.format("%d..%d", _start, _finish);
+ return String.format("%d..%d", start, finish);
}
/**
@@ -100,9 +100,9 @@
{
final int PRIME = 31;
- int result = PRIME + _finish;
+ int result = PRIME + finish;
- result = PRIME * result + _start;
+ result = PRIME * result + start;
return result;
}
@@ -117,9 +117,9 @@
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
final IntegerRange other = (IntegerRange) obj;
- if (_finish != other._finish) return false;
+ if (finish != other.finish) return false;
- return _start == other._start;
+ return start == other.start;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java Wed May 7 23:31:40 2008
@@ -27,7 +27,7 @@
*/
public final class MethodInvocationBuilder
{
- private final Map<String, ParameterBuilder> _builders = CollectionFactory.newMap();
+ private final Map<String, ParameterBuilder> builders = CollectionFactory.newMap();
/**
* Maps a parameter type to a {@link ParameterBuilder}.
@@ -36,7 +36,7 @@
{
// TODO: Name conflicts
- _builders.put(parameterType, builder);
+ builders.put(parameterType, builder);
}
/**
@@ -74,7 +74,7 @@
String type = parameterTypes[i];
- ParameterBuilder parameterBuilder = _builders.get(type);
+ ParameterBuilder parameterBuilder = builders.get(type);
if (parameterBuilder == null)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MultiKey.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MultiKey.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MultiKey.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MultiKey.java Wed May 7 23:31:40 2008
@@ -24,9 +24,9 @@
{
private static final int PRIME = 31;
- private final Object[] _values;
+ private final Object[] values;
- private final int _hashCode;
+ private final int hashCode;
/**
* Creates a new instance from the provided values. It is assumed that the values provided are good map keys
@@ -36,15 +36,15 @@
*/
public MultiKey(Object... values)
{
- _values = values;
+ this.values = values;
- _hashCode = PRIME * Arrays.hashCode(_values);
+ hashCode = PRIME * Arrays.hashCode(this.values);
}
@Override
public int hashCode()
{
- return _hashCode;
+ return hashCode;
}
@Override
@@ -58,7 +58,7 @@
return false;
final MultiKey other = (MultiKey) obj;
- return Arrays.equals(_values, other._values);
+ return Arrays.equals(values, other.values);
}
@Override
@@ -68,7 +68,7 @@
boolean first = true;
- for (Object o : _values)
+ for (Object o : values)
{
if (!first)
builder.append(", ");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/NotificationEventCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/NotificationEventCallback.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/NotificationEventCallback.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/NotificationEventCallback.java Wed May 7 23:31:40 2008
@@ -22,14 +22,14 @@
*/
public class NotificationEventCallback implements ComponentEventCallback
{
- private final String _eventType;
+ private final String eventType;
- private final String _completeId;
+ private final String completeId;
public NotificationEventCallback(String eventType, String completeId)
{
- _eventType = eventType;
- _completeId = completeId;
+ this.eventType = eventType;
+ this.completeId = completeId;
}
public boolean handleResult(Object result)
@@ -37,7 +37,7 @@
if (result instanceof Boolean) return ((Boolean) result);
throw new IllegalArgumentException(
- UtilMessages.noReturnValueAccepted(_eventType, _completeId, result));
+ UtilMessages.noReturnValueAccepted(eventType, completeId, result));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java Wed May 7 23:31:40 2008
@@ -18,23 +18,23 @@
import java.io.StringWriter;
/**
- * Utility for collecting the output of a {@link PrintWriter}.
+ * Utility for collecting the output of a {@link java.io.PrintWriter}.
*/
public class PrintOutCollector
{
- private final StringWriter _stringWriter;
+ private final StringWriter stringWriter;
- private PrintWriter _printWriter;
+ private PrintWriter printWriter;
public PrintOutCollector()
{
- _stringWriter = new StringWriter();
- _printWriter = new PrintWriter(_stringWriter);
+ stringWriter = new StringWriter();
+ printWriter = new PrintWriter(stringWriter);
}
public PrintWriter getPrintWriter()
{
- return _printWriter;
+ return printWriter;
}
/**
@@ -42,8 +42,8 @@
*/
public String getPrintOut()
{
- _printWriter.close();
- return _stringWriter.toString();
+ printWriter.close();
+ return stringWriter.toString();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/SelectModelRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/SelectModelRenderer.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/SelectModelRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/SelectModelRenderer.java Wed May 7 23:31:40 2008
@@ -20,19 +20,19 @@
public class SelectModelRenderer implements SelectModelVisitor
{
- private final MarkupWriter _writer;
+ private final MarkupWriter writer;
- private final ValueEncoder _encoder;
+ private final ValueEncoder encoder;
public SelectModelRenderer(final MarkupWriter writer, ValueEncoder encoder)
{
- _writer = writer;
- _encoder = encoder;
+ this.writer = writer;
+ this.encoder = encoder;
}
public void beginOptionGroup(OptionGroupModel groupModel)
{
- _writer.element("optgroup", "label", groupModel.getLabel());
+ writer.element("optgroup", "label", groupModel.getLabel());
writeDisabled(groupModel.isDisabled());
writeAttributes(groupModel.getAttributes());
@@ -40,7 +40,7 @@
public void endOptionGroup(OptionGroupModel groupModel)
{
- _writer.end(); // select
+ writer.end(); // select
}
@SuppressWarnings("unchecked")
@@ -48,23 +48,23 @@
{
Object optionValue = optionModel.getValue();
- String clientValue = _encoder.toClient(optionValue);
+ String clientValue = encoder.toClient(optionValue);
- _writer.element("option", "value", clientValue);
+ writer.element("option", "value", clientValue);
- if (isOptionSelected(optionModel, clientValue)) _writer.attributes("selected", "selected");
+ if (isOptionSelected(optionModel, clientValue)) writer.attributes("selected", "selected");
writeDisabled(optionModel.isDisabled());
writeAttributes(optionModel.getAttributes());
- _writer.write(optionModel.getLabel());
+ writer.write(optionModel.getLabel());
- _writer.end();
+ writer.end();
}
private void writeDisabled(boolean disabled)
{
- if (disabled) _writer.attributes("disabled", "disabled");
+ if (disabled) writer.attributes("disabled", "disabled");
}
private void writeAttributes(Map<String, String> attributes)
@@ -72,7 +72,7 @@
if (attributes == null) return;
for (Map.Entry<String, String> e : attributes.entrySet())
- _writer.attributes(e.getKey(), e.getValue());
+ writer.attributes(e.getKey(), e.getValue());
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/StringParameterBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/StringParameterBuilder.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/StringParameterBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/StringParameterBuilder.java Wed May 7 23:31:40 2008
@@ -24,21 +24,21 @@
*/
public final class StringParameterBuilder implements ParameterBuilder
{
- private final String _expression;
+ private final String expression;
public StringParameterBuilder(String expression)
{
- _expression = expression;
+ this.expression = expression;
}
public String buildParameter(ClassTransformation transformation)
{
- return _expression;
+ return expression;
}
@Override
public String toString()
{
- return format("StringParameterBuilder[%s]", _expression);
+ return format("StringParameterBuilder[%s]", expression);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java Wed May 7 23:31:40 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.io.File;
import java.io.IOException;
@@ -33,9 +33,9 @@
{
private static final long FILE_DOES_NOT_EXIST_TIMESTAMP = -1L;
- private final Map<File, Long> _fileToTimestamp = newConcurrentMap();
+ private final Map<File, Long> fileToTimestamp = CollectionFactory.newConcurrentMap();
- private final boolean _granularitySeconds;
+ private final boolean granularitySeconds;
/**
* Creates a new URL change tracker with millisecond-level granularity.
@@ -52,7 +52,7 @@
*/
public URLChangeTracker(boolean granularitySeconds)
{
- _granularitySeconds = granularitySeconds;
+ this.granularitySeconds = granularitySeconds;
}
/**
@@ -71,21 +71,21 @@
File resourceFile = toFile(url);
- if (_fileToTimestamp.containsKey(resourceFile)) return _fileToTimestamp.get(resourceFile);
+ if (fileToTimestamp.containsKey(resourceFile)) return fileToTimestamp.get(resourceFile);
long timestamp = readTimestamp(resourceFile);
// A quick and imperfect fix for TAPESTRY-1918. When a file
// is added, add the directory containing the file as well.
- _fileToTimestamp.put(resourceFile, timestamp);
+ fileToTimestamp.put(resourceFile, timestamp);
File dir = resourceFile.getParentFile();
- if (!_fileToTimestamp.containsKey(dir))
+ if (!fileToTimestamp.containsKey(dir))
{
long dirTimestamp = readTimestamp(dir);
- _fileToTimestamp.put(dir, dirTimestamp);
+ fileToTimestamp.put(dir, dirTimestamp);
}
@@ -127,7 +127,7 @@
*/
public void clear()
{
- _fileToTimestamp.clear();
+ fileToTimestamp.clear();
}
/**
@@ -141,7 +141,7 @@
// concurrently, but CheckForUpdatesFilter ensures that it will be invoked
// synchronously.
- for (Map.Entry<File, Long> entry : _fileToTimestamp.entrySet())
+ for (Map.Entry<File, Long> entry : fileToTimestamp.entrySet())
{
long newTimestamp = readTimestamp(entry.getKey());
long current = entry.getValue();
@@ -172,7 +172,7 @@
// are only accurate to one second. The extra level of detail creates false positives
// for changes, and undermines HTTP response caching in the client.
- if (_granularitySeconds) return timestamp - (timestamp % 1000);
+ if (granularitySeconds) return timestamp - (timestamp % 1000);
return timestamp;
}
@@ -182,7 +182,7 @@
*/
public void forceChange()
{
- for (Map.Entry<File, Long> e : _fileToTimestamp.entrySet())
+ for (Map.Entry<File, Long> e : fileToTimestamp.entrySet())
{
e.setValue(0l);
}
@@ -193,7 +193,7 @@
*/
int trackedFileCount()
{
- return _fileToTimestamp.size();
+ return fileToTimestamp.size();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java Wed May 7 23:31:40 2008
@@ -79,7 +79,7 @@
/**
* The arrayList where the JSONArray's properties are kept.
*/
- private final List<Object> _list = CollectionFactory.newList();
+ private final List<Object> list = CollectionFactory.newList();
/**
* Construct an empty JSONArray.
@@ -128,12 +128,12 @@
if (tokenizer.nextClean() == ',')
{
tokenizer.back();
- _list.add(null);
+ list.add(null);
}
else
{
tokenizer.back();
- _list.add(tokenizer.nextValue());
+ list.add(tokenizer.nextValue());
}
switch (tokenizer.nextClean())
@@ -165,7 +165,7 @@
*/
public Object get(int index)
{
- return _list.get(index);
+ return list.get(index);
}
/**
@@ -322,7 +322,7 @@
{
if (i > 0) buffer.append(separator);
- buffer.append(JSONObject.valueToString(_list.get(i)));
+ buffer.append(JSONObject.valueToString(list.get(i)));
}
return buffer.toString();
@@ -335,7 +335,7 @@
*/
public int length()
{
- return _list.size();
+ return list.size();
}
/**
@@ -351,7 +351,7 @@
JSONObject.testValidity(value);
- _list.add(value);
+ list.add(value);
return this;
}
@@ -379,13 +379,13 @@
if (index < length())
{
- _list.set(index, value);
+ list.set(index, value);
}
else
{
- while (index != length()) _list.add(JSONObject.NULL);
+ while (index != length()) list.add(JSONObject.NULL);
- _list.add(value);
+ list.add(value);
}
@@ -416,7 +416,7 @@
Object[] toArray()
{
- return _list.toArray();
+ return list.toArray();
}
@Override
@@ -428,6 +428,6 @@
JSONArray other = (JSONArray) obj;
- return _list.equals(other._list);
+ return list.equals(other.list);
}
}
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java Wed May 7 23:31:40 2008
@@ -135,7 +135,7 @@
/**
* The map where the JSONObject's properties are kept.
*/
- private final Map<String, Object> _properties = CollectionFactory.newMap();
+ private final Map<String, Object> properties = CollectionFactory.newMap();
/**
* It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to use Java's
@@ -498,7 +498,7 @@
*/
public boolean has(String key)
{
- return _properties.containsKey(key);
+ return properties.containsKey(key);
}
/**
@@ -519,7 +519,7 @@
*/
public Set<String> keys()
{
- return _properties.keySet();
+ return properties.keySet();
}
/**
@@ -529,7 +529,7 @@
*/
public int length()
{
- return _properties.size();
+ return properties.size();
}
/**
@@ -587,7 +587,7 @@
*/
public Object opt(String key)
{
- return _properties.get(key);
+ return properties.get(key);
}
/**
@@ -607,7 +607,7 @@
if (value != null)
{
testValidity(value);
- _properties.put(key, value);
+ properties.put(key, value);
}
else
{
@@ -697,7 +697,7 @@
*/
public Object remove(String key)
{
- return _properties.remove(key);
+ return properties.remove(key);
}
private static final Class[] ALLOWED = new Class[] { String.class, Boolean.class, Number.class, JSONObject.class,
@@ -778,7 +778,7 @@
buffer.append(quote(key));
buffer.append(':');
- buffer.append(valueToString(_properties.get(key)));
+ buffer.append(valueToString(properties.get(key)));
comma = true;
}
@@ -849,6 +849,6 @@
JSONObject other = (JSONObject) obj;
- return _properties.equals(other._properties);
+ return properties.equals(other.properties);
}
}
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java Wed May 7 23:31:40 2008
@@ -51,12 +51,12 @@
/**
* The index of the next character.
*/
- private int _index;
+ private int index;
/**
* The source string being tokenized.
*/
- private final String _source;
+ private final String source;
/**
* Construct a JSONTokener from a string.
@@ -67,8 +67,8 @@
{
assert source != null;
- _index = 0;
- _source = source;
+ index = 0;
+ this.source = source;
}
/**
@@ -77,9 +77,9 @@
*/
public void back()
{
- if (_index > 0)
+ if (index > 0)
{
- _index -= 1;
+ index -= 1;
}
}
@@ -113,7 +113,7 @@
*/
public boolean more()
{
- return _index < _source.length();
+ return index < source.length();
}
/**
@@ -125,7 +125,7 @@
{
if (more())
{
- return _source.charAt(_index++);
+ return source.charAt(index++);
}
return 0;
@@ -157,14 +157,14 @@
*/
public String next(int n)
{
- int i = _index;
+ int i = index;
int j = i + n;
- if (j >= _source.length())
+ if (j >= source.length())
{
throw syntaxError("Substring bounds error");
}
- _index += n;
- return _source.substring(i, j);
+ index += n;
+ return source.substring(i, j);
}
/**
@@ -472,13 +472,13 @@
public char skipTo(char to)
{
char c;
- int index = _index;
+ int index = this.index;
do
{
c = next();
if (c == 0)
{
- _index = index;
+ this.index = index;
return c;
}
} while (c != to);
@@ -493,13 +493,13 @@
*/
public boolean skipPast(String to)
{
- _index = _source.indexOf(to, _index);
- if (_index < 0)
+ index = source.indexOf(to, index);
+ if (index < 0)
{
- _index = _source.length();
+ index = source.length();
return false;
}
- _index += to.length();
+ index += to.length();
return true;
}
@@ -523,6 +523,6 @@
@Override
public String toString()
{
- return " at character " + _index + " of " + _source;
+ return " at character " + index + " of " + source;
}
}
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentEventException.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentEventException.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentEventException.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentEventException.java Wed May 7 23:31:40 2008
@@ -25,9 +25,9 @@
*/
public class ComponentEventException extends TapestryException
{
- private final String _eventType;
+ private final String eventType;
- private final EventContext _context;
+ private final EventContext context;
/**
* @param message exception message
@@ -41,17 +41,17 @@
{
super(message, location, cause);
- _eventType = eventType;
- _context = context;
+ this.eventType = eventType;
+ this.context = context;
}
public String getEventType()
{
- return _eventType;
+ return eventType;
}
public EventContext getContext()
{
- return _context;
+ return context;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java?rev=654427&r1=654426&r2=654427&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java Wed May 7 23:31:40 2008
@@ -24,11 +24,11 @@
*/
public final class AliasContribution<T>
{
- private final Class<T> _contributionType;
+ private final Class<T> contributionType;
- private final String _mode;
+ private final String mode;
- private final T _object;
+ private final T object;
/**
* Simplifies the creation of an AliasContribution around a known type and instance of that type.
@@ -56,9 +56,9 @@
public AliasContribution(Class<T> contributionType, String mode, T object)
{
- _contributionType = notNull(contributionType, "contributionClass");
- _mode = notNull(mode, "mode");
- _object = notNull(object, "object");
+ this.contributionType = notNull(contributionType, "contributionClass");
+ this.mode = notNull(mode, "mode");
+ this.object = notNull(object, "object");
}
/**
@@ -68,12 +68,12 @@
*/
public String getMode()
{
- return _mode;
+ return mode;
}
public Class<T> getContributionType()
{
- return _contributionType;
+ return contributionType;
}
/**
@@ -81,7 +81,7 @@
*/
public T getObject()
{
- return _object;
+ return object;
}
@Override
@@ -90,11 +90,11 @@
StringBuilder builder = new StringBuilder();
Formatter formatter = new Formatter(builder);
- formatter.format("<AliasContribution: %s", _contributionType.getName());
+ formatter.format("<AliasContribution: %s", contributionType.getName());
- if (InternalUtils.isNonBlank(_mode)) formatter.format(" mode:%s", _mode);
+ if (InternalUtils.isNonBlank(mode)) formatter.format(" mode:%s", mode);
- formatter.format(" %s>", _object);
+ formatter.format(" %s>", object);
return builder.toString();
}