Author: hlship
Date: Thu Apr 27 19:03:12 2006
New Revision: 397725
URL: http://svn.apache.org/viewcvs?rev=397725&view=rev
Log:
Rename a few things to clearly identify that workers exist to enhance component
classes.
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformer.java
- copied, changed from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformer.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformerImpl.java
- copied, changed from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformerImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java
- copied, changed from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformWorker.java
Removed:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformer.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformerImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformWorker.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/InternalClassTransformation.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/RetainWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorker.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.internal.transform.xml
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.transform.xml
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformer.java
(from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformer.java)
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformer.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformer.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformer.java&r1=397717&r2=397725&rev=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformer.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformer.java
Thu Apr 27 19:03:12 2006
@@ -23,12 +23,12 @@
*
* @author Howard M. Lewis Ship
*/
-public interface ClassTransformer
+public interface ComponentClassTransformer
{
/**
* Performs a transformation on the class, accessing the class from the
class pool.
*/
- void transformClass(CtClass ctClass);
+ void transformComponentClass(CtClass ctClass);
/** Creates a new instantiator instance. */
Instantiator createInstantiator(Class componentClass);
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformerImpl.java
(from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformerImpl.java)
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformerImpl.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformerImpl.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformerImpl.java&r1=397717&r2=397725&rev=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ClassTransformerImpl.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentClassTransformerImpl.java
Thu Apr 27 19:03:12 2006
@@ -23,25 +23,25 @@
import org.apache.tapestry.internal.annotations.Synchronized;
import org.apache.tapestry.internal.model.MutableComponentModelImpl;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformWorker;
+import org.apache.tapestry.transform.ComponentClassTransformWorker;
import static org.apache.tapestry.util.CollectionFactory.newMap;
/**
- * Implementation of [EMAIL PROTECTED]
org.apache.tapestry.internal.transform.ClassTransformer}.
+ * Implementation of [EMAIL PROTECTED]
org.apache.tapestry.internal.transform.ComponentClassTransformer}.
*
* @author Howard M. Lewis Ship
*/
@Synchronized
-public class ClassTransformerImpl implements ClassTransformer
+public class ComponentClassTransformerImpl implements ComponentClassTransformer
{
/** Map from class name to class transformation. */
private final Map<String, InternalClassTransformation>
_nameToClassTransformation = newMap();
- private ClassTransformWorker _workers;
+ private ComponentClassTransformWorker _workers;
@Synchronized.Write
- public void transformClass(CtClass ctClass)
+ public void transformComponentClass(CtClass ctClass)
{
String classname = ctClass.getName();
@@ -98,10 +98,10 @@
}
/**
- * For injection. This will usually be an ordered series of [EMAIL
PROTECTED] ClassTransformWorker}s, as a
+ * For injection. This will usually be an ordered series of [EMAIL
PROTECTED] ComponentClassTransformWorker}s, as a
* chain-of-command.
*/
- public final void setWorkers(ClassTransformWorker workers)
+ public final void setWorkers(ComponentClassTransformWorker workers)
{
_workers = workers;
}
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImpl.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImpl.java?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImpl.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImpl.java
Thu Apr 27 19:03:12 2006
@@ -50,7 +50,7 @@
private Loader _loader;
- private ClassTransformer _transformer;
+ private ComponentClassTransformer _transformer;
private Log _log;
@@ -134,7 +134,7 @@
// Do the transformations here
- _transformer.transformClass(ctClass);
+ _transformer.transformComponentClass(ctClass);
diag = "END";
}
@@ -230,7 +230,7 @@
}
/** For injection. */
- public void setTransformer(ClassTransformer transformer)
+ public void setTransformer(ComponentClassTransformer transformer)
{
_transformer = transformer;
}
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/InternalClassTransformation.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/InternalClassTransformation.java?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/InternalClassTransformation.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/InternalClassTransformation.java
Thu Apr 27 19:03:12 2006
@@ -16,7 +16,7 @@
import java.util.List;
-import org.apache.tapestry.transform.ClassTransformWorker;
+import org.apache.tapestry.transform.ComponentClassTransformWorker;
import org.apache.tapestry.transform.ClassTransformation;
import org.apache.tapestry.util.IdAllocator;
@@ -35,7 +35,7 @@
String getResourcesFieldName();
/**
- * Invoked after all [EMAIL PROTECTED] ClassTransformWorker}s have had
their chance to work over the
+ * Invoked after all [EMAIL PROTECTED] ComponentClassTransformWorker}s
have had their chance to work over the
* class. This performs any final operations for the class transformation,
which includes coming
* up with the final constructor method for the class.
*/
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/RetainWorker.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/RetainWorker.java?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/RetainWorker.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/RetainWorker.java
Thu Apr 27 19:03:12 2006
@@ -18,7 +18,7 @@
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformWorker;
+import org.apache.tapestry.transform.ComponentClassTransformWorker;
import org.apache.tapestry.transform.ClassTransformation;
/**
@@ -27,7 +27,7 @@
*
* @author Howard M. Lewis Ship
*/
-public final class RetainWorker implements ClassTransformWorker
+public final class RetainWorker implements ComponentClassTransformWorker
{
/**
* Claims each field with the [EMAIL PROTECTED]
org.apache.tapestry.annotations.Retain} annotation,
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorker.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorker.java?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorker.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorker.java
Thu Apr 27 19:03:12 2006
@@ -17,7 +17,7 @@
import java.lang.reflect.Modifier;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformWorker;
+import org.apache.tapestry.transform.ComponentClassTransformWorker;
import org.apache.tapestry.transform.ClassTransformation;
import static
org.apache.tapestry.transform.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
@@ -29,7 +29,7 @@
*
* @author Howard M. Lewis Ship
*/
-public final class UnclaimedFieldWorker implements ClassTransformWorker
+public final class UnclaimedFieldWorker implements
ComponentClassTransformWorker
{
public void transform(ClassTransformation transformation,
MutableComponentModel model)
Copied:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java
(from r397717,
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformWorker.java)
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformWorker.java&r1=397717&r2=397725&rev=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformWorker.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java
Thu Apr 27 19:03:12 2006
@@ -23,7 +23,7 @@
*
* @author Howard M. Lewis Ship
*/
-public interface ClassTransformWorker
+public interface ComponentClassTransformWorker
{
/**
* Invoked to perform a transformation on an as-yet unloaded component
class, represented by the
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java
Thu Apr 27 19:03:12 2006
@@ -17,7 +17,7 @@
import org.apache.tapestry.internal.annotations.Utility;
/**
- * Constants used by implementations of [EMAIL PROTECTED]
org.apache.tapestry.transform.ClassTransformWorker}.
+ * Constants used by implementations of [EMAIL PROTECTED]
org.apache.tapestry.transform.ComponentClassTransformWorker}.
*
* @author Howard M. Lewis Ship
*/
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.internal.transform.xml
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.internal.transform.xml?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.internal.transform.xml
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.internal.transform.xml
Thu Apr 27 19:03:12 2006
@@ -17,29 +17,29 @@
<module id="org.apache.tapestry.internal.transform" version="5.0.0">
- <contribution
configuration-id="org.apache.tapestry.transform.ClassTransformWorkers">
+ <contribution
configuration-id="org.apache.tapestry.transform.ComponentClassTransformWorkers">
<command id="Retain" object="instance:worker.RetainWorker"/>
<command id="UnclaimedField"
object="instance:worker.UnclaimedFieldWorker" after="*"/>
</contribution>
- <service-point id="ClassTransformWorkersChain"
- interface="org.apache.tapestry.transform.ClassTransformWorker"
+ <service-point id="ComponentClassTransformWorkersChain"
+ interface="org.apache.tapestry.transform.ComponentClassTransformWorker"
visibility="private">
<invoke-factory service-id="hivemind.lib.ChainFactory">
- <construct
configuration-id="org.apache.tapestry.transform.ClassTransformWorkers"/>
+ <construct
configuration-id="org.apache.tapestry.transform.ComponentClassTransformWorkers"/>
</invoke-factory>
</service-point>
- <service-point id="ClassTransformer" visibility="private">
+ <service-point id="ComponentClassTransformer" visibility="private">
- Encapsulates all the AOP-ish transformations that occur during
+ Encapsulates all the AOP transformations that occur during
the loading of component classes.
<invoke-factory>
- <construct class="ClassTransformerImpl">
- <set-object property="workers"
value="service:ClassTransformWorkersChain"/>
+ <construct class="ComponentClassTransformerImpl">
+ <set-object property="workers"
value="service:ComponentClassTransformWorkersChain"/>
</construct>
</invoke-factory>
<interceptor service-id="hivemind.LoggingInterceptor"/>
@@ -54,7 +54,7 @@
<invoke-factory>
<construct class="ComponentInstantiatorSourceImpl">
<class-resolver/>
- <set-object property="transformer"
value="service:ClassTransformer"/>
+ <set-object property="transformer"
value="service:ComponentClassTransformer"/>
</construct>
</invoke-factory>
<interceptor service-id="hivemind.LoggingInterceptor"/>
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.transform.xml
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.transform.xml?rev=397725&r1=397724&r2=397725&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.transform.xml
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/resources/META-INF/org.apache.tapestry.transform.xml
Thu Apr 27 19:03:12 2006
@@ -15,10 +15,10 @@
-->
<module id="org.apache.tapestry.transform" version="5.0.0">
- <configuration-point id="ClassTransformWorkers"
schema-id="hivemind.lib.ChainContribution">
+ <configuration-point id="ComponentClassTransformWorkers"
schema-id="hivemind.lib.ChainContribution">
Defines a command chain of workers objects (implementing the
- ClassTransformWorker interface).
+ ComponentClassTransformWorker interface).
</configuration-point>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
