src/share/classes/com/sun/tools/apt/main/Main.java

*** 54,63 ****
--- 54,65 ----
  import com.sun.tools.apt.comp.AnnotationProcessingError;
  import com.sun.tools.apt.comp.UsageMessageNeededException;
  import com.sun.tools.apt.util.Bark;
  import com.sun.mirror.apt.AnnotationProcessorFactory;
  
+ import static com.sun.tools.javac.file.Paths.pathToURLs;
+ 
  /** This class provides a commandline interface to the apt build-time
   *  tool.
   *
   *  <p><b>This is NOT part of any API supported by Sun Microsystems.
   *  If you write code that depends on this, you do so at your own
*** 1274,1334 ****
                      + "arguments={1}, {2}";
                  return MessageFormat.format(msg, (Object[]) args);
              }
          }
      }
- 
-     // Borrowed from DocletInvoker
-     /**
-      * Utility method for converting a search path string to an array
-      * of directory and JAR file URLs.
-      *
-      * @param path the search path string
-      * @return the resulting array of directory and JAR file URLs
-      */
-     static URL[] pathToURLs(String path) {
-         StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
-         URL[] urls = new URL[st.countTokens()];
-         int count = 0;
-         while (st.hasMoreTokens()) {
-             URL url = fileToURL(new File(st.nextToken()));
-             if (url != null) {
-                 urls[count++] = url;
-             }
-         }
-         if (urls.length != count) {
-             URL[] tmp = new URL[count];
-             System.arraycopy(urls, 0, tmp, 0, count);
-             urls = tmp;
-         }
-         return urls;
-     }
- 
-     /**
-      * Returns the directory or JAR file URL corresponding to the specified
-      * local file name.
-      *
-      * @param file the File object
-      * @return the resulting directory or JAR file URL, or null if unknown
-      */
-     static URL fileToURL(File file) {
-         String name;
-         try {
-             name = file.getCanonicalPath();
-         } catch (IOException e) {
-             name = file.getAbsolutePath();
-         }
-         name = name.replace(File.separatorChar, '/');
-         if (!name.startsWith("/")) {
-             name = "/" + name;
-         }
-         // If the file does not exist, then assume that it's a directory
-         if (!file.isFile()) {
-             name = name + "/";
-         }
-         try {
-             return new URL("file", "", name);
-         } catch (MalformedURLException e) {
-             throw new IllegalArgumentException("file");
-         }
-     }
  }
--- 1276,1281 ----