/[classpath]/gjdoc/src/gnu/classpath/tools/gjdoc/ClassDocImpl.java
ViewVC logotype

Diff of /gjdoc/src/gnu/classpath/tools/gjdoc/ClassDocImpl.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16 by julian, Tue Dec 14 13:52:45 2004 UTC revision 1.17 by julian, Wed Dec 15 10:35:15 2004 UTC
# Line 395  public class ClassDocImpl Line 395  public class ClassDocImpl
395           rc.setSuperclass(superclassProxy);           rc.setSuperclass(superclassProxy);
396        }        }
397    
398        /*        ClassDoc[] interfaces=new ClassDoc[implementedInterfaces.size()];
399        if (!rc.isInterface()) {        for (int i=0; i<interfaces.length; ++i) {
       */  
          ClassDoc[] interfaces=new ClassDoc[implementedInterfaces.size()];  
          for (int i=0; i<interfaces.length; ++i) {  
400              interfaces[i]=new ClassDocProxy((String)implementedInterfaces.get(i), rc);              interfaces[i]=new ClassDocProxy((String)implementedInterfaces.get(i), rc);
          }  
          Arrays.sort(interfaces);  
          rc.setInterfaces(interfaces);  
          /*  
       }  
       else {  
          if (!superclassName.equals("java.lang.Object"))  
             rc.setInterfaces(new ClassDoc[]{superclassProxy});  
          else  
             rc.setInterfaces(new ClassDoc[0]);  
401        }        }
402           */        rc.setInterfaces(interfaces);
   
       //Debug.log(9,rc.name());  
403    
404        if (rc.isInterface() && rc.containingClass()!=null) {        if (rc.isInterface() && rc.containingClass()!=null) {
405           rc.setIsStatic(true);           rc.setIsStatic(true);
# Line 748  public class ClassDocImpl Line 733  public class ClassDocImpl
733     }     }
734    
735     public ExecutableMemberDoc findExecutableRec(String nameAndSignature) {     public ExecutableMemberDoc findExecutableRec(String nameAndSignature) {
736    
737        ExecutableMemberDoc rc;        ExecutableMemberDoc rc;
738        for (ClassDocImpl cdi=this; cdi!=null; ) {        for (ClassDocImpl cdi=this; cdi!=null; ) {
739           rc=cdi.findMethod(nameAndSignature);           rc=cdi.findMethod(nameAndSignature);
# Line 806  public class ClassDocImpl Line 792  public class ClassDocImpl
792    
793     private String resolveSignature(String signature)     private String resolveSignature(String signature)
794     {     {
795        signature = signature.substring(1, signature.length() - 1);        signature = signature.substring(1, signature.length() - 1).trim();
796          if (0 == signature.length()) {
797             return "()";
798          }
799        StringTokenizer st = new StringTokenizer(signature, ",");        StringTokenizer st = new StringTokenizer(signature, ",");
800        StringBuffer fullSignature = new StringBuffer("(");        StringBuffer fullSignature = new StringBuffer("(");
801        while (st.hasMoreTokens()) {        while (st.hasMoreTokens()) {
# Line 995  public class ClassDocImpl Line 984  public class ClassDocImpl
984              return rc;              return rc;
985           }           }
986           else if (null != c1.containingClass() && null != c2.containingClass()) {           else if (null != c1.containingClass() && null != c2.containingClass()) {
987              rc = c1.compareTo(c2.containingClass());              rc = c1.containingClass().compareTo(c2.containingClass());
988              if (0 != rc) {              if (0 != rc) {
989                 return rc;                 return rc;
990              }              }

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26