Index: ide/golden/deps.txt
===================================================================
RCS file: /cvs/ide/golden/deps.txt,v
retrieving revision 1.562
diff -u -r1.562 deps.txt
--- ide/golden/deps.txt	7 May 2007 14:29:51 -0000	1.562
+++ ide/golden/deps.txt	7 May 2007 14:47:34 -0000
@@ -928,7 +928,6 @@
   REQUIRES org.openide.modules (platform)
   REQUIRES org.openide.modules.ModuleFormat1
   REQUIRES org.openide.nodes (platform)
-  REQUIRES org.openide.options (platform)
   REQUIRES org.openide.util (platform)
   REQUIRES org.openide.windows (platform)
 MODULE org.netbeans.modules.j2ee.clientproject (j2ee)
Index: j2ee/blueprints/nbproject/project.xml
===================================================================
RCS file: /cvs/j2ee/blueprints/nbproject/project.xml,v
retrieving revision 1.7
diff -u -r1.7 project.xml
--- j2ee/blueprints/nbproject/project.xml	30 Jun 2006 20:36:03 -0000	1.7
+++ j2ee/blueprints/nbproject/project.xml	7 May 2007 14:47:34 -0000
@@ -99,14 +99,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.options</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.openide.windows</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
Index: j2ee/blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/projects/FoldersListSettings.java
===================================================================
RCS file: /cvs/j2ee/blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/projects/FoldersListSettings.java,v
retrieving revision 1.3
diff -u -r1.3 FoldersListSettings.java
--- j2ee/blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/projects/FoldersListSettings.java	30 Jun 2006 20:36:06 -0000	1.3
+++ j2ee/blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/projects/FoldersListSettings.java	7 May 2007 14:47:34 -0000
@@ -18,11 +18,13 @@
  */
 package org.netbeans.modules.j2ee.blueprints.ui.projects;
 
-import org.openide.options.SystemOption;
-import org.openide.util.NbBundle;
+import java.util.prefs.Preferences;
+import org.openide.util.NbPreferences;
 
 
-public class FoldersListSettings extends SystemOption {
+public class FoldersListSettings {
+    
+    private static final FoldersListSettings INSTANCE = new FoldersListSettings();
 
     static final long serialVersionUID = -5L;
 
@@ -37,20 +39,19 @@
     }
 
     public String getLastExternalSourceRoot () {
-        return (String) getProperty(LAST_EXTERNAL_SOURCE_ROOT);
+        return getPreferences().get(LAST_EXTERNAL_SOURCE_ROOT, System.getProperty("user.home")); //NOI18N
     }
 
     public void setLastExternalSourceRoot (String path) {
-        putProperty (LAST_EXTERNAL_SOURCE_ROOT, path, true);
+        getPreferences().put(LAST_EXTERNAL_SOURCE_ROOT, path);
     }
 
     public int getNewProjectCount () {
-        Integer value = (Integer) getProperty (NEW_PROJECT_COUNT);
-        return value == null ? 0 : value.intValue();
+        return getPreferences().getInt(NEW_PROJECT_COUNT, 0);
     }
 
     public void setNewProjectCount (int count) {
-        this.putProperty(NEW_PROJECT_COUNT, new Integer(count),true);
+        getPreferences().putInt(NEW_PROJECT_COUNT, count);
     }
     
 //    public boolean isShowAgainBrokenRefAlert() {
@@ -63,6 +64,10 @@
 //    }
 
     public static FoldersListSettings getDefault () {
-        return (FoldersListSettings) SystemOption.findObject (FoldersListSettings.class, true);
+        return INSTANCE;
+    }
+    
+    private static Preferences getPreferences() {
+        return NbPreferences.forModule(FoldersListSettings.class);
     }
 }