← Back to branch summary

~ubuntu-branches/ubuntu/wily/aspectj/wily-proposed

« back to all changes in this revision

Viewing changes to org.aspectj/modules/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java

  • Committer: Bazaar Package Importer
  • Author(s): Damien Raude-Morvan
  • Date: 2011-03-15 23:54:31 UTC
  • mfrom: (1.2.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20110315235431-iq2gxbsx08kpwuiw
* New upstream release.
* Updated Standards-Version to 3.9.1 (no changes needed).
* Fix local Javadoc links:
  - d/patches/07_javadoc_links.diff: Use locally installed
   javadoc packages and hyperlink with them.
  - d/control: Add B-D on default-java-doc and libasm3-java-doc.
* d/control: Drop B-D on itself (our new bootstrap infrastructure doesn't need
  that anymore).
* Split packages into :
  - aspectj: only contains CLI tools.
  - libaspectj-java: JAR librairies for /usr/share/java.
  - libaspectj-java-doc: 4 API's Javadoc.
  - aspectj-doc: Programming Guides and SDK Documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.aspectj/modules/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
27
27
 * @author PARC
28
28
 * @author Andy Clement
29
29
 */
30
 
public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, AnnotatedElement, TypeVariableDeclaringElement,
31
 
                ResolvedMember {
 
30
public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, ResolvedMember {
32
31
 
33
32
        private String[] parameterNames = null;
34
33
        protected UnresolvedType[] checkedExceptions = UnresolvedType.NONE;
524
523
                                for (int i = 0; i < tvcount; i++) {
525
524
                                        m.typeVariables[i] = TypeVariable.read(s);
526
525
                                        m.typeVariables[i].setDeclaringElement(m);
 
526
                                        m.typeVariables[i].setRank(i);
527
527
                                }
528
528
                        }
529
529
                        if (s.getMajorVersion() >= AjAttribute.WeaverVersionInfo.WEAVER_VERSION_MAJOR_AJ150M4) {
742
742
                                typeMap.put(typeVariables[i].getName(), ut);
743
743
                        }
744
744
                }
745
 
                // For ITDs on generic types that use type variables from the target
746
 
                // type, the aliases
747
 
                // record the alternative names used throughout the ITD expression that
748
 
                // must map to
 
745
                // For ITDs on generic types that use type variables from the target type, the aliases
 
746
                // record the alternative names used throughout the ITD expression that must map to
749
747
                // the same value as the type variables real name.
750
748
                if (aliases != null) {
751
749
                        int posn = 0;
756
754
                        }
757
755
                }
758
756
 
759
 
                UnresolvedType parameterizedReturnType = parameterize(getGenericReturnType(), typeMap, isParameterized, newDeclaringType
760
 
                                .getWorld());
 
757
                UnresolvedType parameterizedReturnType = parameterize(getGenericReturnType(), typeMap, isParameterized,
 
758
                                newDeclaringType.getWorld());
761
759
                UnresolvedType[] parameterizedParameterTypes = new UnresolvedType[getGenericParameterTypes().length];
762
760
                UnresolvedType[] genericParameterTypes = getGenericParameterTypes();
763
761
                for (int i = 0; i < parameterizedParameterTypes.length; i++) {
764
 
                        parameterizedParameterTypes[i] = parameterize(genericParameterTypes[i], typeMap, isParameterized, newDeclaringType
765
 
                                        .getWorld());
 
762
                        parameterizedParameterTypes[i] = parameterize(genericParameterTypes[i], typeMap, isParameterized,
 
763
                                        newDeclaringType.getWorld());
766
764
                }
767
765
                ResolvedMemberImpl ret = new ResolvedMemberImpl(getKind(), newDeclaringType, getModifiers(), parameterizedReturnType,
768
766
                                getName(), parameterizedParameterTypes, getExceptions(), this);
930
928
        // }
931
929
        // return null;
932
930
        // }
933
 
        //      
 
931
        //
934
932
        // private ResolvedMember myErasure = null;
935
933
        // private boolean calculatedMyErasure = false;
936
934
        public boolean hasBackingGenericMember() {
1039
1037
         * getParam
1040
1038
         */
1041
1039
        public String getParameterSignatureErased() {
1042
 
                if (myParameterSignatureErasure != null) {
1043
 
                        return myParameterSignatureErasure;
1044
 
                }
1045
 
                StringBuffer sig = new StringBuffer();
1046
 
                UnresolvedType[] myParameterTypes = getParameterTypes();
1047
 
                for (int i = 0; i < myParameterTypes.length; i++) {
1048
 
                        UnresolvedType thisParameter = myParameterTypes[i];
1049
 
                        // type vars will be erased to first bound
1050
 
                        sig.append(thisParameter.getErasureSignature());
1051
 
                }
1052
 
                myParameterSignatureErasure = sig.toString();
 
1040
                if (myParameterSignatureErasure == null) {
 
1041
                        StringBuilder sig = new StringBuilder();
 
1042
                        for (UnresolvedType parameter : getParameterTypes()) {
 
1043
                                sig.append(parameter.getErasureSignature());
 
1044
                        }
 
1045
                        myParameterSignatureErasure = sig.toString();
 
1046
                }
1053
1047
                return myParameterSignatureErasure;
1054
1048
        }
1055
1049