svn commit: r1076809 - 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/

[hlship]

Author: hlship
Date: Thu Mar  3 21:42:30 2011
New Revision: 1076809

URL: http://svn.apache.org/viewvc?rev=1076809&view=rev
Log:
TAP5-1467: Remove deprecated methods from ClassTransformation

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=1076809&r1=1076808&r2=1076809&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:42:30 2011
@@ -894,8 +894,7 @@ public final class InternalClassTransfor
 
         addImplementedInterface(Component.class);
 
-        resourcesFieldName = addField(Modifier.PROTECTED | Modifier.FINAL, 
InternalComponentResources.class.getName(),
-                "resources");
+        resourcesFieldName = createField((Modifier.PROTECTED | 
Modifier.FINAL), InternalComponentResources.class.getName(), 
"resources").getName();
 
         addToConstructor(String.format("  %s = $1;", resourcesFieldName));
 
@@ -1679,11 +1678,6 @@ public final class InternalClassTransfor
         return getField(fieldName).getModifiers();
     }
 
-    public String addField(int modifiers, String type, String suggestedName)
-    {
-        return createField(modifiers, type, suggestedName).getName();
-    }
-
     public TransformField createField(int modifiers, String type, String 
suggestedName)
     {
         failIfFrozen();
@@ -1789,7 +1783,7 @@ public final class InternalClassTransfor
     {
         CtClass ctType = toCtClass(type);
 
-        String fieldName = addField(Modifier.PROTECTED | Modifier.FINAL, 
type.getName(), suggestedName);
+        String fieldName = createField((Modifier.PROTECTED | Modifier.FINAL), 
type.getName(), suggestedName).getName();
 
         addInjectToConstructor(fieldName, ctType, value);
 

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=1076809&r1=1076808&r2=1076809&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:42:30 2011
@@ -167,22 +167,6 @@ public interface ClassTransformation ext
     boolean isField(String fieldName);
 
     /**
-     * Defines a new declared field for the class. The suggestedName may be 
modified to ensure
-     * uniqueness.
-     * 
-     * @param modifiers
-     *            modifiers for the field (typically, {@link 
java.lang.reflect.Modifier#PRIVATE})
-     * @param type
-     *            the type for the field, as a string
-     * @param suggestedName
-     *            the desired name for the field, which may be modified (for 
uniqueness) when
-     *            returned
-     * @return the (uniqued) name for the field
-     * @deprecated Use {@link #createField(int, String, String)} instead
-     */
-    String addField(int modifiers, String type, String suggestedName);
-
-    /**
      * Defines a new declared field for the class. Suggested name may be 
modified to ensure uniqueness.
      * 
      * @param modifiers

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=1076809&r1=1076808&r2=1076809&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:42:30 2011
@@ -405,7 +405,7 @@ public class InternalClassTransformation
 
         ClassTransformation ct = 
createClassTransformation(ClaimedFields.class, logger);
 
-        ct.addField(Modifier.PRIVATE, "int", "newField");
+        ct.createField(Modifier.PRIVATE, "int", "newField");
 
         List<String> unclaimed = ct.findUnclaimedFields();