jdk-sandbox: comparison src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java

equal deleted inserted replaced

-:f8fb0c86f2b3
+:43efb4ca6d6c
 import javax.tools.Diagnostic;
 import javax.tools.DocumentationTool;
 import jdk.javadoc.doclet.Reporter;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+import jdk.javadoc.internal.doclets.toolkit.Resources;
 /**
 * Process and manage "-link" and "-linkoffline" to external packages. The
 * options "-link" and "-linkoffline" both depend on the fact that Javadoc now
 * generates "package-list"(lists all the packages which are getting
 /**
 * The global configuration information for this run.
 */
 private final BaseConfiguration configuration;
+private final Resources resources;
+private final Utils utils;
 /**
 * True if we are using -linkoffline and false if -link is used instead.
 */
 private boolean linkoffline = false;
 }
 }
 public Extern(BaseConfiguration configuration) {
 this.configuration = configuration;
+this.resources = configuration.getResources();
+this.utils = configuration.utils;
 }
 /**
 * Determine if a element item is externally documented.
 *
 */
 public boolean isExternal(Element element) {
 if (packageItems.isEmpty()) {
 return false;
 }
-PackageElement pe = configuration.utils.containingPackage(element);
+PackageElement pe = utils.containingPackage(element);
 if (pe.isUnnamed()) {
 return false;
 }
 return findElementItem(pe) != null;
 private URL toURL(String url) throws Fault {
 try {
 return new URL(url);
 } catch (MalformedURLException e) {
-throw new Fault(configuration.getText("doclet.MalformedURL", url), e);
+throw new Fault(resources.getText("doclet.MalformedURL", url), e);
 }
 }
 private class Fault extends Exception {
 private static final long serialVersionUID = 0;
 * @param element Element
 */
 private Item findElementItem(Element element) {
 Item item = null;
 if (element instanceof ModuleElement) {
-item = moduleItems.get(configuration.utils.getModuleName((ModuleElement)element));
+item = moduleItems.get(utils.getModuleName((ModuleElement)element));
 }
 else if (element instanceof PackageElement) {
 PackageElement packageElement = (PackageElement)element;
-ModuleElement moduleElement = configuration.utils.containingModule(packageElement);
+ModuleElement moduleElement = utils.containingModule(packageElement);
-Map<String, Item> pkgMap = packageItems.get(configuration.utils.getModuleName(moduleElement));
+Map<String, Item> pkgMap = packageItems.get(utils.getModuleName(moduleElement));
-item = (pkgMap != null) ? pkgMap.get(configuration.utils.getPackageName(packageElement)) : null;
+item = (pkgMap != null) ? pkgMap.get(utils.getPackageName(packageElement)) : null;
 }
 return item;
 }
 /**
 private void readElementListFromURL(String urlpath, URL elemlisturlpath) throws Fault {
 try {
 URL link = elemlisturlpath.toURI().resolve(DocPaths.ELEMENT_LIST.getPath()).toURL();
 readElementList(link.openStream(), urlpath, false);
 } catch (URISyntaxException | MalformedURLException exc) {
-throw new Fault(configuration.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
+throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
 } catch (IOException exc) {
 readAlternateURL(urlpath, elemlisturlpath);
 }
 }
 private void readAlternateURL(String urlpath, URL elemlisturlpath) throws Fault {
 try {
 URL link = elemlisturlpath.toURI().resolve(DocPaths.PACKAGE_LIST.getPath()).toURL();
 readElementList(link.openStream(), urlpath, false);
 } catch (URISyntaxException | MalformedURLException exc) {
-throw new Fault(configuration.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
+throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc);
 } catch (IOException exc) {
-throw new Fault(configuration.getText("doclet.URL_error", elemlisturlpath.toString()), exc);
+throw new Fault(resources.getText("doclet.URL_error", elemlisturlpath.toString()), exc);
 }
 }
 /**
 * Read the "element-list" file which is available locally.
 file1 = file1.resolveAgainst(DocumentationTool.Location.DOCUMENTATION_OUTPUT);
 }
 if (file1.exists()) {
 readElementList(file1, path);
 } else {
-throw new Fault(configuration.getText("doclet.File_error", file.getPath()), null);
+throw new Fault(resources.getText("doclet.File_error", file.getPath()), null);
 }
 }
 }
 private void readElementList(DocFile file, String path) throws Fault, DocFileIOException {
 boolean pathIsRelative
 = !isUrl(path)
 && !DocFile.createFileForInput(configuration, path).isAbsolute();
 readElementList(file.openInputStream(), path, pathIsRelative);
 } else {
-throw new Fault(configuration.getText("doclet.File_error", file.getPath()), null);
+throw new Fault(resources.getText("doclet.File_error", file.getPath()), null);
 }
 } catch (IOException exc) {
-throw new Fault(configuration.getText("doclet.File_error", file.getPath()), exc);
+throw new Fault(resources.getText("doclet.File_error", file.getPath()), exc);
 }
 }
 /**
 * Read the file "element-list" and for each element name found, create
 PackageElement pe = configuration.utils.elementUtils.getPackageElement(packageName);
 if (pe != null) {
 ModuleElement me = (ModuleElement)pe.getEnclosingElement();
 if (me == null || me.isUnnamed()) {
 if (moduleName != null)
-throw new Fault(configuration.getText("doclet.linkMismatch_PackagedLinkedtoModule",
+throw new Fault(resources.getText("doclet.linkMismatch_PackagedLinkedtoModule",
 path), null);
 } else if (moduleName == null)
-throw new Fault(configuration.getText("doclet.linkMismatch_ModuleLinkedtoPackage",
+throw new Fault(resources.getText("doclet.linkMismatch_ModuleLinkedtoPackage",
 path), null);
 }
 }
 }

changeset 52644	43efb4ca6d6c
parent 51861	f7d40158eb2f
child 52687	526f5cf13972