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

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

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

revision 1.12 by julian, Tue Dec 7 15:00:01 2004 UTC revision 1.13 by julian, Wed Dec 8 14:58:18 2004 UTC
# Line 49  public class RootDocImpl extends DocImpl Line 49  public class RootDocImpl extends DocImpl
49     private List specifiedClassNames = new LinkedList();     private List specifiedClassNames = new LinkedList();
50    
51     /**     /**
52        *  All source files explicitly specified on the command line.
53        *
54        *  @contains File
55        */
56       private List specifiedSourceFiles = new LinkedList();
57    
58       /**
59      *  The names of all packages explicitly specified on the      *  The names of all packages explicitly specified on the
60      *  command line.      *  command line.
61      *      *
# Line 243  public class RootDocImpl extends DocImpl Line 250  public class RootDocImpl extends DocImpl
250           }           }
251        }        }
252    
253          List specifiedClassesList = new LinkedList();
254    
255          //--- Parse all explicitly specified source files.
256    
257          for (Iterator it=specifiedSourceFiles.iterator(); it.hasNext(); ) {
258    
259             File specifiedSourceFile = (File)it.next();
260             printNotice("Loading source file "+specifiedSourceFile+" ...");
261             ClassDocImpl classDoc = parser.processSourceFile(specifiedSourceFile, true, sourceEncoding);
262             if (null != classDoc) {
263                specifiedClassesList.add(classDoc);
264                classesList.add(classDoc);
265                classDoc.setIsIncluded(true);
266                if (0 == classDoc.containingPackage().name().length()) {
267                   addPackageDoc(classDoc.containingPackage());
268                }
269             }
270          }
271    
272        //--- Let the user know that all specified classes are loaded.        //--- Let the user know that all specified classes are loaded.
273    
274        printNotice("Constructing Javadoc information...");        printNotice("Constructing Javadoc information...");
# Line 273  public class RootDocImpl extends DocImpl Line 299  public class RootDocImpl extends DocImpl
299    
300        //--- Assemble the array with all specified classes        //--- Assemble the array with all specified classes
301    
       List specifiedClassesList = new LinkedList();  
302        for (Iterator it = specifiedClassNames.iterator(); it.hasNext(); ) {        for (Iterator it = specifiedClassNames.iterator(); it.hasNext(); ) {
303           String specifiedClassName = (String)it.next();           String specifiedClassName = (String)it.next();
304           ClassDocImpl specifiedClassDoc = (ClassDocImpl)classDocMap.get(specifiedClassName);           ClassDocImpl specifiedClassDoc = (ClassDocImpl)classDocMap.get(specifiedClassName);
# Line 290  public class RootDocImpl extends DocImpl Line 315  public class RootDocImpl extends DocImpl
315    
316        //--- Assemble the array with all specified packages        //--- Assemble the array with all specified packages
317    
318        List specifiedPackageList = new LinkedList();        Set specifiedPackageSet = new LinkedHashSet();
319        for (Iterator it = specifiedPackageNames.iterator(); it.hasNext(); ) {        for (Iterator it = specifiedPackageNames.iterator(); it.hasNext(); ) {
320           String specifiedPackageName = (String)it.next();           String specifiedPackageName = (String)it.next();
321           PackageDoc specifiedPackageDoc = (PackageDoc)packageDocMap.get(specifiedPackageName);           PackageDoc specifiedPackageDoc = (PackageDoc)packageDocMap.get(specifiedPackageName);
# Line 298  public class RootDocImpl extends DocImpl Line 323  public class RootDocImpl extends DocImpl
323              //System.err.println("include package " + specifiedPackageName);              //System.err.println("include package " + specifiedPackageName);
324    
325              ((PackageDocImpl)specifiedPackageDoc).setIsIncluded(true);              ((PackageDocImpl)specifiedPackageDoc).setIsIncluded(true);
326              specifiedPackageList.add(specifiedPackageDoc);              specifiedPackageSet.add(specifiedPackageDoc);
327    
328              ClassDoc[] packageClassDocs=specifiedPackageDoc.allClasses();              ClassDoc[] packageClassDocs=specifiedPackageDoc.allClasses();
329              for (int i=0; i<packageClassDocs.length; ++i) {              for (int i=0; i<packageClassDocs.length; ++i) {
# Line 316  public class RootDocImpl extends DocImpl Line 341  public class RootDocImpl extends DocImpl
341              }              }
342           }           }
343        }        }
344        this.specifiedPackages=(PackageDocImpl[])specifiedPackageList.toArray(new PackageDocImpl[0]);        this.specifiedPackages=(PackageDocImpl[])specifiedPackageSet.toArray(new PackageDocImpl[0]);
345    
346        //--- Resolve pending references in comment data of all classes        //--- Resolve pending references in comment data of all classes
347    
# Line 705  public class RootDocImpl extends DocImpl Line 730  public class RootDocImpl extends DocImpl
730        specifiedClassNames.add(className);        specifiedClassNames.add(className);
731     }     }
732    
733       public void addSpecifiedSourceFile(File sourceFile) {
734          specifiedSourceFiles.add(sourceFile);
735       }
736    
737     public boolean hasSpecifiedPackagesOrClasses() {     public boolean hasSpecifiedPackagesOrClasses() {
738        return !specifiedClassNames.isEmpty() || !specifiedPackageNames.isEmpty();        return !specifiedClassNames.isEmpty()
739             || !specifiedPackageNames.isEmpty()
740             || !specifiedSourceFiles.isEmpty();
741     }     }
742    
743     public void setOptions(String[][] customOptionArr) {     public void setOptions(String[][] customOptionArr) {

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

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