jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java

-:7b6c1bfeeb03
+:6f0746b6de9f
 /*
-* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import com.sun.tools.doclets.internal.toolkit.util.*;
 import com.sun.tools.doclint.DocLint;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.StringUtils;
+import com.sun.tools.javadoc.JavaScriptScanner;
 import com.sun.tools.javadoc.RootDocImpl;
 /**
 * Configure the output based on the command line options.
 * <p>
 /**
 * Collected set of doclint options
 */
 public Set<String> doclintOpts = new LinkedHashSet<String>();
+/**
+* Whether or not to check for JavaScript in doc comments.
+*/
+private boolean allowScriptInComments;
 /**
 * Unique Resource Handler for this package.
 */
 public final MessageRetriever standardmessage;
 overview = true;
 } else if (opt.equals("-xdoclint")) {
 doclintOpts.add(null);
 } else if (opt.startsWith("-xdoclint:")) {
 doclintOpts.add(opt.substring(opt.indexOf(":") + 1));
-}
+} else if (opt.equals("--allow-script-in-comments")) {
-}
+allowScriptInComments = true;
+}
+}
 if (root.specifiedClasses().length > 0) {
 Map<String,PackageDoc> map = new HashMap<String,PackageDoc>();
 PackageDoc pd;
 ClassDoc[] classes = root.classes();
 for (int i = 0; i < classes.length; i++) {
 setCreateOverview();
 setTopFile(root);
 if (root instanceof RootDocImpl) {
 ((RootDocImpl) root).initDocLint(doclintOpts, tagletManager.getCustomTagNames());
-}
+JavaScriptScanner jss = ((RootDocImpl) root).initJavaScriptScanner(isAllowScriptInComments());
+if (jss != null) {
+// In a more object-oriented world, this would be done by methods on the Option objects.
+// Note that -windowtitle silently removes any and all HTML elements, and so does not need
+// to be handled here.
+checkJavaScript(jss, "-header", header);
+checkJavaScript(jss, "-footer", footer);
+checkJavaScript(jss, "-top", top);
+checkJavaScript(jss, "-bottom", bottom);
+checkJavaScript(jss, "-doctitle", doctitle);
+checkJavaScript(jss, "-packagesheader", packagesheader);
+}
+}
+}
+private void checkJavaScript(JavaScriptScanner jss, final String opt, String value) {
+jss.parse(value, new JavaScriptScanner.Reporter() {
+public void report() {
+root.printError(getText("doclet.JavaScript_in_option", opt));
+throw new FatalError();
+}
+});
 }
 /**
 * Returns the "length" of a given option. If an option takes no
 * arguments, its length is one. If it takes one argument, it's
 option.equals("-serialwarn") ||
 option.equals("-use") ||
 option.equals("-nonavbar") ||
 option.equals("-nooverview") ||
 option.equals("-xdoclint") ||
-option.startsWith("-xdoclint:")) {
+option.startsWith("-xdoclint:") ||
+option.equals("--allow-script-in-comments")) {
 return 1;
 } else if (option.equals("-help")) {
 // Uugh: first, this should not be hidden inside optionLength,
 // and second, we should not be writing directly to stdout.
 // But we have no access to a DocErrorReporter, which would
 @Override
 public Content newContent() {
 return new ContentBuilder();
 }
+/**
+* Returns whether or not to allow JavaScript in comments.
+* Default is off; can be set true from a command line option.
+* @return the allowScriptInComments
+*/
+public boolean isAllowScriptInComments() {
+return allowScriptInComments;
+}
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java

src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java