You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/08 04:23:23 UTC
svn commit: r654390 [1/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...
Author: hlship
Date: Wed May 7 19:23:21 2008
New Revision: 654390
URL: http://svn.apache.org/viewvc?rev=654390&view=rev
Log:
Remove leading underscores from field names
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/HeartbeatImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/IgnoredPathsFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InheritedBinding.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InvocationBuilder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocalizationSetterImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MapMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MarkupWriterImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodCompileException.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MethodInvocationInfo.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/NullFieldStrategySourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageContentTypeAnalyzerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLinkTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLocator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolCache.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderQueueImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderRequestHandlerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageRenderSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageTemplateLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestErrorFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestGlobalsImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCache.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPageCacheImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestPathOptimizerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestSecurityManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceDigestGeneratorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResponseRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServiceInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategy.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/SessionImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StaticFilesFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StreamResponseResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/StringResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TypeCoercedValueEncoderFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationConstraintGeneratorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidatorSpecification.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValueEncoderSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/BlockImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/CommentPageElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/DTDPageElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ExpansionPageElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageResourcesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StartElementPageElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PropertyConduitSource.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/overview.apt
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java Wed May 7 19:23:21 2008
@@ -15,14 +15,13 @@
package org.apache.tapestry;
import org.apache.commons.codec.net.URLCodec;
-import org.apache.tapestry.services.Dispatcher;
import java.util.List;
/**
* A link is the Tapestry representation of a URL or URI that triggers dynamic behavior. This link is in three parts: a
* path portion, an optional anchor, and a set of query parameters. A request for a link will ultimately be recognized
- * by a {@link Dispatcher}.
+ * by a {@link org.apache.tapestry.services.Dispatcher}.
* <p/>
* Query parameter values are kept separate from the path portion to support encoding those values into hidden form
* fields (where appropriate).
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java Wed May 7 19:23:21 2008
@@ -26,16 +26,16 @@
*/
public class GenericValueEncoderFactory<V> implements ValueEncoderFactory<V>
{
- private final ValueEncoder<V> _encoder;
+ private final ValueEncoder<V> encoder;
public GenericValueEncoderFactory(ValueEncoder<V> encoder)
{
- _encoder = encoder;
+ this.encoder = encoder;
}
public ValueEncoder<V> create(Class<V> type)
{
- return _encoder;
+ return encoder;
}
public static <V> GenericValueEncoderFactory<V> create(ValueEncoder<V> encoder)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/HeartbeatImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/HeartbeatImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/HeartbeatImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/HeartbeatImpl.java Wed May 7 19:23:21 2008
@@ -24,26 +24,26 @@
public class HeartbeatImpl implements Heartbeat
{
- private final Stack<List<Runnable>> _stack = newStack();
+ private final Stack<List<Runnable>> stack = newStack();
public void begin()
{
List<Runnable> beat = CollectionFactory.newList();
- _stack.push(beat);
+ stack.push(beat);
}
public void defer(Runnable command)
{
Defense.notNull(command, "command");
- _stack.peek().add(command);
+ stack.peek().add(command);
}
public void end()
{
- List<Runnable> beat = _stack.pop();
+ List<Runnable> beat = stack.pop();
for (Runnable r : beat)
r.run();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/IgnoredPathsFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/IgnoredPathsFilter.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/IgnoredPathsFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/IgnoredPathsFilter.java Wed May 7 19:23:21 2008
@@ -25,11 +25,11 @@
public class IgnoredPathsFilter implements HttpServletRequestFilter
{
- private final Pattern[] _ignoredPatterns;
+ private final Pattern[] ignoredPatterns;
public IgnoredPathsFilter(Collection<String> configuration)
{
- _ignoredPatterns = new Pattern[configuration.size()];
+ ignoredPatterns = new Pattern[configuration.size()];
int i = 0;
@@ -37,7 +37,7 @@
{
Pattern p = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
- _ignoredPatterns[i++] = p;
+ ignoredPatterns[i++] = p;
}
}
@@ -52,7 +52,7 @@
if (pathInfo != null) path += pathInfo;
- for (Pattern p : _ignoredPatterns)
+ for (Pattern p : ignoredPatterns)
{
if (p.matcher(path).matches()) return false;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseFilter.java Wed May 7 19:23:21 2008
@@ -23,17 +23,17 @@
public class ImmediateActionRenderResponseFilter implements ComponentEventRequestFilter
{
- private final Request _request;
+ private final Request request;
- private final Response _response;
+ private final Response response;
- private final PageResponseRenderer _renderer;
+ private final PageResponseRenderer renderer;
public ImmediateActionRenderResponseFilter(Request request, PageResponseRenderer renderer, Response response)
{
- _request = request;
- _renderer = renderer;
- _response = response;
+ this.request = request;
+ this.renderer = renderer;
+ this.response = response;
}
public void handle(ComponentEventRequestParameters parameters, ComponentEventRequestHandler handler)
@@ -43,12 +43,12 @@
// If markup or a redirect has already been generated, then we're good.
- if (_response.isCommitted()) return;
+ if (response.isCommitted()) return;
// Otherwise, we should be operating in immediate mode. Figure out which page
// was selected to render.
- Page page = (Page) _request.getAttribute(InternalConstants.IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE);
+ Page page = (Page) request.getAttribute(InternalConstants.IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE);
if (page != null)
{
@@ -56,7 +56,7 @@
page.getRootElement().triggerEvent(TapestryConstants.ACTIVATE_EVENT, new Object[0], null);
- _renderer.renderPageResponse(page);
+ renderer.renderPageResponse(page);
return;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InheritedBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InheritedBinding.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InheritedBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InheritedBinding.java Wed May 7 19:23:21 2008
@@ -27,29 +27,29 @@
*/
public class InheritedBinding extends BaseLocatable implements Binding
{
- private final String _toString;
+ private final String toString;
- private final Binding _binding;
+ private final Binding binding;
public InheritedBinding(String toString, Binding binding, Location location)
{
super(location);
- _toString = toString;
- _binding = binding;
+ this.toString = toString;
+ this.binding = binding;
}
@Override
public String toString()
{
- return _toString;
+ return toString;
}
public Object get()
{
try
{
- return _binding.get();
+ return binding.get();
}
catch (Exception ex)
{
@@ -61,7 +61,7 @@
{
try
{
- return _binding.getBindingType();
+ return binding.getBindingType();
}
catch (Exception ex)
{
@@ -73,7 +73,7 @@
{
try
{
- return _binding.isInvariant();
+ return binding.isInvariant();
}
catch (Exception ex)
{
@@ -85,7 +85,7 @@
{
try
{
- _binding.set(value);
+ binding.set(value);
}
catch (Exception ex)
{
@@ -97,7 +97,7 @@
{
try
{
- return _binding.getAnnotation(annotationClass);
+ return binding.getAnnotation(annotationClass);
}
catch (Exception ex)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Wed May 7 19:23:21 2008
@@ -49,78 +49,80 @@
*/
public final class InternalClassTransformationImpl implements InternalClassTransformation
{
- private boolean _frozen;
+ private static final int INIT_BUFFER_SIZE = 100;
- private final CtClass _ctClass;
+ private boolean frozen;
- private final Logger _logger;
+ private final CtClass ctClass;
- private final InternalClassTransformation _parentTransformation;
+ private final Logger logger;
- private ClassPool _classPool;
+ private final InternalClassTransformation parentTransformation;
- private final IdAllocator _idAllocator;
+ private final ClassPool classPool;
+
+ private final IdAllocator idAllocator;
/**
* Map, keyed on InjectKey, of field name.
*/
- private final Map<MultiKey, String> _injectionCache = newMap();
+ private final Map<MultiKey, String> injectionCache = newMap();
/**
* Map from a field to the annotation objects for that field.
*/
- private Map<String, List<Annotation>> _fieldAnnotations = newMap();
+ private Map<String, List<Annotation>> fieldAnnotations = newMap();
/**
* Used to identify fields that have been "claimed" by other annotations.
*/
- private Map<String, Object> _claimedFields = newMap();
+ private Map<String, Object> claimedFields = newMap();
- private Set<String> _addedFieldNames = newSet();
+ private Set<String> addedFieldNames = newSet();
- private Set<CtBehavior> _addedMethods = newSet();
+ private Set<CtBehavior> addedMethods = newSet();
// Cache of class annotations
- private List<Annotation> _classAnnotations;
+ private List<Annotation> classAnnotations;
// Cache of method annotations
- private Map<CtMethod, List<Annotation>> _methodAnnotations = newMap();
+ private Map<CtMethod, List<Annotation>> methodAnnotations = newMap();
- private Map<CtMethod, TransformMethodSignature> _methodSignatures = newMap();
+ private Map<CtMethod, TransformMethodSignature> methodSignatures = newMap();
- private Map<TransformMethodSignature, InvocationBuilder> _methodToInvocationBuilder = CollectionFactory.newMap();
+ private Map<TransformMethodSignature, InvocationBuilder> methodToInvocationBuilder = CollectionFactory.newMap();
// Key is field name, value is expression used to replace read access
- private Map<String, String> _fieldReadTransforms;
+ private Map<String, String> fieldReadTransforms;
// Key is field name, value is expression used to replace read access
- private Map<String, String> _fieldWriteTransforms;
+ private Map<String, String> fieldWriteTransforms;
- private Set<String> _removedFieldNames;
+ private Set<String> removedFieldNames;
/**
* Contains the assembled Javassist code for the class' default constructor.
*/
- private StringBuilder _constructor = new StringBuilder();
+ private StringBuilder constructor = new StringBuilder(INIT_BUFFER_SIZE);
- private final List<ConstructorArg> _constructorArgs;
+ private final List<ConstructorArg> constructorArgs;
- private final ComponentModel _componentModel;
+ private final ComponentModel componentModel;
- private final String _resourcesFieldName;
+ private final String resourcesFieldName;
- private final StringBuilder _description = new StringBuilder();
+ private final StringBuilder description = new StringBuilder(INIT_BUFFER_SIZE);
- private Formatter _formatter = new Formatter(_description);
+ private Formatter formatter = new Formatter(description);
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final ComponentClassCache _componentClassCache;
+ private final ComponentClassCache componentClassCache;
- private final CtClassSource _classSource;
+ private final CtClassSource classSource;
/**
* Signature for newInstance() method of Instantiator.
@@ -160,32 +162,32 @@
ComponentClassCache componentClassCache,
ComponentModel componentModel, CtClassSource classSource)
{
- _ctClass = ctClass;
- _componentClassCache = componentClassCache;
- _classSource = classSource;
- _classPool = _ctClass.getClassPool();
- _classFactory = classFactory;
- _parentTransformation = null;
- _componentModel = componentModel;
+ this.ctClass = ctClass;
+ this.componentClassCache = componentClassCache;
+ this.classSource = classSource;
+ classPool = this.ctClass.getClassPool();
+ this.classFactory = classFactory;
+ parentTransformation = null;
+ this.componentModel = componentModel;
- _idAllocator = new IdAllocator();
+ idAllocator = new IdAllocator();
- _logger = componentModel.getLogger();
+ logger = componentModel.getLogger();
preloadMemberNames();
- _constructorArgs = newList();
- _constructor.append("{\n");
+ constructorArgs = newList();
+ constructor.append("{\n");
addImplementedInterface(Component.class);
- _resourcesFieldName = addInjectedFieldUncached(InternalComponentResources.class, "resources", null);
+ resourcesFieldName = addInjectedFieldUncached(InternalComponentResources.class, "resources", null);
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC | Modifier.FINAL,
ComponentResources.class.getName(),
"getComponentResources", null, null);
- addMethod(sig, "return " + _resourcesFieldName + ";");
+ addMethod(sig, "return " + resourcesFieldName + ";");
// The "}" will be added later, inside finish().
}
@@ -198,79 +200,77 @@
ComponentClassCache componentClassCache,
ComponentModel componentModel)
{
- _ctClass = ctClass;
- _componentClassCache = componentClassCache;
- _classSource = classSource;
- _classPool = _ctClass.getClassPool();
- _classFactory = classFactory;
- _logger = componentModel.getLogger();
- _parentTransformation = parentTransformation;
- _componentModel = componentModel;
+ this.ctClass = ctClass;
+ this.componentClassCache = componentClassCache;
+ this.classSource = classSource;
+ classPool = this.ctClass.getClassPool();
+ this.classFactory = classFactory;
+ logger = componentModel.getLogger();
+ this.parentTransformation = parentTransformation;
+ this.componentModel = componentModel;
- _resourcesFieldName = parentTransformation.getResourcesFieldName();
+ resourcesFieldName = parentTransformation.getResourcesFieldName();
- _idAllocator = parentTransformation.getIdAllocator();
+ idAllocator = parentTransformation.getIdAllocator();
preloadMemberNames();
- _constructorArgs = parentTransformation.getConstructorArgs();
+ constructorArgs = parentTransformation.getConstructorArgs();
- int count = _constructorArgs.size();
+ int count = constructorArgs.size();
// Build the call to the super-constructor.
- _constructor.append("{ super(");
+ constructor.append("{ super(");
for (int i = 1; i <= count; i++)
{
- if (i > 1) _constructor.append(", ");
+ if (i > 1) constructor.append(", ");
// $0 is implicitly self, so the 0-index ConstructorArg will be Javassisst
// pseudeo-variable $1, and so forth.
- _constructor.append("$");
- _constructor.append(i);
+ constructor.append("$");
+ constructor.append(i);
}
- _constructor.append(");\n");
+ constructor.append(");\n");
// The "}" will be added later, inside finish().
}
public InternalClassTransformation createChildTransformation(CtClass childClass, MutableComponentModel childModel)
{
- return new InternalClassTransformationImpl(childClass, this, _classFactory, _classSource, _componentClassCache,
+ return new InternalClassTransformationImpl(childClass, this, classFactory, classSource, componentClassCache,
childModel
);
}
private void freeze()
{
- _frozen = true;
+ frozen = true;
// Free up stuff we don't need after freezing.
// Everything else should be final.
- _fieldAnnotations = null;
- _claimedFields = null;
- _addedFieldNames = null;
- _addedMethods = null;
- _classAnnotations = null;
- _methodAnnotations = null;
- _methodSignatures = null;
- _fieldReadTransforms = null;
- _fieldWriteTransforms = null;
- _removedFieldNames = null;
- _constructor = null;
- _formatter = null;
- // _ctClass = null; -- needed by toString()
- _classPool = null;
- _methodToInvocationBuilder = null;
+ fieldAnnotations = null;
+ claimedFields = null;
+ addedFieldNames = null;
+ addedMethods = null;
+ classAnnotations = null;
+ methodAnnotations = null;
+ methodSignatures = null;
+ fieldReadTransforms = null;
+ fieldWriteTransforms = null;
+ removedFieldNames = null;
+ constructor = null;
+ formatter = null;
+ methodToInvocationBuilder = null;
}
public String getResourcesFieldName()
{
- return _resourcesFieldName;
+ return resourcesFieldName;
}
/**
@@ -279,19 +279,19 @@
private void preloadMemberNames()
{
- addMemberNames(_ctClass.getDeclaredFields());
- addMemberNames(_ctClass.getDeclaredMethods());
+ addMemberNames(ctClass.getDeclaredFields());
+ addMemberNames(ctClass.getDeclaredMethods());
}
void verifyFields()
{
List<String> names = newList();
- for (CtField field : _ctClass.getDeclaredFields())
+ for (CtField field : ctClass.getDeclaredFields())
{
String name = field.getName();
- if (_addedFieldNames.contains(name)) continue;
+ if (addedFieldNames.contains(name)) continue;
int modifiers = field.getModifiers();
@@ -320,7 +320,7 @@
{
for (CtMember member : members)
{
- _idAllocator.allocateId(member.getName());
+ idAllocator.allocateId(member.getName());
}
}
@@ -339,7 +339,7 @@
CtMethod method = findMethod(signature);
- if (method == null) throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(_ctClass, signature));
+ if (method == null) throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(ctClass, signature));
List<Annotation> annotations = findMethodAnnotations(method);
@@ -372,12 +372,12 @@
private List<Annotation> findFieldAnnotations(String fieldName)
{
- List<Annotation> annotations = _fieldAnnotations.get(fieldName);
+ List<Annotation> annotations = fieldAnnotations.get(fieldName);
if (annotations == null)
{
annotations = findAnnotationsForField(fieldName);
- _fieldAnnotations.put(fieldName, annotations);
+ fieldAnnotations.put(fieldName, annotations);
}
return annotations;
@@ -385,13 +385,13 @@
private List<Annotation> findMethodAnnotations(CtMethod method)
{
- List<Annotation> annotations = _methodAnnotations.get(method);
+ List<Annotation> annotations = methodAnnotations.get(method);
if (annotations == null)
{
annotations = extractAnnotations(method);
- _methodAnnotations.put(method, annotations);
+ methodAnnotations.put(method, annotations);
}
return annotations;
@@ -433,11 +433,11 @@
{
try
{
- return _ctClass.getDeclaredField(fieldName);
+ return ctClass.getDeclaredField(fieldName);
}
catch (NotFoundException ex)
{
- throw new RuntimeException(ServicesMessages.missingDeclaredField(_ctClass, fieldName), ex);
+ throw new RuntimeException(ServicesMessages.missingDeclaredField(ctClass, fieldName), ex);
}
}
@@ -447,7 +447,7 @@
String memberName = InternalUtils.createMemberName(notBlank(suggested, "suggested"));
- return _idAllocator.allocateId(memberName);
+ return idAllocator.allocateId(memberName);
}
public String newMemberName(String prefix, String baseName)
@@ -463,13 +463,13 @@
try
{
- CtClass ctInterface = _classPool.get(interfaceName);
+ CtClass ctInterface = classPool.get(interfaceName);
if (classImplementsInterface(ctInterface)) return;
implementDefaultMethodsForInterface(ctInterface);
- _ctClass.addInterface(ctInterface);
+ ctClass.addInterface(ctInterface);
}
catch (NotFoundException ex)
@@ -515,7 +515,7 @@
try
{
- CtMethod newMethod = CtNewMethod.copy(method, _ctClass, null);
+ CtMethod newMethod = CtNewMethod.copy(method, ctClass, null);
// Methods from interfaces are always public. We definitely
// need to change the modifiers of the method so that
@@ -528,7 +528,7 @@
newMethod.setBody(null);
- _ctClass.addMethod(newMethod);
+ ctClass.addMethod(newMethod);
TransformMethodSignature sig = getMethodSignature(newMethod);
@@ -536,7 +536,7 @@
}
catch (CannotCompileException ex)
{
- throw new RuntimeException(ServicesMessages.errorAddingMethod(_ctClass, method
+ throw new RuntimeException(ServicesMessages.errorAddingMethod(ctClass, method
.getName(), ex), ex);
}
@@ -551,7 +551,7 @@
private boolean classImplementsInterface(CtClass ctInterface) throws NotFoundException
{
- for (CtClass current = _ctClass; current != null; current = current.getSuperclass())
+ for (CtClass current = ctClass; current != null; current = current.getSuperclass())
{
for (CtClass anInterface : current.getInterfaces())
{
@@ -569,18 +569,18 @@
failIfFrozen();
- Object existing = _claimedFields.get(fieldName);
+ Object existing = claimedFields.get(fieldName);
if (existing != null)
{
- String message = ServicesMessages.fieldAlreadyClaimed(fieldName, _ctClass, existing, tag);
+ String message = ServicesMessages.fieldAlreadyClaimed(fieldName, ctClass, existing, tag);
throw new RuntimeException(message);
}
// TODO: Ensure that fieldName is a known field?
- _claimedFields.put(fieldName, tag);
+ claimedFields.put(fieldName, tag);
}
public void addMethod(TransformMethodSignature signature, String methodBody)
@@ -602,13 +602,13 @@
try
{
- CtMethod existing = _ctClass.getDeclaredMethod(signature.getMethodName(), parameters);
+ CtMethod existing = ctClass.getDeclaredMethod(signature.getMethodName(), parameters);
if (existing != null)
{
action = "replace" + suffix;
- _ctClass.removeMethod(existing);
+ ctClass.removeMethod(existing);
}
}
catch (NotFoundException ex)
@@ -622,7 +622,7 @@
try
{
- CtMethod method = new CtMethod(returnType, signature.getMethodName(), parameters, _ctClass);
+ CtMethod method = new CtMethod(returnType, signature.getMethodName(), parameters, ctClass);
// TODO: Check for duplicate method add
@@ -631,9 +631,9 @@
method.setBody(methodBody);
method.setExceptionTypes(exceptions);
- _ctClass.addMethod(method);
+ ctClass.addMethod(method);
- if (addAsNew) _addedMethods.add(method);
+ if (addAsNew) addedMethods.add(method);
}
catch (CannotCompileException ex)
{
@@ -667,7 +667,7 @@
{
try
{
- return _classPool.get(type);
+ return classPool.get(type);
}
catch (NotFoundException ex)
{
@@ -693,7 +693,7 @@
addMethodToDescription("extend", methodSignature, methodBody);
- _addedMethods.add(method);
+ addedMethods.add(method);
}
public void extendExistingMethod(TransformMethodSignature methodSignature, String methodBody)
@@ -726,7 +726,7 @@
try
{
- CtMethod method = new CtMethod(returnType, newMethodName, parameters, _ctClass);
+ CtMethod method = new CtMethod(returnType, newMethodName, parameters, ctClass);
method.setModifiers(modifiers);
@@ -734,7 +734,7 @@
method.setBody(source, null);
- _ctClass.addMethod(method);
+ ctClass.addMethod(method);
}
catch (CannotCompileException ex)
@@ -751,7 +751,7 @@
// The new method is *not* considered an added method, so field references inside the method
// will be transformed.
- _formatter.format("\n%s renamed to %s\n\n", sourceMethod, newMethodName);
+ formatter.format("\n%s renamed to %s\n\n", sourceMethod, newMethodName);
}
public void addCatch(TransformMethodSignature methodSignature, String exceptionType, String body)
@@ -796,29 +796,29 @@
private void addMethodToDescription(String operation, TransformMethodSignature methodSignature, String methodBody)
{
- _formatter.format("%s method: %s %s %s(", operation, Modifier.toString(methodSignature
+ formatter.format("%s method: %s %s %s(", operation, Modifier.toString(methodSignature
.getModifiers()), methodSignature.getReturnType(), methodSignature.getMethodName());
String[] parameterTypes = methodSignature.getParameterTypes();
for (int i = 0; i < parameterTypes.length; i++)
{
- if (i > 0) _description.append(", ");
+ if (i > 0) description.append(", ");
- _formatter.format("%s $%d", parameterTypes[i], i + 1);
+ formatter.format("%s $%d", parameterTypes[i], i + 1);
}
- _description.append(")");
+ description.append(")");
String[] exceptionTypes = methodSignature.getExceptionTypes();
for (int i = 0; i < exceptionTypes.length; i++)
{
- if (i == 0) _description.append("\n throws ");
- else _description.append(", ");
+ if (i == 0) description.append("\n throws ");
+ else description.append(", ");
- _description.append(exceptionTypes[i]);
+ description.append(exceptionTypes[i]);
}
- _formatter.format("\n%s\n\n", methodBody);
+ formatter.format("\n%s\n\n", methodBody);
}
private CtMethod findMethod(TransformMethodSignature methodSignature)
@@ -831,12 +831,12 @@
if (result != null) return result;
- throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(_ctClass, methodSignature));
+ throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(ctClass, methodSignature));
}
private CtMethod findDeclaredMethod(TransformMethodSignature methodSignature)
{
- for (CtMethod method : _ctClass.getDeclaredMethods())
+ for (CtMethod method : ctClass.getDeclaredMethods())
{
if (match(method, methodSignature)) return method;
}
@@ -848,7 +848,7 @@
{
try
{
- for (CtClass current = _ctClass; current != null; current = current.getSuperclass())
+ for (CtClass current = ctClass; current != null; current = current.getSuperclass())
{
for (CtMethod method : current.getDeclaredMethods())
{
@@ -857,8 +857,8 @@
// TODO: If the moethod is not overridable (i.e. private, or final)?
// Perhaps we should limit it to just public methods.
- CtMethod newMethod = CtNewMethod.delegator(method, _ctClass);
- _ctClass.addMethod(newMethod);
+ CtMethod newMethod = CtNewMethod.delegator(method, ctClass);
+ ctClass.addMethod(newMethod);
return newMethod;
}
@@ -951,13 +951,13 @@
try
{
- for (CtField field : _ctClass.getDeclaredFields())
+ for (CtField field : ctClass.getDeclaredFields())
{
if (!isInstanceField(field)) continue;
String fieldName = field.getName();
- if (skipClaimedFields && _claimedFields.containsKey(fieldName)) continue;
+ if (skipClaimedFields && claimedFields.containsKey(fieldName)) continue;
if (filter.accept(fieldName, field.getType().getName())) result.add(fieldName);
@@ -979,7 +979,7 @@
List<TransformMethodSignature> result = newList();
- for (CtMethod method : _ctClass.getDeclaredMethods())
+ for (CtMethod method : ctClass.getDeclaredMethods())
{
List<Annotation> annotations = findMethodAnnotations(method);
@@ -1001,7 +1001,7 @@
List<TransformMethodSignature> result = newList();
- for (CtMethod method : _ctClass.getDeclaredMethods())
+ for (CtMethod method : ctClass.getDeclaredMethods())
{
TransformMethodSignature sig = getMethodSignature(method);
@@ -1015,7 +1015,7 @@
private TransformMethodSignature getMethodSignature(CtMethod method)
{
- TransformMethodSignature result = _methodSignatures.get(method);
+ TransformMethodSignature result = methodSignatures.get(method);
if (result == null)
{
try
@@ -1027,7 +1027,7 @@
result = new TransformMethodSignature(method.getModifiers(), type, method.getName(), parameters,
exceptions);
- _methodSignatures.put(method, result);
+ methodSignatures.put(method, result);
}
catch (NotFoundException ex)
{
@@ -1056,12 +1056,12 @@
Set<String> skipped = newSet();
- skipped.addAll(_claimedFields.keySet());
- skipped.addAll(_addedFieldNames);
+ skipped.addAll(claimedFields.keySet());
+ skipped.addAll(addedFieldNames);
- if (_removedFieldNames != null) skipped.addAll(_removedFieldNames);
+ if (removedFieldNames != null) skipped.addAll(removedFieldNames);
- for (CtField field : _ctClass.getDeclaredFields())
+ for (CtField field : ctClass.getDeclaredFields())
{
if (!isInstanceField(field)) continue;
@@ -1101,7 +1101,7 @@
try
{
- CtField field = _ctClass.getDeclaredField(fieldName);
+ CtField field = ctClass.getDeclaredField(fieldName);
return isInstanceField(field);
}
@@ -1117,7 +1117,7 @@
try
{
- return _ctClass.getDeclaredField(fieldName).getModifiers();
+ return ctClass.getDeclaredField(fieldName).getModifiers();
}
catch (NotFoundException ex)
{
@@ -1129,7 +1129,7 @@
{
try
{
- CtField field = _ctClass.getDeclaredField(fieldName);
+ CtField field = ctClass.getDeclaredField(fieldName);
return field.getType();
}
@@ -1149,10 +1149,10 @@
{
CtClass ctType = convertNameToCtType(type);
- CtField field = new CtField(ctType, fieldName, _ctClass);
+ CtField field = new CtField(ctType, fieldName, ctClass);
field.setModifiers(modifiers);
- _ctClass.addField(field);
+ ctClass.addField(field);
}
catch (NotFoundException ex)
{
@@ -1163,10 +1163,10 @@
throw new RuntimeException(ex);
}
- _formatter
+ formatter
.format("add field: %s %s %s;\n\n", Modifier.toString(modifiers), type, fieldName);
- _addedFieldNames.add(fieldName);
+ addedFieldNames.add(fieldName);
return fieldName;
}
@@ -1189,7 +1189,7 @@
// Remember the injection in-case this class, or a subclass, injects the value again.
- _injectionCache.put(key, fieldName);
+ injectionCache.put(key, fieldName);
return fieldName;
}
@@ -1205,7 +1205,7 @@
try
{
- ctType = _classPool.get(type.getName());
+ ctType = classPool.get(type.getName());
}
catch (NotFoundException ex)
{
@@ -1216,18 +1216,18 @@
addInjectToConstructor(fieldName, ctType, value);
- _addedFieldNames.add(fieldName);
+ addedFieldNames.add(fieldName);
return fieldName;
}
public String searchForPreviousInjection(MultiKey key)
{
- String result = _injectionCache.get(key);
+ String result = injectionCache.get(key);
if (result != null) return result;
- if (_parentTransformation != null) return _parentTransformation.searchForPreviousInjection(key);
+ if (parentTransformation != null) return parentTransformation.searchForPreviousInjection(key);
return null;
}
@@ -1237,12 +1237,12 @@
Defense.notNull(methodSignature, "methodSignature");
Defense.notNull(advice, "advice");
- InvocationBuilder builder = _methodToInvocationBuilder.get(methodSignature);
+ InvocationBuilder builder = methodToInvocationBuilder.get(methodSignature);
if (builder == null)
{
- builder = new InvocationBuilder(this, _componentClassCache, methodSignature, _classSource);
- _methodToInvocationBuilder.put(methodSignature, builder);
+ builder = new InvocationBuilder(this, componentClassCache, methodSignature, classSource);
+ methodToInvocationBuilder.put(methodSignature, builder);
}
builder.addAdvice(advice);
@@ -1257,9 +1257,9 @@
*/
private void addInjectToConstructor(String fieldName, CtClass fieldType, Object value)
{
- _constructorArgs.add(new ConstructorArg(fieldType, value));
+ constructorArgs.add(new ConstructorArg(fieldType, value));
- extendConstructor(format(" %s = $%d;", fieldName, _constructorArgs.size()));
+ extendConstructor(format(" %s = $%d;", fieldName, constructorArgs.size()));
}
public void injectField(String fieldName, Object value)
@@ -1277,14 +1277,14 @@
private CtClass convertNameToCtType(String type) throws NotFoundException
{
- return _classPool.get(type);
+ return classPool.get(type);
}
public void finish()
{
failIfFrozen();
- for (InvocationBuilder builder : _methodToInvocationBuilder.values())
+ for (InvocationBuilder builder : methodToInvocationBuilder.values())
{
builder.commit();
}
@@ -1300,30 +1300,30 @@
private void addConstructor()
{
- String initializer = _idAllocator.allocateId("initializer");
+ String initializer = idAllocator.allocateId("initializer");
try
{
- CtConstructor defaultConstructor = _ctClass.getConstructor("()V");
+ CtConstructor defaultConstructor = ctClass.getConstructor("()V");
- CtMethod initializerMethod = defaultConstructor.toMethod(initializer, _ctClass);
+ CtMethod initializerMethod = defaultConstructor.toMethod(initializer, ctClass);
- _ctClass.addMethod(initializerMethod);
+ ctClass.addMethod(initializerMethod);
}
catch (Exception ex)
{
throw new RuntimeException(ex);
}
- _formatter.format("convert default constructor: %s();\n\n", initializer);
+ formatter.format("convert default constructor: %s();\n\n", initializer);
- int count = _constructorArgs.size();
+ int count = constructorArgs.size();
CtClass[] types = new CtClass[count];
for (int i = 0; i < count; i++)
{
- ConstructorArg arg = _constructorArgs.get(i);
+ ConstructorArg arg = constructorArgs.get(i);
types[i] = arg.type;
}
@@ -1331,57 +1331,57 @@
// Add a call to the initializer; the method converted fromt the classes default
// constructor.
- _constructor.append(" ");
- _constructor.append(initializer);
+ constructor.append(" ");
+ constructor.append(initializer);
// This finally matches the "{" added inside the constructor
- _constructor.append("();\n\n}");
+ constructor.append("();\n\n}");
- String constructorBody = _constructor.toString();
+ String constructorBody = constructor.toString();
try
{
- CtConstructor cons = CtNewConstructor.make(types, null, constructorBody, _ctClass);
- _ctClass.addConstructor(cons);
+ CtConstructor cons = CtNewConstructor.make(types, null, constructorBody, ctClass);
+ ctClass.addConstructor(cons);
}
catch (CannotCompileException ex)
{
throw new RuntimeException(ex);
}
- _formatter.format("add constructor: %s(", _ctClass.getName());
+ formatter.format("add constructor: %s(", ctClass.getName());
for (int i = 0; i < count; i++)
{
- if (i > 0) _description.append(", ");
+ if (i > 0) description.append(", ");
- _formatter.format("%s $%d", types[i].getName(), i + 1);
+ formatter.format("%s $%d", types[i].getName(), i + 1);
}
- _formatter.format(")\n%s\n\n", constructorBody);
+ formatter.format(")\n%s\n\n", constructorBody);
}
public Instantiator createInstantiator()
{
- String componentClassName = _ctClass.getName();
+ String componentClassName = ctClass.getName();
String name = ClassFabUtils.generateClassName("Instantiator");
- ClassFab cf = _classFactory.newClass(name, AbstractInstantiator.class);
+ ClassFab cf = classFactory.newClass(name, AbstractInstantiator.class);
BodyBuilder constructor = new BodyBuilder();
- // This is realy -1 + 2: The first value in _constructorArgs is the InternalComponentResources, which doesn't
+ // This is realy -1 + 2: The first value in constructorArgs is the InternalComponentResources, which doesn't
// count toward's the Instantiator's constructor ... then we add in the Model and String description.
// It's tricky because there's the constructor parameters for the Instantiator, most of which are stored
// in fields and then used as the constructor parameters for the Component.
- Class[] constructorParameterTypes = new Class[_constructorArgs.size() + 1];
- Object[] constructorParameterValues = new Object[_constructorArgs.size() + 1];
+ Class[] constructorParameterTypes = new Class[constructorArgs.size() + 1];
+ Object[] constructorParameterValues = new Object[constructorArgs.size() + 1];
constructorParameterTypes[0] = ComponentModel.class;
- constructorParameterValues[0] = _componentModel;
+ constructorParameterValues[0] = componentModel;
constructorParameterTypes[1] = String.class;
constructorParameterValues[1] = String.format("Instantiator[%s]", componentClassName);
@@ -1399,9 +1399,9 @@
// Again, skip the (implicit) InternalComponentResources field, that's
// supplied to the Instantiator's newInstance() method.
- for (int i = 1; i < _constructorArgs.size(); i++)
+ for (int i = 1; i < constructorArgs.size(); i++)
{
- ConstructorArg arg = _constructorArgs.get(i);
+ ConstructorArg arg = constructorArgs.get(i);
CtClass argCtType = arg.type;
Class argType = toClass(argCtType.getName());
@@ -1454,48 +1454,48 @@
private void failIfFrozen()
{
- if (_frozen) throw new IllegalStateException(
- "The ClassTransformation instance (for " + _ctClass.getName() + ") has completed all transformations and may not be further modified.");
+ if (frozen) throw new IllegalStateException(
+ "The ClassTransformation instance (for " + ctClass.getName() + ") has completed all transformations and may not be further modified.");
}
private void failIfNotFrozen()
{
- if (!_frozen) throw new IllegalStateException(
- "The ClassTransformation instance (for " + _ctClass.getName() + ") has not yet completed all transformations.");
+ if (!frozen) throw new IllegalStateException(
+ "The ClassTransformation instance (for " + ctClass.getName() + ") has not yet completed all transformations.");
}
public IdAllocator getIdAllocator()
{
failIfNotFrozen();
- return _idAllocator;
+ return idAllocator;
}
public List<ConstructorArg> getConstructorArgs()
{
failIfNotFrozen();
- return CollectionFactory.newList(_constructorArgs);
+ return CollectionFactory.newList(constructorArgs);
}
public List<Annotation> getClassAnnotations()
{
failIfFrozen();
- if (_classAnnotations == null) assembleClassAnnotations();
+ if (classAnnotations == null) assembleClassAnnotations();
- return _classAnnotations;
+ return classAnnotations;
}
private void assembleClassAnnotations()
{
- _classAnnotations = newList();
+ classAnnotations = newList();
try
{
- for (CtClass current = _ctClass; current != null; current = current.getSuperclass())
+ for (CtClass current = ctClass; current != null; current = current.getSuperclass())
{
- addAnnotationsToList(_classAnnotations, current.getAnnotations());
+ addAnnotationsToList(classAnnotations, current.getAnnotations());
}
}
catch (NotFoundException ex)
@@ -1517,10 +1517,10 @@
{
Formatter formatter = new Formatter(builder);
- formatter.format("%s %s extends %s", Modifier.toString(_ctClass.getModifiers()), _ctClass.getName(),
- _ctClass.getSuperclass().getName());
+ formatter.format("%s %s extends %s", Modifier.toString(ctClass.getModifiers()), ctClass.getName(),
+ ctClass.getSuperclass().getName());
- CtClass[] interfaces = _ctClass.getInterfaces();
+ CtClass[] interfaces = ctClass.getInterfaces();
for (int i = 0; i < interfaces.length; i++)
{
@@ -1530,7 +1530,7 @@
builder.append(interfaces[i].getName());
}
- formatter.format("\n\n%s", _description.toString());
+ formatter.format("\n\n%s", description.toString());
}
catch (NotFoundException ex)
{
@@ -1551,7 +1551,7 @@
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "void", methodName,
new String[] { fieldType }, null);
- String message = ServicesMessages.readOnlyField(_ctClass.getName(), fieldName);
+ String message = ServicesMessages.readOnlyField(ctClass.getName(), fieldName);
String body = format("throw new java.lang.RuntimeException(\"%s\");", message);
@@ -1562,13 +1562,13 @@
public void removeField(String fieldName)
{
- _formatter.format("remove field %s;\n\n", fieldName);
+ formatter.format("remove field %s;\n\n", fieldName);
// TODO: We could check that there's an existing field read and field write transform ...
- if (_removedFieldNames == null) _removedFieldNames = newSet();
+ if (removedFieldNames == null) removedFieldNames = newSet();
- _removedFieldNames.add(fieldName);
+ removedFieldNames.add(fieldName);
}
@@ -1579,13 +1579,13 @@
String body = String.format("$_ = $0.%s();", methodName);
- if (_fieldReadTransforms == null) _fieldReadTransforms = newMap();
+ if (fieldReadTransforms == null) fieldReadTransforms = newMap();
// TODO: Collisions?
- _fieldReadTransforms.put(fieldName, body);
+ fieldReadTransforms.put(fieldName, body);
- _formatter.format("replace read %s: %s();\n\n", fieldName, methodName);
+ formatter.format("replace read %s: %s();\n\n", fieldName, methodName);
}
public void replaceWriteAccess(String fieldName, String methodName)
@@ -1595,13 +1595,13 @@
String body = String.format("$0.%s($1);", methodName);
- if (_fieldWriteTransforms == null) _fieldWriteTransforms = newMap();
+ if (fieldWriteTransforms == null) fieldWriteTransforms = newMap();
// TODO: Collisions?
- _fieldWriteTransforms.put(fieldName, body);
+ fieldWriteTransforms.put(fieldName, body);
- _formatter.format("replace write %s: %s();\n\n", fieldName, methodName);
+ formatter.format("replace write %s: %s();\n\n", fieldName, methodName);
}
private void performFieldTransformations()
@@ -1609,16 +1609,16 @@
// If no field transformations have been requested, then we can save ourselves some
// trouble!
- if (_fieldReadTransforms != null || _fieldWriteTransforms != null) replaceFieldAccess();
+ if (fieldReadTransforms != null || fieldWriteTransforms != null) replaceFieldAccess();
- if (_removedFieldNames != null)
+ if (removedFieldNames != null)
{
- for (String fieldName : _removedFieldNames)
+ for (String fieldName : removedFieldNames)
{
try
{
- CtField field = _ctClass.getDeclaredField(fieldName);
- _ctClass.removeField(field);
+ CtField field = ctClass.getDeclaredField(fieldName);
+ ctClass.removeField(field);
}
catch (NotFoundException ex)
{
@@ -1635,9 +1635,9 @@
// Provide empty maps here, to make the code in the inner class a tad
// easier.
- if (_fieldReadTransforms == null) _fieldReadTransforms = newMap();
+ if (fieldReadTransforms == null) fieldReadTransforms = newMap();
- if (_fieldWriteTransforms == null) _fieldWriteTransforms = newMap();
+ if (fieldWriteTransforms == null) fieldWriteTransforms = newMap();
ExprEditor editor = new ExprEditor()
{
@@ -1652,28 +1652,28 @@
String fieldName = access.getFieldName();
CtMethod method = (CtMethod) where;
- _formatter.format("Checking field %s %s in method %s(): ", isRead ? "read" : "write", fieldName,
- method.getName());
+ formatter.format("Checking field %s %s in method %s(): ", isRead ? "read" : "write", fieldName,
+ method.getName());
// Ignore any methods to were added as part of the transformation.
// If we reference the field there, we really mean the field.
- if (_addedMethods.contains(where))
+ if (addedMethods.contains(where))
{
- _formatter.format("added method\n");
+ formatter.format("added method\n");
return;
}
- Map<String, String> transformMap = isRead ? _fieldReadTransforms : _fieldWriteTransforms;
+ Map<String, String> transformMap = isRead ? fieldReadTransforms : fieldWriteTransforms;
String body = transformMap.get(fieldName);
if (body == null)
{
- _formatter.format("field not transformed\n");
+ formatter.format("field not transformed\n");
return;
}
- _formatter.format("replacing with %s\n", body);
+ formatter.format("replacing with %s\n", body);
access.replace(body);
}
@@ -1681,14 +1681,14 @@
try
{
- _ctClass.instrument(editor);
+ ctClass.instrument(editor);
}
catch (CannotCompileException ex)
{
throw new RuntimeException(ex);
}
- _formatter.format("\n");
+ formatter.format("\n");
}
public Class toClass(String type)
@@ -1697,7 +1697,7 @@
try
{
- return Class.forName(finalType, true, _classFactory.getClassLoader());
+ return Class.forName(finalType, true, classFactory.getClassLoader());
}
catch (ClassNotFoundException ex)
{
@@ -1707,12 +1707,12 @@
public String getClassName()
{
- return _ctClass.getName();
+ return ctClass.getName();
}
public Logger getLogger()
{
- return _logger;
+ return logger;
}
public void extendConstructor(String statement)
@@ -1721,8 +1721,8 @@
failIfFrozen();
- _constructor.append(statement);
- _constructor.append("\n");
+ constructor.append(statement);
+ constructor.append("\n");
}
public String getMethodIdentifier(TransformMethodSignature signature)
@@ -1741,7 +1741,7 @@
public boolean isRootTransformation()
{
- return _parentTransformation == null;
+ return parentTransformation == null;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Wed May 7 19:23:21 2008
@@ -41,18 +41,21 @@
@Marker(Core.class)
public class InternalModule
{
- private final UpdateListenerHub _updateListenerHub;
- private final ComponentInstantiatorSource _componentInstantiatorSource;
- private final ComponentTemplateSource _componentTemplateSource;
- private final RequestGlobals _requestGlobals;
+ private final UpdateListenerHub updateListenerHub;
+
+ private final ComponentInstantiatorSource componentInstantiatorSource;
+
+ private final ComponentTemplateSource componentTemplateSource;
+
+ private final RequestGlobals requestGlobals;
public InternalModule(UpdateListenerHub updateListenerHub, ComponentInstantiatorSource componentInstantiatorSource,
ComponentTemplateSource componentTemplateSource, RequestGlobals requestGlobals)
{
- _updateListenerHub = updateListenerHub;
- _componentInstantiatorSource = componentInstantiatorSource;
- _componentTemplateSource = componentTemplateSource;
- _requestGlobals = requestGlobals;
+ this.updateListenerHub = updateListenerHub;
+ this.componentInstantiatorSource = componentInstantiatorSource;
+ this.componentTemplateSource = componentTemplateSource;
+ this.requestGlobals = requestGlobals;
}
@@ -127,7 +130,7 @@
ComponentInstantiatorSourceImpl source = new ComponentInstantiatorSourceImpl(logger, classFactory
.getClassLoader(), transformer, internalRequestGlobals);
- _updateListenerHub.addUpdateListener(source);
+ updateListenerHub.addUpdateListener(source);
return source;
}
@@ -136,7 +139,7 @@
{
ComponentClassTransformerImpl transformer = resources.autobuild(ComponentClassTransformerImpl.class);
- _componentInstantiatorSource.addInvalidationListener(transformer);
+ componentInstantiatorSource.addInvalidationListener(transformer);
return transformer;
}
@@ -156,11 +159,11 @@
// ... and this covers invalidations due to changes to templates
- _componentTemplateSource.addInvalidationListener(service);
+ componentTemplateSource.addInvalidationListener(service);
// Give the service a chance to clean up its own cache periodically as well
- _updateListenerHub.addUpdateListener(service);
+ updateListenerHub.addUpdateListener(service);
return service;
}
@@ -169,7 +172,7 @@
{
ComponentClassCacheImpl service = new ComponentClassCacheImpl(classFactory);
- _componentInstantiatorSource.addInvalidationListener(service);
+ componentInstantiatorSource.addInvalidationListener(service);
return service;
}
@@ -181,7 +184,7 @@
public Cookie[] getCookies()
{
- return _requestGlobals.getHTTPServletRequest().getCookies();
+ return requestGlobals.getHTTPServletRequest().getCookies();
}
};
}
@@ -194,7 +197,7 @@
public void addCookie(Cookie cookie)
{
- _requestGlobals.getHTTPServletResponse().addCookie(cookie);
+ requestGlobals.getHTTPServletResponse().addCookie(cookie);
}
};
@@ -204,7 +207,7 @@
{
ResourceCacheImpl service = new ResourceCacheImpl(digestGenerator);
- _updateListenerHub.addUpdateListener(service);
+ updateListenerHub.addUpdateListener(service);
return service;
}
@@ -214,7 +217,7 @@
{
ComponentTemplateSourceImpl service = new ComponentTemplateSourceImpl(parser, locator);
- _updateListenerHub.addUpdateListener(service);
+ updateListenerHub.addUpdateListener(service);
return service;
}
@@ -226,7 +229,7 @@
// Recieve invalidations when the class loader is discarded (due to a component class
// change). The notification is forwarded to the page loader's listeners.
- _componentInstantiatorSource.addInvalidationListener(service);
+ componentInstantiatorSource.addInvalidationListener(service);
return service;
}
@@ -234,7 +237,7 @@
@Marker(ComponentLayer.class)
public CtClassSource buildCtClassSource(PropertyShadowBuilder builder)
{
- return builder.build(_componentInstantiatorSource, "classSource", CtClassSource.class);
+ return builder.build(componentInstantiatorSource, "classSource", CtClassSource.class);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalRequestGlobalsImpl.java Wed May 7 19:23:21 2008
@@ -21,16 +21,16 @@
@Scope(PERTHREAD_SCOPE)
public class InternalRequestGlobalsImpl implements InternalRequestGlobals
{
- private Throwable _classLoaderException;
+ private Throwable classLoaderException;
public Throwable getClassLoaderException()
{
- return _classLoaderException;
+ return classLoaderException;
}
public void storeClassLoaderException(Throwable classLoaderException)
{
- if (_classLoaderException == null)
- _classLoaderException = classLoaderException;
+ if (this.classLoaderException == null)
+ this.classLoaderException = classLoaderException;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InvocationBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InvocationBuilder.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InvocationBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InvocationBuilder.java Wed May 7 19:23:21 2008
@@ -28,8 +28,10 @@
/**
* Used by {@link org.apache.tapestry.internal.services.InternalClassTransformationImpl} to manage adding method
* invocation advice to arbitrary component methods.
+ *
+ * @see org.apache.tapestry.ioc.MethodAdvice
*/
-public class InvocationBuilder
+class InvocationBuilder
{
private static final String FIELD_NAME = "_p";
@@ -37,17 +39,17 @@
private static final int PUBLIC_FINAL = Modifier.PUBLIC | Modifier.FINAL;
- private final InternalClassTransformation _transformation;
+ private final InternalClassTransformation transformation;
- private final CtClassSource _classSource;
+ private final CtClassSource classSource;
- private final TransformMethodSignature _advisedMethod;
+ private final TransformMethodSignature advisedMethod;
- private final MethodInvocationInfo _info;
+ private final MethodInvocationInfo info;
- private final CtClass _invocationCtClass;
+ private final CtClass invocationCtClass;
- private final String _invocationClassName;
+ private final String invocationClassName;
private static final AtomicLong UID_GENERATOR = new AtomicLong(System.currentTimeMillis());
@@ -60,21 +62,21 @@
ComponentClassCache componentClassCache, TransformMethodSignature advisedMethod,
CtClassSource classSource)
{
- _transformation = transformation;
- _advisedMethod = advisedMethod;
- _classSource = classSource;
+ this.transformation = transformation;
+ this.advisedMethod = advisedMethod;
+ this.classSource = classSource;
- _info = new MethodInvocationInfo(advisedMethod, componentClassCache);
+ info = new MethodInvocationInfo(advisedMethod, componentClassCache);
- _invocationClassName = _transformation.getClassName() + "$" + _advisedMethod.getMethodName() + "$invocation_" + nextUID();
+ invocationClassName = this.transformation.getClassName() + "$" + this.advisedMethod.getMethodName() + "$invocation_" + nextUID();
- _invocationCtClass = _classSource.newClass(_invocationClassName, AbstractComponentMethodInvocation.class);
+ invocationCtClass = this.classSource.newClass(invocationClassName, AbstractComponentMethodInvocation.class);
}
public void addAdvice(ComponentMethodAdvice advice)
{
- _info.addAdvice(advice);
+ info.addAdvice(advice);
}
/**
@@ -98,7 +100,7 @@
implementInvokeAdvisedMethod(renamed);
- _classSource.createClass(_invocationCtClass);
+ classSource.createClass(invocationCtClass);
}
catch (Exception ex)
{
@@ -110,22 +112,22 @@
private void rebuildOriginalMethod()
{
- String methodInfoField = _transformation.addInjectedField(MethodInvocationInfo.class,
- _advisedMethod.getMethodName() + "Info",
- _info);
+ String methodInfoField = transformation.addInjectedField(MethodInvocationInfo.class,
+ advisedMethod.getMethodName() + "Info",
+ info);
- String componentResourcesField = _transformation.getResourcesFieldName();
+ String componentResourcesField = transformation.getResourcesFieldName();
BodyBuilder builder = new BodyBuilder().begin();
- builder.addln("%s invocation = new %<s(%s, %s, $$);", _invocationClassName, methodInfoField,
+ builder.addln("%s invocation = new %<s(%s, %s, $$);", invocationClassName, methodInfoField,
componentResourcesField);
// Off into the first MethodAdvice
builder.addln("invocation.proceed();");
- String[] exceptionTypes = _advisedMethod.getExceptionTypes();
+ String[] exceptionTypes = advisedMethod.getExceptionTypes();
int exceptionCount = exceptionTypes.length;
if (exceptionCount > 0)
@@ -141,7 +143,7 @@
}
}
- String returnType = _advisedMethod.getReturnType();
+ String returnType = advisedMethod.getReturnType();
if (!returnType.equals("void"))
{
@@ -153,18 +155,18 @@
builder.end();
/** Replace the original method with the new implementation. */
- _transformation.addMethod(_advisedMethod, builder.toString());
+ transformation.addMethod(advisedMethod, builder.toString());
}
private void implementInvokeAdvisedMethod(String advisedMethodName) throws CannotCompileException
{
BodyBuilder builder = new BodyBuilder().begin();
- boolean isVoid = _advisedMethod.getReturnType().equals("void");
+ boolean isVoid = advisedMethod.getReturnType().equals("void");
- builder.addln("%s component = (%<s) getComponentResources().getComponent();", _transformation.getClassName());
+ builder.addln("%s component = (%<s) getComponentResources().getComponent();", transformation.getClassName());
- String[] exceptionTypes = _advisedMethod.getExceptionTypes();
+ String[] exceptionTypes = advisedMethod.getExceptionTypes();
int exceptionCount = exceptionTypes.length;
if (exceptionCount > 0)
@@ -174,7 +176,7 @@
builder.add("component.%s(", advisedMethodName);
- for (int i = 0; i < _advisedMethod.getParameterTypes().length; i++)
+ for (int i = 0; i < advisedMethod.getParameterTypes().length; i++)
{
if (i > 0) builder.add(", ");
@@ -200,26 +202,26 @@
builder.end();
CtMethod method = new CtMethod(CtClass.voidType, "invokeAdvisedMethod",
- new CtClass[0], _invocationCtClass);
+ new CtClass[0], invocationCtClass);
method.setModifiers(PROTECTED_FINAL);
method.setBody(builder.toString());
- _invocationCtClass.addMethod(method);
+ invocationCtClass.addMethod(method);
}
private String copyAdvisedMethod()
{
- String newName = _transformation.newMemberName("advised$" + _advisedMethod.getMethodName());
+ String newName = transformation.newMemberName("advised$" + advisedMethod.getMethodName());
- _transformation.copyMethod(_advisedMethod, Modifier.FINAL, newName);
+ transformation.copyMethod(advisedMethod, Modifier.FINAL, newName);
return newName;
}
private void createConstructor() throws CannotCompileException
{
- int parameterCount = _info.getParameterCount();
+ int parameterCount = info.getParameterCount();
CtClass[] parameterTypes = new CtClass[parameterCount + 2];
@@ -232,13 +234,13 @@
{
String name = FIELD_NAME + i;
- String parameterTypeName = _advisedMethod.getParameterTypes()[i];
+ String parameterTypeName = advisedMethod.getParameterTypes()[i];
- CtClass parameterType = _classSource.toCtClass(parameterTypeName);
+ CtClass parameterType = classSource.toCtClass(parameterTypeName);
- CtField field = new CtField(parameterType, name, _invocationCtClass);
+ CtField field = new CtField(parameterType, name, invocationCtClass);
field.setModifiers(Modifier.PRIVATE);
- _invocationCtClass.addField(field);
+ invocationCtClass.addField(field);
parameterTypes[2 + i] = parameterType;
@@ -247,16 +249,16 @@
builder.end();
- CtConstructor constructor = new CtConstructor(parameterTypes, _invocationCtClass);
+ CtConstructor constructor = new CtConstructor(parameterTypes, invocationCtClass);
constructor.setBody(builder.toString());
- _invocationCtClass.addConstructor(constructor);
+ invocationCtClass.addConstructor(constructor);
}
private CtClass toCtClass(Class input)
{
- return _classSource.toCtClass(input);
+ return classSource.toCtClass(input);
}
private void implementOverride() throws CannotCompileException
@@ -265,11 +267,11 @@
builder.addln("switch ($1)").begin();
- int count = _advisedMethod.getParameterTypes().length;
+ int count = advisedMethod.getParameterTypes().length;
for (int i = 0; i < count; i++)
{
- String type = _advisedMethod.getParameterTypes()[i];
+ String type = advisedMethod.getParameterTypes()[i];
builder.addln("case %d: %s = %s; break;", i, FIELD_NAME + i, ClassFabUtils.castReference("$2", type));
}
@@ -279,12 +281,12 @@
builder.end().end();
CtMethod method = new CtMethod(CtClass.voidType, "override",
- new CtClass[] { CtClass.intType, toCtClass(Object.class) }, _invocationCtClass);
+ new CtClass[] { CtClass.intType, toCtClass(Object.class) }, invocationCtClass);
method.setModifiers(PUBLIC_FINAL);
method.setBody(builder.toString());
- _invocationCtClass.addMethod(method);
+ invocationCtClass.addMethod(method);
}
private void implementGetParameter() throws CannotCompileException
@@ -293,7 +295,7 @@
builder.addln("switch ($1)").begin();
- int count = _advisedMethod.getParameterTypes().length;
+ int count = advisedMethod.getParameterTypes().length;
for (int i = 0; i < count; i++)
{
@@ -305,12 +307,12 @@
builder.end().end();
CtMethod method = new CtMethod(toCtClass(Object.class), "getParameter",
- new CtClass[] { CtClass.intType }, _invocationCtClass);
+ new CtClass[] { CtClass.intType }, invocationCtClass);
method.setModifiers(PUBLIC_FINAL);
method.setBody(builder.toString());
- _invocationCtClass.addMethod(method);
+ invocationCtClass.addMethod(method);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java?rev=654390&r1=654389&r2=654390&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/JSONObjectEventResultProcessor.java Wed May 7 19:23:21 2008
@@ -30,16 +30,16 @@
*/
public class JSONObjectEventResultProcessor implements ComponentEventResultProcessor<JSONObject>
{
- private final Response _response;
+ private final Response response;
public JSONObjectEventResultProcessor(Response response)
{
- _response = response;
+ this.response = response;
}
public void processResultValue(JSONObject value) throws IOException
{
- PrintWriter pw = _response.getPrintWriter(InternalConstants.JSON_MIME_TYPE);
+ PrintWriter pw = response.getPrintWriter(InternalConstants.JSON_MIME_TYPE);
pw.print(value.toString());