You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/03/03 22:42:37 UTC
svn commit: r1076810 - 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:42:36 2011
New Revision: 1076810
URL: http://svn.apache.org/viewvc?rev=1076810&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/internal/services/ServiceInjectionProvider.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=1076810&r1=1076809&r2=1076810&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:36 2011
@@ -894,7 +894,8 @@ public final class InternalClassTransfor
addImplementedInterface(Component.class);
- resourcesFieldName = createField((Modifier.PROTECTED | Modifier.FINAL), InternalComponentResources.class.getName(), "resources").getName();
+ resourcesFieldName = createField((Modifier.PROTECTED | Modifier.FINAL),
+ InternalComponentResources.class.getName(), "resources").getName();
addToConstructor(String.format(" %s = $1;", resourcesFieldName));
@@ -1845,11 +1846,6 @@ public final class InternalClassTransfor
addToConstructor(String.format(" %s = %s;", fieldName, addConstructorArg(fieldType, value)));
}
- public void injectField(String fieldName, Object value)
- {
- getField(fieldName).inject(value);
- }
-
private CtClass convertNameToCtType(String type) throws NotFoundException
{
return classPool.get(type);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java?rev=1076810&r1=1076809&r2=1076810&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java Thu Mar 3 21:42:36 2011
@@ -1,10 +1,10 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,13 +35,13 @@ public class ServiceInjectionProvider im
@SuppressWarnings("unchecked")
public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel)
+ ClassTransformation transformation, MutableComponentModel componentModel)
{
Object inject = this.locator.getService(fieldType);
assert inject != null;
- transformation.injectField(fieldName, inject);
+ transformation.getField(fieldName).inject(inject);
// If we make it this far without an exception, then we were successful
// and should claim the field.
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=1076810&r1=1076809&r2=1076810&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:36 2011
@@ -220,20 +220,6 @@ public interface ClassTransformation ext
<T> TransformField addIndirectInjectedField(Class<T> type, String suggestedName, ComponentValueProvider<T> provider);
/**
- * Converts an <em>existing</em> field into a read only field whose value is the provided
- * value. This is used
- * when converting an
- * existing field into a read-only injected value.
- *
- * @param fieldName
- * name of field to convert
- * @param value
- * the value provided by the field
- * @deprecated Use {@link TransformField#inject(Object)} instead
- */
- void injectField(String fieldName, Object value);
-
- /**
* Transforms the class to implement the indicated interface. If the class (or its super class)
* does not already
* implement the interface, then the interface is added, and default implementations of any
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=1076810&r1=1076809&r2=1076810&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:36 2011
@@ -803,7 +803,7 @@ public class InternalClassTransformation
InternalClassTransformation ct = new InternalClassTransformationImpl(classFactory, targetObjectCtClass, null,
model, null, false);
- ct.injectField("_value", "Tapestry");
+ ct.getField("_value").inject("Tapestry");
ct.finish();