diff -r 43edeaf6d0a9 -r d71d992cb905 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Nov 15 14:41:31 2012 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Nov 15 19:54:20 2012 -0800 @@ -28,9 +28,13 @@ import java.net.*; import java.util.*; +import javax.tools.JavaFileManager; + import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; +import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.util.Context; /** * Configure the output based on the command line options. @@ -195,6 +199,7 @@ /** * Return the build date for the doclet. */ + @Override public String getDocletSpecificBuildDate() { return BUILD_DATE; } @@ -205,6 +210,7 @@ * * @param options The array of option names and values. */ + @Override public void setSpecificDocletOptions(String[][] options) { for (int oi = 0; oi < options.length; ++oi) { String[] os = options[oi]; @@ -323,6 +329,7 @@ /** * {@inheritDoc} */ + @Override public boolean validOptions(String options[][], DocErrorReporter reporter) { boolean helpfile = false; @@ -411,6 +418,7 @@ /** * {@inheritDoc} */ + @Override public MessageRetriever getDocletSpecificMsg() { return standardmessage; } @@ -480,6 +488,7 @@ /** * {@inheritDoc} */ + @Override public WriterFactory getWriterFactory() { return new WriterFactoryImpl(this); } @@ -487,6 +496,7 @@ /** * {@inheritDoc} */ + @Override public Comparator getMemberComparator() { return null; } @@ -494,10 +504,22 @@ /** * {@inheritDoc} */ + @Override public Locale getLocale() { if (root instanceof com.sun.tools.javadoc.RootDocImpl) return ((com.sun.tools.javadoc.RootDocImpl)root).getLocale(); else return Locale.getDefault(); } + + /** + * {@inheritDoc} + */ + @Override + public JavaFileManager getFileManager() { + if (root instanceof com.sun.tools.javadoc.RootDocImpl) + return ((com.sun.tools.javadoc.RootDocImpl)root).getFileManager(); + else + return new JavacFileManager(new Context(), false, null); + } }