/[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.5 by julian, Sun Nov 21 16:35:46 2004 UTC revision 1.6 by julian, Mon Nov 22 12:42:22 2004 UTC
# Line 116  public class RootDocImpl extends DocImpl Line 116  public class RootDocImpl extends DocImpl
116    
117     private List sourcePath;     private List sourcePath;
118    
119       private String sourceEncoding;
120    
121     //--------------------------------------------------------------------------     //--------------------------------------------------------------------------
122     //     //
123     // Implementation of RootDoc interface     // Implementation of RootDoc interface
# Line 199  public class RootDocImpl extends DocImpl Line 201  public class RootDocImpl extends DocImpl
201    
202        File javaLangSources = findSourceFile("java/lang");        File javaLangSources = findSourceFile("java/lang");
203        if (null!=javaLangSources) {        if (null!=javaLangSources) {
204           parser.processSourceDir(javaLangSources);           parser.processSourceDir(javaLangSources, sourceEncoding);
205        }        }
206        else {        else {
207    
# Line 219  public class RootDocImpl extends DocImpl Line 221  public class RootDocImpl extends DocImpl
221           printNotice("Loading classes for package "+specifiedPackageName+"...");           printNotice("Loading classes for package "+specifiedPackageName+"...");
222           File sourceDir = findSourceFile(specifiedPackageName.replace('.',File.separatorChar));           File sourceDir = findSourceFile(specifiedPackageName.replace('.',File.separatorChar));
223           if (null!=sourceDir) {           if (null!=sourceDir) {
224              parser.processSourceDir(sourceDir);              parser.processSourceDir(sourceDir, sourceEncoding);
225           }           }
226           else {           else {
227              printError("Package '"+specifiedPackageName+"' not found.");              printError("Package '"+specifiedPackageName+"' not found.");
# Line 234  public class RootDocImpl extends DocImpl Line 236  public class RootDocImpl extends DocImpl
236           printNotice("Loading class "+specifiedClassName+" ...");           printNotice("Loading class "+specifiedClassName+" ...");
237           File sourceFile = findSourceFile(specifiedClassName.replace('.',File.separatorChar)+".java");           File sourceFile = findSourceFile(specifiedClassName.replace('.',File.separatorChar)+".java");
238           if (null!=sourceFile) {           if (null!=sourceFile) {
239              parser.processSourceFile(sourceFile, true);              parser.processSourceFile(sourceFile, true, sourceEncoding);
240           }           }
241           else {           else {
242              printError("Class '"+specifiedClassName+"' not found.");              printError("Class '"+specifiedClassName+"' not found.");
# Line 273  public class RootDocImpl extends DocImpl Line 275  public class RootDocImpl extends DocImpl
275        for (Iterator it = specifiedClassNames.iterator(); it.hasNext(); ) {        for (Iterator it = specifiedClassNames.iterator(); it.hasNext(); ) {
276           String specifiedClassName = (String)it.next();           String specifiedClassName = (String)it.next();
277           ClassDocImpl specifiedClassDoc = (ClassDocImpl)classDocMap.get(specifiedClassName);           ClassDocImpl specifiedClassDoc = (ClassDocImpl)classDocMap.get(specifiedClassName);
278           specifiedClassDoc.setIsIncluded(true);           if (null == specifiedClassDoc) {
279           specifiedClassesList.add(specifiedClassDoc);              printWarning("No documentation found for class " +specifiedClassName + " - wrong filename?");
280           classesList.add(specifiedClassDoc);           }
281             else {
282                specifiedClassDoc.setIsIncluded(true);
283                specifiedClassesList.add(specifiedClassDoc);
284                classesList.add(specifiedClassDoc);
285             }
286        }        }
287        this.specifiedClasses=(ClassDocImpl[])specifiedClassesList.toArray(new ClassDocImpl[0]);        this.specifiedClasses=(ClassDocImpl[])specifiedClassesList.toArray(new ClassDocImpl[0]);
288    
# Line 408  public class RootDocImpl extends DocImpl Line 415  public class RootDocImpl extends DocImpl
415                 }                 }
416              }              }
417              else {              else {
418                 printWarning("No description found for package "+packageName);                 printNotice("No description found for package "+packageName);
419              }              }
420           }           }
421           addPackageDoc(rc);           addPackageDoc(rc);
# Line 563  public class RootDocImpl extends DocImpl Line 570  public class RootDocImpl extends DocImpl
570    
571           File file=findScheduledClassFile(scheduledClassName, scheduledClassContext);           File file=findScheduledClassFile(scheduledClassName, scheduledClassContext);
572           if (file!=null) {           if (file!=null) {
573              parser.processSourceFile(file, false);              parser.processSourceFile(file, false, sourceEncoding);
574           }           }
575           else {           else {
576              // It might be an inner class of one of the outer/super classes.              // It might be an inner class of one of the outer/super classes.
# Line 732  public class RootDocImpl extends DocImpl Line 739  public class RootDocImpl extends DocImpl
739        scheduledClasses = null;        scheduledClasses = null;
740        sourcePath = null;        sourcePath = null;
741     }     }
742    
743       public void setSourceEncoding(String sourceEncoding)
744       {
745          this.sourceEncoding = sourceEncoding;
746       }
747  }  }

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

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