Author: hlship Date: Thu Mar 3 21:42:52 2011 New Revision: 1076813 URL: http://svn.apache.org/viewvc?rev=1076813&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=1076813&r1=1076812&r2=1076813&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:52 2011 @@ -1774,15 +1774,6 @@ public final class InternalClassTransfor return null; } - public boolean isMethodOverride(TransformMethodSignature methodSignature) - { - if (!isMethod(methodSignature)) - throw new IllegalArgumentException(String.format("Method %s is not implemented by transformed class %s.", - methodSignature, getClassName())); - - return getOrCreateMethod(methodSignature).isOverride(); - } - public InternalClassTransformation getParentTransformation() { return parentTransformation; 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=1076813&r1=1076812&r2=1076813&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:52 2011 @@ -308,16 +308,6 @@ public interface ClassTransformation ext boolean isRootTransformation(); /** - * Returns true if the method is an override of a method from the parent class. - * - * @param methodSignature - * signature of method to check - * @return true if the parent class contains a method with the name signature - * @deprecated Use {@link TransformMethod#isOverride()} instead - */ - boolean isMethodOverride(TransformMethodSignature methodSignature); - - /** * Locates and returns the method if declared in this class; If not, * the method is added to the class. If the method is an override * of a base class method, then the method will delegate to the base 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=1076813&r1=1076812&r2=1076813&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:52 2011 @@ -1098,33 +1098,6 @@ public class InternalClassTransformation } @Test - public void check_for_method_override_on_non_declared_method() throws Exception - { - Logger logger = mockLogger(); - - replay(); - - ClassTransformation ct = createClassTransformation(SimpleBean.class, logger); - - TransformMethodSignature sig = new TransformMethodSignature("methodDoesNotExist"); - - try - { - ct.isMethodOverride(sig); - unreachable(); - } - catch (IllegalArgumentException ex) - { - assertEquals( - ex.getMessage(), - "Method public void methodDoesNotExist() is not implemented by transformed class org.apache.tapestry5.internal.services.SimpleBean."); - } - - verify(); - - } - - @Test public void check_for_overridden_methods() throws Exception { Logger logger = mockLogger(); @@ -1140,11 +1113,11 @@ public class InternalClassTransformation ClassTransformation childTransform = parentTransform.createChildTransformation(childClass, stubMutableComponentModel(logger)); - assertFalse(childTransform.isMethodOverride(new TransformMethodSignature("notOverridden"))); + assertFalse(childTransform.getOrCreateMethod(new TransformMethodSignature("notOverridden")).isOverride()); - assertTrue(childTransform.isMethodOverride(new TransformMethodSignature(Modifier.PUBLIC, "void", "setAge", - new String[] - { "int" }, null))); + assertTrue(childTransform.getOrCreateMethod( + new TransformMethodSignature(Modifier.PUBLIC, "void", "setAge", new String[] + { "int" }, null)).isOverride()); } }