1.1 --- a/src/share/classes/com/sun/tools/javac/file/Locations.java Mon Dec 12 08:15:32 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/file/Locations.java Tue Dec 13 11:21:28 2011 -0800
1.3 @@ -47,14 +47,14 @@
1.4 import javax.tools.StandardLocation;
1.5
1.6 import com.sun.tools.javac.code.Lint;
1.7 -import com.sun.tools.javac.main.OptionName;
1.8 +import com.sun.tools.javac.main.Option;
1.9 import com.sun.tools.javac.util.ListBuffer;
1.10 import com.sun.tools.javac.util.Log;
1.11 import com.sun.tools.javac.util.Options;
1.12
1.13 import javax.tools.JavaFileManager;
1.14 import static javax.tools.StandardLocation.*;
1.15 -import static com.sun.tools.javac.main.OptionName.*;
1.16 +import static com.sun.tools.javac.main.Option.*;
1.17
1.18 /** This class converts command line arguments, environment variables
1.19 * and system properties (in File.pathSeparator-separated String form)
1.20 @@ -318,23 +318,23 @@
1.21 */
1.22 protected abstract class LocationHandler {
1.23 final Location location;
1.24 - final Set<OptionName> options;
1.25 + final Set<Option> options;
1.26
1.27 /**
1.28 * Create a handler. The location and options provide a way to map
1.29 * from a location or an option to the corresponding handler.
1.30 * @see #initHandlers
1.31 */
1.32 - protected LocationHandler(Location location, OptionName... options) {
1.33 + protected LocationHandler(Location location, Option... options) {
1.34 this.location = location;
1.35 this.options = options.length == 0 ?
1.36 - EnumSet.noneOf(OptionName.class):
1.37 + EnumSet.noneOf(Option.class):
1.38 EnumSet.copyOf(Arrays.asList(options));
1.39 }
1.40
1.41 // TODO: TEMPORARY, while Options still used for command line options
1.42 void update(Options optionTable) {
1.43 - for (OptionName o: options) {
1.44 + for (Option o: options) {
1.45 String v = optionTable.get(o);
1.46 if (v != null) {
1.47 handleOption(o, v);
1.48 @@ -343,7 +343,7 @@
1.49 }
1.50
1.51 /** @see JavaFileManager#handleOption. */
1.52 - abstract boolean handleOption(OptionName option, String value);
1.53 + abstract boolean handleOption(Option option, String value);
1.54 /** @see JavaFileManager#getLocation. */
1.55 abstract Collection<File> getLocation();
1.56 /** @see JavaFileManager#setLocation. */
1.57 @@ -359,12 +359,12 @@
1.58 private class OutputLocationHandler extends LocationHandler {
1.59 private File outputDir;
1.60
1.61 - OutputLocationHandler(Location location, OptionName... options) {
1.62 + OutputLocationHandler(Location location, Option... options) {
1.63 super(location, options);
1.64 }
1.65
1.66 @Override
1.67 - boolean handleOption(OptionName option, String value) {
1.68 + boolean handleOption(Option option, String value) {
1.69 if (!options.contains(option))
1.70 return false;
1.71
1.72 @@ -410,12 +410,12 @@
1.73 private class SimpleLocationHandler extends LocationHandler {
1.74 protected Collection<File> searchPath;
1.75
1.76 - SimpleLocationHandler(Location location, OptionName... options) {
1.77 + SimpleLocationHandler(Location location, Option... options) {
1.78 super(location, options);
1.79 }
1.80
1.81 @Override
1.82 - boolean handleOption(OptionName option, String value) {
1.83 + boolean handleOption(Option option, String value) {
1.84 if (!options.contains(option))
1.85 return false;
1.86 searchPath = value == null ? null :
1.87 @@ -452,7 +452,7 @@
1.88 private class ClassPathLocationHandler extends SimpleLocationHandler {
1.89 ClassPathLocationHandler() {
1.90 super(StandardLocation.CLASS_PATH,
1.91 - OptionName.CLASSPATH, OptionName.CP);
1.92 + Option.CLASSPATH, Option.CP);
1.93 }
1.94
1.95 @Override
1.96 @@ -500,7 +500,7 @@
1.97 */
1.98 private class BootClassPathLocationHandler extends LocationHandler {
1.99 private Collection<File> searchPath;
1.100 - final Map<OptionName, String> optionValues = new EnumMap<OptionName,String>(OptionName.class);
1.101 + final Map<Option, String> optionValues = new EnumMap<Option,String>(Option.class);
1.102
1.103 /**
1.104 * rt.jar as found on the default bootclasspath.
1.105 @@ -515,11 +515,11 @@
1.106
1.107 BootClassPathLocationHandler() {
1.108 super(StandardLocation.PLATFORM_CLASS_PATH,
1.109 - OptionName.BOOTCLASSPATH, OptionName.XBOOTCLASSPATH,
1.110 - OptionName.XBOOTCLASSPATH_PREPEND,
1.111 - OptionName.XBOOTCLASSPATH_APPEND,
1.112 - OptionName.ENDORSEDDIRS, OptionName.DJAVA_ENDORSED_DIRS,
1.113 - OptionName.EXTDIRS, OptionName.DJAVA_EXT_DIRS);
1.114 + Option.BOOTCLASSPATH, Option.XBOOTCLASSPATH,
1.115 + Option.XBOOTCLASSPATH_PREPEND,
1.116 + Option.XBOOTCLASSPATH_APPEND,
1.117 + Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
1.118 + Option.EXTDIRS, Option.DJAVA_EXT_DIRS);
1.119 }
1.120
1.121 boolean isDefault() {
1.122 @@ -533,7 +533,7 @@
1.123 }
1.124
1.125 @Override
1.126 - boolean handleOption(OptionName option, String value) {
1.127 + boolean handleOption(Option option, String value) {
1.128 if (!options.contains(option))
1.129 return false;
1.130
1.131 @@ -549,14 +549,14 @@
1.132 // where
1.133 // TODO: would be better if option aliasing was handled at a higher
1.134 // level
1.135 - private OptionName canonicalize(OptionName option) {
1.136 + private Option canonicalize(Option option) {
1.137 switch (option) {
1.138 case XBOOTCLASSPATH:
1.139 - return OptionName.BOOTCLASSPATH;
1.140 + return Option.BOOTCLASSPATH;
1.141 case DJAVA_ENDORSED_DIRS:
1.142 - return OptionName.ENDORSEDDIRS;
1.143 + return Option.ENDORSEDDIRS;
1.144 case DJAVA_EXT_DIRS:
1.145 - return OptionName.EXTDIRS;
1.146 + return Option.EXTDIRS;
1.147 default:
1.148 return option;
1.149 }
1.150 @@ -636,29 +636,29 @@
1.151 }
1.152
1.153 Map<Location, LocationHandler> handlersForLocation;
1.154 - Map<OptionName, LocationHandler> handlersForOption;
1.155 + Map<Option, LocationHandler> handlersForOption;
1.156
1.157 void initHandlers() {
1.158 handlersForLocation = new HashMap<Location, LocationHandler>();
1.159 - handlersForOption = new EnumMap<OptionName, LocationHandler>(OptionName.class);
1.160 + handlersForOption = new EnumMap<Option, LocationHandler>(Option.class);
1.161
1.162 LocationHandler[] handlers = {
1.163 new BootClassPathLocationHandler(),
1.164 new ClassPathLocationHandler(),
1.165 - new SimpleLocationHandler(StandardLocation.SOURCE_PATH, OptionName.SOURCEPATH),
1.166 - new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, OptionName.PROCESSORPATH),
1.167 - new OutputLocationHandler((StandardLocation.CLASS_OUTPUT), OptionName.D),
1.168 - new OutputLocationHandler((StandardLocation.SOURCE_OUTPUT), OptionName.S)
1.169 + new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCEPATH),
1.170 + new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSORPATH),
1.171 + new OutputLocationHandler((StandardLocation.CLASS_OUTPUT), Option.D),
1.172 + new OutputLocationHandler((StandardLocation.SOURCE_OUTPUT), Option.S)
1.173 };
1.174
1.175 for (LocationHandler h: handlers) {
1.176 handlersForLocation.put(h.location, h);
1.177 - for (OptionName o: h.options)
1.178 + for (Option o: h.options)
1.179 handlersForOption.put(o, h);
1.180 }
1.181 }
1.182
1.183 - boolean handleOption(OptionName option, String value) {
1.184 + boolean handleOption(Option option, String value) {
1.185 LocationHandler h = handlersForOption.get(option);
1.186 return (h == null ? false : h.handleOption(option, value));
1.187 }
