Author: hlship
Date: Tue Jul 13 22:13:56 2010
New Revision: 963878
URL: http://svn.apache.org/viewvc?rev=963878&view=rev
Log:
TAP5-1197: Introduce a level of indirection concerning FieldAccess that allows
for optimized access in some circumstances
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java
(with props)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java?rev=963878&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java
Tue Jul 13 22:13:56 2010
@@ -0,0 +1,45 @@
+// Copyright 2010 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.internal.services;
+
+import org.apache.tapestry5.ioc.services.FieldValueConduit;
+import org.apache.tapestry5.services.FieldAccess;
+import org.apache.tapestry5.services.TransformField;
+
+/**
+ * A temporary version of {...@link FieldAccess} returned in some
circumstances from {...@link TransformField#getAccess()}.
+ * {...@linkplain
TransformField#replaceAccess(org.apache.tapestry5.ioc.services.FieldValueConduit)
replaced} (with a
+ * {...@link FieldValueConduit}), the delegate of this class may be pointed
directly at the FieldValueConduit (through an
+ * adapter) and no extra classes or static methods (on the component class)
will need to be constructed.
+ *
+ * @since 5.2.0
+ */
+class DelegateFieldAccess implements FieldAccess
+{
+ // Technically, this field should be volatile or synchronized; I hope it
falls under the proper
+ // synchronization umbrella by the time its actually used in a live
component class.
+
+ FieldAccess delegate;
+
+ public Object read(Object instance)
+ {
+ return delegate.read(instance);
+ }
+
+ public void write(Object instance, Object value)
+ {
+ delegate.write(instance, value);
+ }
+}
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DelegateFieldAccess.java
------------------------------------------------------------------------------
svn:eol-style = native
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=963878&r1=963877&r2=963878&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
Tue Jul 13 22:13:56 2010
@@ -433,6 +433,8 @@ public final class InternalClassTransfor
String readValueBody, writeValueBody;
+ private DelegateFieldAccess delegateFieldAccess;
+
private org.apache.tapestry5.services.FieldAccess access;
TransformFieldImpl(CtField field, boolean added)
@@ -452,6 +454,16 @@ public final class InternalClassTransfor
}
}
+ void doFinish()
+ {
+ if (delegateFieldAccess != null)
+ {
+ access = createAccess();
+ delegateFieldAccess.delegate = access;
+ delegateFieldAccess = null;
+ }
+ }
+
@Override
public String toString()
{
@@ -550,18 +562,23 @@ public final class InternalClassTransfor
{
failIfFrozen();
- if (access == null)
- createAccess();
+ if (access != null)
+ return access;
- return access;
+ if (delegateFieldAccess == null)
+ {
+ delegateFieldAccess = new DelegateFieldAccess();
+ }
+
+ return delegateFieldAccess;
}
- private void createAccess()
+ private org.apache.tapestry5.services.FieldAccess createAccess()
{
TransformMethod reader = createReader();
TransformMethod writer = createWriter();
- access = createFieldAccess(reader, writer);
+ return createFieldAccess(reader, writer);
}
private org.apache.tapestry5.services.FieldAccess
createFieldAccess(TransformMethod reader,
@@ -646,6 +663,16 @@ public final class InternalClassTransfor
{
String fieldName =
addInjectedFieldUncached(FieldValueConduit.class, name + "$conduit", conduit);
+ // TODO: If access != null?
+
+ access = toFieldAccess(conduit);
+
+ if (delegateFieldAccess != null)
+ {
+ delegateFieldAccess.delegate = access;
+ delegateFieldAccess = null;
+ }
+
replaceAccess(getTransformFieldImpl(fieldName));
}
@@ -1807,6 +1834,14 @@ public final class InternalClassTransfor
{
failIfFrozen();
+ // Finishing fields may sometimes create new methods, so finish the
fields
+ // first.
+
+ for (TransformFieldImpl tfi : fields.values())
+ {
+ tfi.doFinish();
+ }
+
// doFinish() will sometimes create new methods on the
ClassTransformation, yielding
// a concurrent modification exception, so do a defensive copy.
@@ -2344,4 +2379,21 @@ public final class InternalClassTransfor
}
};
}
+
+ private static org.apache.tapestry5.services.FieldAccess
toFieldAccess(final FieldValueConduit conduit)
+ {
+ return new org.apache.tapestry5.services.FieldAccess()
+ {
+
+ public void write(Object instance, Object value)
+ {
+ conduit.set(value);
+ }
+
+ public Object read(Object instance)
+ {
+ return conduit.get();
+ }
+ };
+ }
}
