Changeset 1146

Show
Ignore:
Timestamp:
05/01/08 00:12:07 (4 months ago)
Author:
asterite
Message:

Ups, introduced a bug in one of the previous releases.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/descent.core/src/descent/core/Signature.java

    r1141 r1146  
    16201620            @Override 
    16211621            public void acceptModule(char[][] compoundName, String signature) { 
    1622                 acceptIdentifier(compoundName, signature); 
     1622                Stack<StringBuilder> st = stack.peek(); 
     1623                 
     1624                StringBuilder sb = new StringBuilder(); 
     1625                 
     1626                for (int i = 0; i < compoundName.length; i++) { 
     1627                    if (i != 0) { 
     1628                        sb.append('.'); 
     1629                    } 
     1630                    sb.append(compoundName[i]); 
     1631                } 
     1632                 
     1633                st.push(sb); 
    16231634            } 
    16241635            @Override 

  • trunk/descent.core/src/descent/internal/core/SearchableEnvironment.java

    r1132 r1146  
    468468                    storage.acceptType(packageName, simpleTypeName, templateParametersSignature, enclosingTypeNames, modifiers, declarationStart, access); 
    469469                } 
    470                 public void acceptField(long modifiers, char[] packageName, char[] name, char[] typeName, char[][] enclosingTypeNames, String path, AccessRestriction access) { 
     470                public void acceptField(long modifiers, char[] packageName, char[] name, char[] typeName, char[][] enclosingTypeNames, String path, int declarationStart, AccessRestriction access) { 
    471471                    if (excludePath != null && excludePath.equals(path)) 
    472472                        return; 
    473473                    if (!findMembers && enclosingTypeNames != null && enclosingTypeNames.length > 0) 
    474474                        return; // accept only top level types 
    475                     storage.acceptField(packageName, name, typeName, enclosingTypeNames, modifiers, access); 
     475                    storage.acceptField(packageName, name, typeName, enclosingTypeNames, modifiers, declarationStart, access); 
    476476                } 
    477477                public void acceptMethod(long modifiers, char[] packageName, char[] name, char[][] enclosingTypeNames, char[] signature, char[] templateParametersSignature, String path, int declarationStart, AccessRestriction access) { 

  • trunk/descent.ui/src/descent/ui/text/java/CompletionProposalLabelProvider.java

    r1132 r1146  
    544544        if (declSignature != null && declSignature.length != 0) { 
    545545            buf.append(JavaElementLabels.CONCAT_STRING); 
    546              
    547             if (new String(declSignature).equals("3Foo!^i^f\'")) { 
    548                 System.out.println(1); 
    549             } 
    550546             
    551547            buf.append(Signature.toCharArray(declSignature,