You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2013/01/22 21:48:48 UTC
svn commit: r1437155 - in /commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model: WeavableConstructorParameter.java WeavableMethodParameter.java WeavableParameter.java

Author: mbenson
Date: Tue Jan 22 20:48:47 2013
New Revision: 1437155

URL: http://svn.apache.org/viewvc?rev=1437155&view=rev
Log:
move the SELF type down a level because the compiler seems to be more agreeable that way

Modified:
    commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java
    commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java
    commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java

Modified: commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java?rev=1437155&r1=1437154&r2=1437155&view=diff
==============================================================================
--- commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java (original)
+++ commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructorParameter.java Tue Jan 22 20:48:47 2013
@@ -20,7 +20,8 @@ package org.apache.commons.weaver.model;
 
 import java.lang.reflect.Constructor;
 
-public class WeavableConstructorParameter<T> extends WeavableParameter<WeavableConstructor<T>, Constructor<T>, T> {
+public class WeavableConstructorParameter<T> extends
+    WeavableParameter<WeavableConstructorParameter<T>, WeavableConstructor<T>, Constructor<T>, T> {
 
     public WeavableConstructorParameter(Integer target, WeavableConstructor<T> parent) {
         super(target, parent);

Modified: commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java?rev=1437155&r1=1437154&r2=1437155&view=diff
==============================================================================
--- commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java (original)
+++ commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableMethodParameter.java Tue Jan 22 20:48:47 2013
@@ -20,7 +20,8 @@ package org.apache.commons.weaver.model;
 
 import java.lang.reflect.Method;
 
-public class WeavableMethodParameter<T> extends WeavableParameter<WeavableMethod<T>, Method, T> {
+public class WeavableMethodParameter<T> extends
+    WeavableParameter<WeavableMethodParameter<T>, WeavableMethod<T>, Method, T> {
 
     public WeavableMethodParameter(Integer target, WeavableMethod<T> parent) {
         super(target, parent);

Modified: commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java?rev=1437155&r1=1437154&r2=1437155&view=diff
==============================================================================
--- commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java (original)
+++ commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/model/WeavableParameter.java Tue Jan 22 20:48:47 2013
@@ -20,15 +20,15 @@ package org.apache.commons.weaver.model;
 
 import java.lang.reflect.Member;
 
-public class WeavableParameter<PARENT extends WeavableExecutable<PARENT, PARENT_TARGET, T>, PARENT_TARGET extends Member, T>
-    extends NestedWeavable<WeavableParameter<PARENT, PARENT_TARGET, T>, Integer, PARENT, PARENT_TARGET> {
+public class WeavableParameter<SELF extends WeavableParameter<SELF, PARENT, PARENT_TARGET, T>, PARENT extends WeavableExecutable<PARENT, PARENT_TARGET, T>, PARENT_TARGET extends Member, T>
+    extends NestedWeavable<SELF, Integer, PARENT, PARENT_TARGET> {
 
     protected WeavableParameter(Integer target, PARENT parent) {
         super(target, parent);
     }
 
     @Override
-    protected int localCompareTo(WeavableParameter<PARENT, PARENT_TARGET, T> o) {
+    protected int localCompareTo(SELF o) {
         return getTarget().compareTo(getTarget());
     }