Repository: tapestry-5 Updated Branches: refs/heads/master d9ad274bf -> 92616a625
switch to Java 1.6 for plastic transformations Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/92616a62 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/92616a62 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/92616a62 Branch: refs/heads/master Commit: 92616a625c113327c9fa4b1d048a99251dd7b209 Parents: d9ad274 Author: Jochen Kemnade <[email protected]> Authored: Thu Apr 23 14:21:04 2015 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Thu Apr 23 14:21:04 2015 +0200 ---------------------------------------------------------------------- .../internal/plastic/MethodAdviceManager.java | 2 +- .../internal/plastic/PlasticClassImpl.java | 2 +- .../internal/plastic/PlasticClassPool.java | 2 +- .../tapestry5/plastic/PlasticConstants.java | 29 ++++++++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/92616a62/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java index 870f0c2..551fcde 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java @@ -67,7 +67,7 @@ class MethodAdviceManager invocationClassNode = new ClassNode(); - invocationClassNode.visit(org.apache.tapestry5.internal.plastic.asm.Opcodes.V1_5, Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, plasticClass.nameCache.toInternalName(invocationClassName), + invocationClassNode.visit(PlasticConstants.DEFAULT_VERSION_OPCODE, Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, plasticClass.nameCache.toInternalName(invocationClassName), null, PlasticClassImpl.ABSTRACT_METHOD_INVOCATION_INTERNAL_NAME, new String[] {plasticClass.nameCache.toInternalName(MethodInvocation.class)}); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/92616a62/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java index c07bcaf..1de64f5 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java @@ -896,7 +896,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal ClassNode shimClassNode = new ClassNode(); - shimClassNode.visit(V1_5, ACC_PUBLIC | ACC_FINAL, shimClassName, null, HANDLE_SHIM_BASE_CLASS_INTERNAL_NAME, + shimClassNode.visit(PlasticConstants.DEFAULT_VERSION_OPCODE, ACC_PUBLIC | ACC_FINAL, shimClassName, null, HANDLE_SHIM_BASE_CLASS_INTERNAL_NAME, null); implementConstructor(shimClassNode); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/92616a62/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java index 5db10cd..01e8359 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java @@ -521,7 +521,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl final String internalNewClassNameinternalName = PlasticInternalUtils.toInternalName(newClassName); final String internalBaseClassName = PlasticInternalUtils.toInternalName(baseClassName); - newClassNode.visit(V1_5, ACC_PUBLIC, internalNewClassNameinternalName, null, internalBaseClassName, null); + newClassNode.visit(PlasticConstants.DEFAULT_VERSION_OPCODE, ACC_PUBLIC, internalNewClassNameinternalName, null, internalBaseClassName, null); ClassNode implementationClassNode = null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/92616a62/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java new file mode 100644 index 0000000..192c0a5 --- /dev/null +++ b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java @@ -0,0 +1,29 @@ +// 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.plastic; + +import org.apache.tapestry5.internal.plastic.asm.Opcodes; + + +public final class PlasticConstants +{ + /** + * The minimum Java version we support + */ + public static final int DEFAULT_VERSION_OPCODE = Opcodes.V1_6; + + private PlasticConstants() + { + } + +}
