Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
- changeset 995
- 62bc3775d5bb
- parent 910
- ebf7c13df6c0
- child 1359
- 25e14ad23cef
equal
deleted
inserted
replaced
| 994:459854f564ed | 995:62bc3775d5bb |
|---|---|
| 80 if (rd == null || outputdir == null) { | 80 if (rd == null || outputdir == null) { |
| 81 return; | 81 return; |
| 82 } | 82 } |
| 83 PackageDoc[] pds = rd.specifiedPackages(); | 83 PackageDoc[] pds = rd.specifiedPackages(); |
| 84 for (int i = 0; i < pds.length; i++) { | 84 for (int i = 0; i < pds.length; i++) { |
| 85 convertPackage(configuration, pds[i], outputdir); | 85 // If -nodeprecated option is set and the package is marked as deprecated, |
| 86 // do not convert the package files to HTML. | |
| 87 if (!(configuration.nodeprecated && Util.isDeprecated(pds[i]))) | |
| 88 convertPackage(configuration, pds[i], outputdir); | |
| 86 } | 89 } |
| 87 ClassDoc[] cds = rd.specifiedClasses(); | 90 ClassDoc[] cds = rd.specifiedClasses(); |
| 88 for (int i = 0; i < cds.length; i++) { | 91 for (int i = 0; i < cds.length; i++) { |
| 89 convertClass(configuration, cds[i], | 92 // If -nodeprecated option is set and the class is marked as deprecated |
| 90 getPackageOutputDir(outputdir, cds[i].containingPackage())); | 93 // or the containing package is deprecated, do not convert the |
| 94 // package files to HTML. | |
| 95 if (!(configuration.nodeprecated && | |
| 96 (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage())))) | |
| 97 convertClass(configuration, cds[i], | |
| 98 getPackageOutputDir(outputdir, cds[i].containingPackage())); | |
| 91 } | 99 } |
| 92 } | 100 } |
| 93 | 101 |
| 94 /** | 102 /** |
| 95 * Convert the Classes in the given Package to an HTML. | 103 * Convert the Classes in the given Package to an HTML. |
| 104 return; | 112 return; |
| 105 } | 113 } |
| 106 String classOutputdir = getPackageOutputDir(outputdir, pd); | 114 String classOutputdir = getPackageOutputDir(outputdir, pd); |
| 107 ClassDoc[] cds = pd.allClasses(); | 115 ClassDoc[] cds = pd.allClasses(); |
| 108 for (int i = 0; i < cds.length; i++) { | 116 for (int i = 0; i < cds.length; i++) { |
| 109 convertClass(configuration, cds[i], classOutputdir); | 117 // If -nodeprecated option is set and the class is marked as deprecated, |
| 118 // do not convert the package files to HTML. We do not check for | |
| 119 // containing package deprecation since it is already check in | |
| 120 // the calling method above. | |
| 121 if (!(configuration.nodeprecated && Util.isDeprecated(cds[i]))) | |
| 122 convertClass(configuration, cds[i], classOutputdir); | |
| 110 } | 123 } |
| 111 } | 124 } |
| 112 | 125 |
| 113 /** | 126 /** |
| 114 * Return the directory write output to for the given package. | 127 * Return the directory write output to for the given package. |
