svn commit: r1183161 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: internal/services/meta/MetaWorkerImpl.java services/TapestryModule.java services/meta/MetaWorker.java

[hl...@apache.org]

Author: hlship
Date: Thu Oct 13 23:16:58 2011
New Revision: 1183161

URL: http://svn.apache.org/viewvc?rev=1183161&view=rev
Log:
TAP5-1696: Change MetaWorker to no longer extend CCTW2, but expose a property that does

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/MetaWorkerImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/MetaWorkerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/MetaWorkerImpl.java?rev=1183161&r1=1183160&r2=1183161&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/MetaWorkerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/MetaWorkerImpl.java Thu Oct 13 23:16:58 2011
@@ -16,16 +16,16 @@ package org.apache.tapestry5.internal.se
 
 import org.apache.tapestry5.model.MutableComponentModel;
 import org.apache.tapestry5.plastic.PlasticClass;
-import org.apache.tapestry5.services.ClassTransformation;
 import org.apache.tapestry5.services.meta.MetaDataExtractor;
 import org.apache.tapestry5.services.meta.MetaWorker;
+import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
 import org.apache.tapestry5.services.transform.TransformationSupport;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
 @SuppressWarnings("unchecked")
-public class MetaWorkerImpl implements MetaWorker
+public class MetaWorkerImpl implements MetaWorker, ComponentClassTransformWorker2
 {
     private final Map<Class, MetaDataExtractor> configuration;
 
@@ -34,6 +34,11 @@ public class MetaWorkerImpl implements M
         this.configuration = configuration;
     }
 
+    public ComponentClassTransformWorker2 getWorker()
+    {
+        return this;
+    }
+
     public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
     {
         for (Class c : configuration.keySet())

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=1183161&r1=1183160&r2=1183161&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Thu Oct 13 23:16:58 2011
@@ -598,7 +598,7 @@ public final class TapestryModule
 
         configuration.addInstance("Import", ImportWorker.class);
 
-        configuration.add("Meta", metaWorker);
+        configuration.add("Meta", metaWorker.getWorker());
 
         configuration.add("Retain", new RetainWorker());
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java?rev=1183161&r1=1183160&r2=1183161&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/meta/MetaWorker.java Thu Oct 13 23:16:58 2011
@@ -26,7 +26,12 @@ import org.apache.tapestry5.services.tra
  * @since 5.2.0
  */
 @UsesMappedConfiguration(key = Class.class, value = MetaDataExtractor.class)
-public interface MetaWorker extends ComponentClassTransformWorker2
+public interface MetaWorker
 {
-
+    /**
+     * Returns the worker that performs transformations (in 5.2, MetaWorker implemented ComponentClassTransformWorker).
+     *
+     * @return worker that implements the meta data analysis
+     */
+    ComponentClassTransformWorker2 getWorker();
 }