--- old/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java	Wed Oct 20 09:30:54 2010
+++ new/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java	Wed Oct 20 09:30:54 2010
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -46,8 +46,8 @@
         if (jdkhome == null) {
             usage();
         }
-        ClassPath.setJDKHome(jdkhome);
-        ClassPath.parseAllClassFiles();
+        ClassPaths cpaths = ClassPaths.newJDKClassPaths(jdkhome);
+        cpaths.parse();
     }
 
     private static void usage() {
@@ -54,7 +54,6 @@
         System.out.println("Usage: ConstantPoolAnalyzer <options>");
         System.out.println("Options: ");
         System.out.println("\t-jdkhome <JDK home> where all jars will be parsed");
-        System.out.println("\t-cpath <classpath> where classes and jars will be parsed");
         System.exit(-1);
     }
 }