--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Mon Mar 31 19:07:49 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Mon Mar 31 20:51:09 2014 +0200
@@ -22,7 +22,6 @@
  */
 package com.oracle.graal.hotspot;
 
-import static com.oracle.graal.hotspot.CompileTheWorld.Options.*;
 import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*;
 import static com.oracle.graal.nodes.StructuredGraph.*;
 import static com.oracle.graal.phases.GraalOptions.*;
@@ -91,7 +90,7 @@
      * A mechanism for overriding Graal options that affect compilation. A {@link Config} object
      * should be used in a try-with-resources statement to ensure overriding of options is scoped
      * properly. For example:
-     * 
+     *
      * <pre>
      *     Config config = ...;
      *     try (AutoCloseable s = config == null ? null : config.apply()) {
@@ -105,7 +104,7 @@
 
         /**
          * Creates a {@link Config} object by parsing a set of space separated override options.
-         * 
+         *
          * @param options a space separated set of option value settings with each option setting in
          *            a format compatible with
          *            {@link HotSpotOptions#parseOption(String, OptionConsumer)}. Ignored if null.
@@ -146,13 +145,13 @@
     // Some runtime instances we need.
     private final HotSpotGraalRuntime runtime = runtime();
 
-    /** List of Zip/Jar files to compile (see {@link #CompileTheWorldClasspath}. */
+    /** List of Zip/Jar files to compile (see {@link Options#CompileTheWorldClasspath}). */
     private final String files;
 
-    /** Class index to start compilation at (see {@link #CompileTheWorldStartAt}. */
+    /** Class index to start compilation at (see {@link Options#CompileTheWorldStartAt}). */
     private final int startAt;
 
-    /** Class index to stop compilation at (see {@link #CompileTheWorldStopAt}. */
+    /** Class index to stop compilation at (see {@link Options#CompileTheWorldStopAt}). */
     private final int stopAt;
 
     // Counters
@@ -165,7 +164,7 @@
 
     /**
      * Creates a compile-the-world instance.
-     * 
+     *
      * @param files {@link File#pathSeparator} separated list of Zip/Jar files to compile
      * @param startAt index of the class file to start compilation at
      * @param stopAt index of the class file to stop compilation at
@@ -187,9 +186,9 @@
 
     /**
      * Compiles all methods in all classes in the Zip/Jar archive files in
-     * {@link #CompileTheWorldClasspath}. If {@link #CompileTheWorldClasspath} contains the magic
-     * token {@link #SUN_BOOT_CLASS_PATH} passed up from HotSpot we take the files from the boot
-     * class path.
+     * {@link Options#CompileTheWorldClasspath}. If {@link Options#CompileTheWorldClasspath}
+     * contains the magic token {@link #SUN_BOOT_CLASS_PATH} passed up from HotSpot we take the
+     * files from the boot class path.
      */
     public void compile() throws Throwable {
         if (SUN_BOOT_CLASS_PATH.equals(files)) {
@@ -229,7 +228,7 @@
 
     /**
      * Compiles all methods in all classes in the Zip/Jar files passed.
-     * 
+     *
      * @param fileList {@link File#pathSeparator} separated list of Zip/Jar files to compile
      * @throws Throwable
      */
@@ -364,7 +363,7 @@
 
     /**
      * Determines if a method should be compiled (Cf. CompilationPolicy::can_be_compiled).
-     * 
+     *
      * @return true if it can be compiled, false otherwise
      */
     private boolean canBeCompiled(HotSpotResolvedJavaMethod javaMethod, int modifiers) {