You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/03/03 22:43:18 UTC
svn commit: r1076818 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/services/
main/java/org/apache/tapestry5/services/
test/java/org/apache/tapestry5/internal/services/
Author: hlship
Date: Thu Mar 3 21:43:17 2011
New Revision: 1076818
URL: http://svn.apache.org/viewvc?rev=1076818&view=rev
Log:
TAP5-1467: Remove deprecated methods from ClassTransformation
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/MethodFilter.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java?rev=1076818&r1=1076817&r2=1076818&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java Thu Mar 3 21:43:17 2011
@@ -1616,11 +1616,6 @@ public final class InternalClassTransfor
return result;
}
- public List<String> findUnclaimedFields()
- {
- return toFieldNames(matchUnclaimedFields());
- }
-
public List<TransformField> matchUnclaimedFields()
{
return matchFields(new Predicate<TransformField>()
@@ -2220,30 +2215,6 @@ public final class InternalClassTransfor
return ClassFabUtils.castReference(String.format("$2[%d]", index), parameterType.getName());
}
- private static List<TransformMethodSignature> toMethodSignatures(List<TransformMethod> input)
- {
- List<TransformMethodSignature> result = CollectionFactory.newList();
-
- for (TransformMethod m : input)
- {
- result.add(m.getSignature());
- }
-
- return result;
- }
-
- private static List<String> toFieldNames(List<TransformField> fields)
- {
- List<String> result = CollectionFactory.newList();
-
- for (TransformField f : fields)
- {
- result.add(f.getName());
- }
-
- return result;
- }
-
private ComponentMethodInvocationBuilder createBuilder(TransformMethodSignature signature)
{
return new ComponentMethodInvocationBuilder(this, componentClassCache, signature, classSource);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java?rev=1076818&r1=1076817&r2=1076818&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java Thu Mar 3 21:43:17 2011
@@ -17,11 +17,8 @@ package org.apache.tapestry5.services;
import java.lang.annotation.Annotation;
import java.util.List;
-import javassist.CtBehavior;
-
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.func.Predicate;
-import org.apache.tapestry5.internal.transform.ReadOnlyFieldValueConduit;
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.runtime.Component;
@@ -142,14 +139,6 @@ public interface ClassTransformation ext
TransformField getField(String fieldName);
/**
- * Finds any declared <em>instance</em> fields that have not been claimed (via {@link #claimField(String, Object)})
- * and have not been added , and returns the names of those fields. May return an empty array.
- *
- * @deprecated Use {@link #matchUnclaimedFields()} instead
- */
- List<String> findUnclaimedFields();
-
- /**
* Matches all fields that are not claimed. This may include static fields and final fields, but will not
* include fields that have been added as part of the transformation.
*
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java?rev=1076818&r1=1076817&r2=1076818&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java Thu Mar 3 21:43:17 2011
@@ -37,6 +37,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.Retain;
import org.apache.tapestry5.annotations.SetupRender;
import org.apache.tapestry5.func.F;
+import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.func.Predicate;
import org.apache.tapestry5.internal.InternalComponentResources;
import org.apache.tapestry5.internal.model.MutableComponentModelImpl;
@@ -67,7 +68,6 @@ import org.apache.tapestry5.services.Com
import org.apache.tapestry5.services.ComponentMethodAdvice;
import org.apache.tapestry5.services.ComponentMethodInvocation;
import org.apache.tapestry5.services.MethodAccess;
-import org.apache.tapestry5.services.MethodFilter;
import org.apache.tapestry5.services.MethodInvocationResult;
import org.apache.tapestry5.services.TransformField;
import org.apache.tapestry5.services.TransformMethod;
@@ -371,13 +371,21 @@ public class InternalClassTransformation
ClassTransformation ct = createClassTransformation(ClaimedFields.class, logger);
- List<String> unclaimed = ct.findUnclaimedFields();
+ Mapper<TransformField, String> toName = new Mapper<TransformField, String>()
+ {
+ public String map(TransformField element)
+ {
+ return element.getName();
+ }
+ };
+
+ List<String> unclaimed = F.flow(ct.matchUnclaimedFields()).map(toName).toList();
assertEquals(unclaimed, asList("_field1", "_field4", "_zzfield"));
ct.getField("_field4").claim("Fred");
- unclaimed = ct.findUnclaimedFields();
+ unclaimed = F.flow(ct.matchUnclaimedFields()).map(toName).toList();
assertEquals(unclaimed, asList("_field1", "_zzfield"));
@@ -407,7 +415,13 @@ public class InternalClassTransformation
ct.createField(Modifier.PRIVATE, "int", "newField");
- List<String> unclaimed = ct.findUnclaimedFields();
+ List<String> unclaimed = F.flow(ct.matchUnclaimedFields()).map(new Mapper<TransformField, String>()
+ {
+ public String map(TransformField element)
+ {
+ return element.getName();
+ }
+ }).toList();
assertEquals(unclaimed, asList("_field1", "_field4", "_zzfield"));