Index: ant/freeform/src/org/netbeans/modules/ant/freeform/ui/ProjectNodeWrapper.java =================================================================== RCS file: /shared/data/ccvs/repository/ant/freeform/src/org/netbeans/modules/ant/freeform/ui/ProjectNodeWrapper.java,v retrieving revision 1.4 diff -u -r1.4 ProjectNodeWrapper.java --- ant/freeform/src/org/netbeans/modules/ant/freeform/ui/ProjectNodeWrapper.java 4 Aug 2006 21:36:52 -0000 1.4 +++ ant/freeform/src/org/netbeans/modules/ant/freeform/ui/ProjectNodeWrapper.java 9 Apr 2007 20:39:40 -0000 @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -48,16 +47,11 @@ import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; -import org.openide.util.Lookup; import org.openide.util.RequestProcessor; import org.openide.util.WeakListeners; +import org.openide.util.lookup.Lookups; /**A wrapper node for project's root node that adds CVS badges+Project/Actions. @@ -101,30 +95,16 @@ result.add(actions[cntr]); } else { // honor 57874 contact: - try { - Repository repository = Repository.getDefault(); - FileSystem sfs = repository.getDefaultFileSystem(); - FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N - if (fo != null) { - DataObject dobj = DataObject.find(fo); - FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - Lookup lookup = actionRegistry.getLookup(); - Iterator it = lookup.lookupAll(Object.class).iterator(); - if (it.hasNext()) { + Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N + if (!res.isEmpty()) { + result.add(null); + for (Object next : res) { + if (next instanceof Action) { + result.add((Action) next); + } else if (next instanceof JSeparator) { result.add(null); } - while (it.hasNext()) { - Object next = it.next(); - if (next instanceof Action) { - result.add((Action) next); - } else if (next instanceof JSeparator) { - result.add(null); - } - } } - } catch (DataObjectNotFoundException ex) { - // data folder for exitinf fileobject expected - ErrorManager.getDefault().notify(ex); } } } Index: apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java =================================================================== RCS file: /shared/data/ccvs/repository/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java,v retrieving revision 1.29 diff -u -r1.29 ModuleActions.java --- apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java 3 Mar 2007 13:17:52 -0000 1.29 +++ apisupport/project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java 9 Apr 2007 20:39:40 -0000 @@ -22,6 +22,7 @@ import java.awt.event.ActionEvent; import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -59,11 +60,11 @@ import org.openide.filesystems.FileUtil; import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.Mutex; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; +import org.openide.util.lookup.Lookups; public final class ModuleActions implements ActionProvider { @@ -112,10 +113,10 @@ actions.add(CommonProjectActions.deleteProjectAction()); // Honor #57874 contract: - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N - if (fo != null && fo.isFolder()) { + Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N + if (!res.isEmpty()) { actions.add(null); - for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) { + for (Object next : res) { if (next instanceof Action) { actions.add((Action) next); } else if (next instanceof JSeparator) { Index: apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java =================================================================== RCS file: /shared/data/ccvs/repository/apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java,v retrieving revision 1.24 diff -u -r1.24 SuiteActions.java --- apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java 23 Feb 2007 08:06:59 -0000 1.24 +++ apisupport/project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java 9 Apr 2007 20:39:40 -0000 @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import javax.swing.Action; import javax.swing.JSeparator; @@ -45,10 +46,10 @@ import org.openide.filesystems.FileObject; import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; +import org.openide.util.lookup.Lookups; /** * Defines actions available on a suite. @@ -91,10 +92,10 @@ actions.add(CommonProjectActions.renameProjectAction()); actions.add(CommonProjectActions.moveProjectAction()); actions.add(CommonProjectActions.deleteProjectAction()); - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N - if (fo != null && fo.isFolder()) { + Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N + if (!res.isEmpty()) { actions.add(null); - for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) { + for (Object next : res) { if (next instanceof Action) { actions.add((Action) next); } else if (next instanceof JSeparator) { Index: db/dbapi/src/org/netbeans/modules/dbapi/DbMetaDataListenerImpl.java =================================================================== RCS file: /shared/data/ccvs/repository/db/dbapi/src/org/netbeans/modules/dbapi/DbMetaDataListenerImpl.java,v retrieving revision 1.2 diff -u -r1.2 DbMetaDataListenerImpl.java --- db/dbapi/src/org/netbeans/modules/dbapi/DbMetaDataListenerImpl.java 12 Oct 2006 15:01:15 -0000 1.2 +++ db/dbapi/src/org/netbeans/modules/dbapi/DbMetaDataListenerImpl.java 9 Apr 2007 20:39:40 -0000 @@ -23,11 +23,8 @@ import org.netbeans.api.db.explorer.DatabaseConnection; import org.netbeans.modules.db.api.explorer.MetaDataListener; import org.netbeans.modules.db.explorer.DbMetaDataListener; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; +import org.openide.util.lookup.Lookups; /** * @@ -55,8 +52,6 @@ } private static Lookup.Result getListeners() { - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource(REFRESH_LISTENERS_PATH); - DataFolder folder = DataFolder.findFolder(fo); - return new FolderLookup(folder).getLookup().lookup(new Lookup.Template(MetaDataListener.class)); + return Lookups.forPath(REFRESH_LISTENERS_PATH).lookupResult(MetaDataListener.class); } } Index: db/src/org/netbeans/api/db/explorer/JDBCDriverManager.java =================================================================== RCS file: /shared/data/ccvs/repository/db/src/org/netbeans/api/db/explorer/JDBCDriverManager.java,v retrieving revision 1.4 diff -u -r1.4 JDBCDriverManager.java --- db/src/org/netbeans/api/db/explorer/JDBCDriverManager.java 12 Oct 2006 15:01:36 -0000 1.4 +++ db/src/org/netbeans/api/db/explorer/JDBCDriverManager.java 9 Apr 2007 20:39:40 -0000 @@ -28,13 +28,10 @@ import javax.swing.SwingUtilities; import org.netbeans.modules.db.explorer.actions.AddDriverAction; import org.netbeans.modules.db.explorer.driver.JDBCDriverConvertor; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.LookupEvent; import org.openide.util.LookupListener; +import org.openide.util.lookup.Lookups; /** * This class manages the list of JDBC drivers registered in the Database Explorer. @@ -198,11 +195,6 @@ } private synchronized Lookup.Result getLookupResult() { - if (result == null) { - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource(JDBCDriverConvertor.DRIVERS_PATH); - DataFolder folder = DataFolder.findFolder(fo); - result = new FolderLookup(folder).getLookup().lookup(new Lookup.Template(JDBCDriver.class)); - } - return result; + return Lookups.forPath(JDBCDriverConvertor.DRIVERS_PATH).lookupResult(JDBCDriver.class); } } Index: db/src/org/netbeans/modules/db/explorer/ConnectionList.java =================================================================== RCS file: /shared/data/ccvs/repository/db/src/org/netbeans/modules/db/explorer/ConnectionList.java,v retrieving revision 1.3 diff -u -r1.3 ConnectionList.java --- db/src/org/netbeans/modules/db/explorer/ConnectionList.java 30 Jun 2006 18:53:09 -0000 1.3 +++ db/src/org/netbeans/modules/db/explorer/ConnectionList.java 9 Apr 2007 20:39:40 -0000 @@ -27,13 +27,10 @@ import org.netbeans.api.db.explorer.ConnectionListener; import org.netbeans.api.db.explorer.DatabaseException; import org.netbeans.modules.db.explorer.nodes.RootNode; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.LookupEvent; import org.openide.util.LookupListener; +import org.openide.util.lookup.Lookups; /** @@ -142,11 +139,6 @@ } private synchronized Lookup.Result getLookupResult() { - if (result == null) { - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource(DatabaseConnectionConvertor.CONNECTIONS_PATH); - DataFolder folder = DataFolder.findFolder(fo); - result = new FolderLookup(folder).getLookup().lookup(new Lookup.Template(DatabaseConnection.class)); - } - return result; + return Lookups.forPath(DatabaseConnectionConvertor.CONNECTIONS_PATH).lookupResult(DatabaseConnection.class); } } Index: db/src/org/netbeans/modules/db/runtime/DatabaseRuntimeManager.java =================================================================== RCS file: /shared/data/ccvs/repository/db/src/org/netbeans/modules/db/runtime/DatabaseRuntimeManager.java,v retrieving revision 1.10 diff -u -r1.10 DatabaseRuntimeManager.java --- db/src/org/netbeans/modules/db/runtime/DatabaseRuntimeManager.java 30 Jun 2006 18:53:21 -0000 1.10 +++ db/src/org/netbeans/modules/db/runtime/DatabaseRuntimeManager.java 9 Apr 2007 20:39:40 -0000 @@ -23,14 +23,10 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import javax.swing.SwingUtilities; import org.netbeans.spi.db.explorer.DatabaseRuntime; import org.openide.ErrorManager; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; +import org.openide.util.lookup.Lookups; /** @@ -105,11 +101,6 @@ } private synchronized Lookup.Result getLookupResult() { - if (result == null) { - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource(RUNTIMES_PATH); - DataFolder folder = DataFolder.findFolder(fo); - result = new FolderLookup(folder).getLookup().lookup(new Lookup.Template(DatabaseRuntime.class)); - } - return result; + return Lookups.forPath(RUNTIMES_PATH).lookupResult(DatabaseRuntime.class); } } Index: editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java =================================================================== RCS file: /shared/data/ccvs/repository/editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java,v retrieving revision 1.11 diff -u -r1.11 AnnotationViewDataImpl.java --- editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java 30 Jun 2006 19:17:35 -0000 1.11 +++ editor/errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java 9 Apr 2007 20:39:41 -0000 @@ -21,7 +21,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -45,16 +44,12 @@ import org.netbeans.spi.editor.errorstripe.UpToDateStatusProvider; import org.netbeans.spi.editor.errorstripe.UpToDateStatusProviderFactory; import org.openide.ErrorManager; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.Lookup.Result; import org.openide.util.Lookup.Template; import org.openide.util.lookup.ProxyLookup; import org.netbeans.modules.editor.errorstripe.apimodule.SPIAccessor; +import org.openide.util.lookup.Lookups; /** * @@ -107,77 +102,67 @@ private void gatherProviders(JTextComponent pane) { long start = System.currentTimeMillis(); - try { - BaseKit kit = Utilities.getKit(pane); - - if (kit == null) - return ; - - String content = kit.getContentType(); - BaseDocument document = (BaseDocument) pane.getDocument(); - FileObject baseFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/text/base/UpToDateStatusProvider"); // NOI18N - FileObject contentFolder = Repository.getDefault().getDefaultFileSystem().findResource("Editors/" + content + "/UpToDateStatusProvider"); // NOI18N - - if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { - ERR.log(ErrorManager.INFORMATIONAL, "baseFolder = " + baseFolder ); - } - - DataObject baseDO = baseFolder != null ? DataObject.find(baseFolder) : null; - + BaseKit kit = Utilities.getKit(pane); + + if (kit == null) + return ; + + String content = kit.getContentType(); + BaseDocument document = (BaseDocument) pane.getDocument(); + String baseFolder = "Editors/text/base/UpToDateStatusProvider"; // NOI18N + String contentFolder = "Editors/" + content + "/UpToDateStatusProvider"; // NOI18N + + if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { + ERR.log(ErrorManager.INFORMATIONAL, "baseFolder = " + baseFolder ); + } + + + Lookup baseLookup = Lookups.forPath(baseFolder); + + if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { + ERR.log(ErrorManager.INFORMATIONAL, "contentFolder = " + contentFolder ); + } + + Lookup contentLookup = Lookups.forPath(contentFolder); + + Lookup lookup = new ProxyLookup(new Lookup[] {baseLookup, contentLookup}); + + Result creators = lookup.lookup(new Template(MarkProviderCreator.class)); + + List markProviders = new ArrayList(); + + for (Iterator i = creators.allInstances().iterator(); i.hasNext(); ) { + MarkProviderCreator creator = (MarkProviderCreator) i.next(); + if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { - ERR.log(ErrorManager.INFORMATIONAL, "baseDO = " + baseDO ); + ERR.log(ErrorManager.INFORMATIONAL, "creator = " + creator ); } - - Lookup baseLookup = baseFolder != null ? new FolderLookup((DataFolder) baseDO).getLookup() : Lookup.EMPTY; - + + MarkProvider provider = creator.createMarkProvider(pane); + + if (provider != null) + markProviders.add(provider); + } + + this.providers = markProviders; + + Result updsCreators = lookup.lookup(new Template(UpToDateStatusProviderFactory.class)); + List updsProviders = new ArrayList(); + + for (Iterator i = updsCreators.allInstances().iterator(); i.hasNext(); ) { + UpToDateStatusProviderFactory creator = (UpToDateStatusProviderFactory) i.next(); + if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { - ERR.log(ErrorManager.INFORMATIONAL, "contentFolder = " + contentFolder ); - } - - DataObject contentDO = contentFolder != null ? DataObject.find(contentFolder) : null; - Lookup contentLookup = contentFolder != null ? new FolderLookup((DataFolder) contentDO).getLookup() : Lookup.EMPTY; - - Lookup lookup = new ProxyLookup(new Lookup[] {baseLookup, contentLookup}); - - Result creators = lookup.lookup(new Template(MarkProviderCreator.class)); - - List markProviders = new ArrayList(); - - for (Iterator i = creators.allInstances().iterator(); i.hasNext(); ) { - MarkProviderCreator creator = (MarkProviderCreator) i.next(); - - if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { - ERR.log(ErrorManager.INFORMATIONAL, "creator = " + creator ); - } - - MarkProvider provider = creator.createMarkProvider(pane); - - if (provider != null) - markProviders.add(provider); - } - - this.providers = markProviders; - - Result updsCreators = lookup.lookup(new Template(UpToDateStatusProviderFactory.class)); - List updsProviders = new ArrayList(); - - for (Iterator i = updsCreators.allInstances().iterator(); i.hasNext(); ) { - UpToDateStatusProviderFactory creator = (UpToDateStatusProviderFactory) i.next(); - - if (ERR.isLoggable(ErrorManager.INFORMATIONAL)) { - ERR.log(ErrorManager.INFORMATIONAL, "creator = " + creator ); - } - - UpToDateStatusProvider provider = creator.createUpToDateStatusProvider(pane.getDocument()); - - if (provider != null) - updsProviders.add(provider); + ERR.log(ErrorManager.INFORMATIONAL, "creator = " + creator ); } - - this.upToDateStatusProviders = updsProviders; - } catch (IOException e) { - ErrorManager.getDefault().notify(e); + + UpToDateStatusProvider provider = creator.createUpToDateStatusProvider(pane.getDocument()); + + if (provider != null) + updsProviders.add(provider); } + + this.upToDateStatusProviders = updsProviders; long end = System.currentTimeMillis(); Index: editor/hints/src/org/netbeans/spi/editor/hints/ProvidersList.java =================================================================== RCS file: /shared/data/ccvs/repository/editor/hints/src/org/netbeans/spi/editor/hints/ProvidersList.java,v retrieving revision 1.2 diff -u -r1.2 ProvidersList.java --- editor/hints/src/org/netbeans/spi/editor/hints/ProvidersList.java 24 Oct 2006 12:53:21 -0000 1.2 +++ editor/hints/src/org/netbeans/spi/editor/hints/ProvidersList.java 9 Apr 2007 20:39:41 -0000 @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import org.netbeans.modules.editor.hints.options.ProvidersListAccessor; @@ -35,9 +34,7 @@ import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; -import org.openide.util.Lookup.Template; +import org.openide.util.lookup.Lookups; /** * @@ -91,9 +88,8 @@ private static void init() { key2Description = new HashMap(); descriptions = new ArrayList(); - FileObject listFolder = Repository.getDefault().getDefaultFileSystem().findResource(PROVIDERS_LIST_FOLDER); - FolderLookup flookup = new FolderLookup(DataFolder.findContainer(listFolder)); - Collection looked = flookup.getLookup().lookupAll(ProviderDescription.class); + + Collection looked = Lookups.forPath(PROVIDERS_LIST_FOLDER).lookupAll(ProviderDescription.class); for (ProviderDescription desc : looked) { key2Description.put(desc.getKey(), desc); Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java =================================================================== RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java,v retrieving revision 1.25 diff -u -r1.25 J2SELogicalViewProvider.java --- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java 26 Mar 2007 21:03:16 -0000 1.25 +++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java 9 Apr 2007 20:39:41 -0000 @@ -72,9 +72,7 @@ import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.modules.SpecificationVersion; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; @@ -493,15 +491,12 @@ actions.add(null); // honor 57874 contact - - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N - if (fo != null) { - for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } + + for (Object next : Lookups.forPath("Projects/Actions").lookupAll(Object.class)) { + if (next instanceof Action) { + actions.add((Action) next); + } else if (next instanceof JSeparator) { + actions.add(null); } } Index: j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java =================================================================== RCS file: /shared/data/ccvs/repository/j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java,v retrieving revision 1.3 diff -u -r1.3 RootNode.java --- j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java 29 Mar 2007 23:04:34 -0000 1.3 +++ j2ee/archiveproject/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java 9 Apr 2007 20:39:41 -0000 @@ -35,15 +35,9 @@ import org.netbeans.spi.project.ActionProvider; import org.netbeans.spi.project.ui.support.CommonProjectActions; import org.netbeans.spi.project.ui.support.ProjectSensitiveActions; -import org.openide.ErrorManager; import org.openide.filesystems.FileChangeListener; import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.nodes.Children; import org.openide.nodes.Node; //import org.openide.util.HelpCtx; @@ -112,32 +106,20 @@ actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // honor 57874 contact - - try { - Repository repository = Repository.getDefault(); - FileSystem sfs = repository.getDefaultFileSystem(); - FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N - if (fo != null) { - DataObject dobj = DataObject.find(fo); - FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - Lookup.Template query = new Lookup.Template(Object.class); - Lookup lookup = actionRegistry.getLookup(); - Iterator it = lookup.lookup(query).allInstances().iterator(); - if (it.hasNext()) { - actions.add(null); - } - while (it.hasNext()) { - Object next = it.next(); - if (next instanceof Action) { - actions.add(next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } + + Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N + Lookup.Template query = new Lookup.Template(Object.class); + Iterator it = lookup.lookup(query).allInstances().iterator(); + if (it.hasNext()) { + actions.add(null); + } + while (it.hasNext()) { + Object next = it.next(); + if (next instanceof Action) { + actions.add(next); + } else if (next instanceof JSeparator) { + actions.add(null); } - } catch (DataObjectNotFoundException ex) { - // data folder for exitinf fileobject expected - ErrorManager.getDefault().notify(ex); } // actions.add(null); Index: j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java =================================================================== RCS file: /shared/data/ccvs/repository/j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java,v retrieving revision 1.5 diff -u -r1.5 AppClientLogicalViewProvider.java --- j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java 1 Feb 2007 13:52:12 -0000 1.5 +++ j2ee/clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java 9 Apr 2007 20:39:41 -0000 @@ -97,11 +97,6 @@ import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.modules.SpecificationVersion; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; @@ -533,30 +528,20 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - - try { - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N - if (fo != null) { - DataObject dobj = DataObject.find(fo); - FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - Lookup.Template query = new Lookup.Template(Object.class); - Lookup lookup = actionRegistry.getLookup(); - Iterator it = lookup.lookup(query).allInstances().iterator(); - if (it.hasNext()) { - actions.add(null); - } - while (it.hasNext()) { - Object next = it.next(); - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } + + Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N + Lookup.Template query = new Lookup.Template(Object.class); + Iterator it = lookup.lookup(query).allInstances().iterator(); + if (it.hasNext()) { + actions.add(null); + } + while (it.hasNext()) { + Object next = it.next(); + if (next instanceof Action) { + actions.add((Action) next); + } else if (next instanceof JSeparator) { + actions.add(null); } - } catch (DataObjectNotFoundException ex) { - // data folder for existing fileobject expected - ErrorManager.getDefault().notify(ex); } actions.add(null); Index: j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java =================================================================== RCS file: /shared/data/ccvs/repository/j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java,v retrieving revision 1.16 diff -u -r1.16 J2eeArchiveLogicalViewProvider.java --- j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java 3 Apr 2007 13:39:40 -0000 1.16 +++ j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java 9 Apr 2007 20:39:42 -0000 @@ -76,11 +76,7 @@ import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; import org.openide.nodes.NodeOp; @@ -505,31 +501,19 @@ null, })); - try { - Repository repository = Repository.getDefault(); - FileSystem sfs = repository.getDefaultFileSystem(); - FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N - if (fo != null) { - DataObject dobj = DataObject.find(fo); - FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - Lookup.Template query = new Lookup.Template(Object.class); - Lookup lookup = actionRegistry.getLookup(); - Iterator it = lookup.lookup(query).allInstances().iterator(); - if (it.hasNext()) { - actions.add(null); - } - while (it.hasNext()) { - Object next = it.next(); - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } + Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N + Lookup.Template query = new Lookup.Template(Object.class); + Iterator it = lookup.lookup(query).allInstances().iterator(); + if (it.hasNext()) { + actions.add(null); + } + while (it.hasNext()) { + Object next = it.next(); + if (next instanceof Action) { + actions.add((Action) next); + } else if (next instanceof JSeparator) { + actions.add(null); } - } catch (DataObjectNotFoundException ex) { - // data folder for existing fileobject expected - ErrorManager.getDefault().notify(ex); } actions.add(null); Index: j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java =================================================================== RCS file: /shared/data/ccvs/repository/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java,v retrieving revision 1.23 diff -u -r1.23 EjbJarLogicalViewProvider.java --- j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java 26 Mar 2007 21:03:03 -0000 1.23 +++ j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java 9 Apr 2007 20:39:42 -0000 @@ -88,10 +88,8 @@ import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; /** * Support for creating logical views. @@ -489,32 +487,20 @@ actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // honor 57874 contract - - try { - Repository repository = Repository.getDefault(); - FileSystem sfs = repository.getDefaultFileSystem(); - FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N - if (fo != null) { - DataObject dobj = DataObject.find(fo); - FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - Lookup.Template query = new Lookup.Template(Object.class); - Lookup lookup = actionRegistry.getLookup(); - Iterator it = lookup.lookup(query).allInstances().iterator(); - if (it.hasNext()) { - actions.add(null); - } - while (it.hasNext()) { - Object next = it.next(); - if (next instanceof Action) { - actions.add(next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } + + Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N + Lookup.Template query = new Lookup.Template(Object.class); + Iterator it = lookup.lookup(query).allInstances().iterator(); + if (it.hasNext()) { + actions.add(null); + } + while (it.hasNext()) { + Object next = it.next(); + if (next instanceof Action) { + actions.add(next); + } else if (next instanceof JSeparator) { + actions.add(null); } - } catch (DataObjectNotFoundException ex) { - // data folder for existing fileobject expected - ErrorManager.getDefault().notify(ex); } actions.add(null); Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Server.java =================================================================== RCS file: /shared/data/ccvs/repository/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Server.java,v retrieving revision 1.37 diff -u -r1.37 Server.java --- j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Server.java 29 Mar 2007 23:04:55 -0000 1.37 +++ j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Server.java 9 Apr 2007 20:39:42 -0000 @@ -44,6 +44,7 @@ import org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory; import org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory; import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport; +import org.openide.util.lookup.Lookups; public class Server implements Node.Cookie { @@ -74,8 +75,8 @@ dep = NetbeansDeployment.createGraph(descriptor.getInputStream()); - lkp = new FolderLookup (DataFolder.findContainer (fo)).getLookup (); - factory = (DeploymentFactory) lkp.lookup (DeploymentFactory.class); + lkp = Lookups.forPath(fo.getPath()); + factory = lkp.lookup (DeploymentFactory.class); if (factory != null) { factoryCls = factory.getClass (); } else { Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ServerRegistryNode.java =================================================================== RCS file: /shared/data/ccvs/repository/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ServerRegistryNode.java,v retrieving revision 1.28 diff -u -r1.28 ServerRegistryNode.java --- j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ServerRegistryNode.java 29 Mar 2007 23:04:57 -0000 1.28 +++ j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ServerRegistryNode.java 9 Apr 2007 20:39:42 -0000 @@ -24,7 +24,6 @@ */ package org.netbeans.modules.j2ee.deployment.impl.ui; -import java.awt.Image; import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer; import org.openide.nodes.*; import org.openide.filesystems.*; @@ -32,12 +31,11 @@ import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; import org.openide.util.HelpCtx; -import org.openide.ErrorManager; import org.netbeans.modules.j2ee.deployment.impl.ui.actions.*; import org.netbeans.modules.j2ee.deployment.impl.*; import java.util.*; import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener; -import org.openide.util.Utilities; +import org.openide.util.lookup.Lookups; /** * The server registry node is a node representing the registry in global options. @@ -156,15 +154,6 @@ } public static ServerRegistryNode getServerRegistryNode() { - try { - FileSystem defaultFileSystem = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = defaultFileSystem.findResource("UI/Runtime"); //NOI18N - DataFolder df = (DataFolder) DataObject.find(fo); - org.openide.util.Lookup l = new FolderLookup(df).getLookup(); - return (ServerRegistryNode) l.lookup(ServerRegistryNode.class); - } catch (DataObjectNotFoundException e) { - ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e); - return null; - } + return Lookups.forPath("UI/Runtime").lookup(ServerRegistryNode.class); } } Index: projects/projectapi/src/org/netbeans/spi/project/support/LookupProviderSupport.java =================================================================== RCS file: /shared/data/ccvs/repository/projects/projectapi/src/org/netbeans/spi/project/support/LookupProviderSupport.java,v retrieving revision 1.7 diff -u -r1.7 LookupProviderSupport.java --- projects/projectapi/src/org/netbeans/spi/project/support/LookupProviderSupport.java 26 Mar 2007 21:03:19 -0000 1.7 +++ projects/projectapi/src/org/netbeans/spi/project/support/LookupProviderSupport.java 9 Apr 2007 20:39:42 -0000 @@ -32,10 +32,6 @@ import org.netbeans.spi.project.LookupMerger; import org.netbeans.spi.project.LookupProvider; import org.openide.ErrorManager; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.ChangeSupport; import org.openide.util.Lookup; import org.openide.util.LookupEvent; @@ -82,13 +78,7 @@ //TODO maybe have just one single instance for a given path? private static Lookup createLookup(String folderPath) { - FileObject root = Repository.getDefault().getDefaultFileSystem().findResource(folderPath); - if (root != null) { - DataFolder folder = DataFolder.findFolder(root); - return new FolderLookup(folder).getLookup(); - } else { // #87544 - return Lookup.EMPTY; - } + return Lookups.forPath(folderPath); } static class DelegatingLookupImpl extends ProxyLookup implements LookupListener { Index: projects/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java =================================================================== RCS file: /shared/data/ccvs/repository/projects/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java,v retrieving revision 1.42 diff -u -r1.42 ProjectsRootNode.java --- projects/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java 3 Apr 2007 21:40:57 -0000 1.42 +++ projects/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java 9 Apr 2007 20:39:43 -0000 @@ -45,9 +45,6 @@ import org.netbeans.spi.project.ui.LogicalViewProvider; import org.openide.ErrorManager; import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.FilterNode; @@ -104,8 +101,7 @@ return new Action[0]; } else { List actions = new ArrayList(); - DataFolder actionsFolder = DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().findResource(ACTIONS_FOLDER)); - for (Object o: new FolderLookup(actionsFolder).getLookup().lookupAll(Object.class)) { + for (Object o: Lookups.forPath(ACTIONS_FOLDER).lookupAll(Object.class)) { if (o instanceof Action) { actions.add((Action) o); } else if (o instanceof JSeparator) { Index: projects/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java =================================================================== RCS file: /shared/data/ccvs/repository/projects/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java,v retrieving revision 1.9 diff -u -r1.9 NodeFactorySupport.java --- projects/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java 14 Mar 2007 15:24:46 -0000 1.9 +++ projects/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java 9 Apr 2007 20:39:43 -0000 @@ -28,15 +28,12 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.project.Project; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.util.Lookup; import org.openide.util.LookupEvent; import org.openide.util.LookupListener; +import org.openide.util.lookup.Lookups; /** * Support class for creating Project node's children nodes from NodeFactory instances @@ -112,10 +109,7 @@ // protected for tests.. protected Lookup createLookup() { - FileObject root = Repository.getDefault().getDefaultFileSystem().findResource(folderPath); - assert root != null : "Cannot find path " + folderPath + " in layers"; - DataFolder folder = DataFolder.findFolder(root); - return new FolderLookup(folder).getLookup(); + return Lookups.forPath(folderPath); } protected Node[] createNodes(NodeListKeyWrapper key) { Index: web/project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java =================================================================== RCS file: /shared/data/ccvs/repository/web/project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java,v retrieving revision 1.3 diff -u -r1.3 WebLogicalViewProvider.java --- web/project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java 29 Mar 2007 05:59:43 -0000 1.3 +++ web/project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java 9 Apr 2007 20:39:45 -0000 @@ -49,11 +49,8 @@ import org.openide.filesystems.FileStatusEvent; import org.openide.filesystems.FileStatusListener; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.nodes.*; import org.openide.util.ContextAwareAction; import org.openide.util.HelpCtx; @@ -506,15 +503,13 @@ actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // honor 57874 contact + - FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N - if (fo != null) { - for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } + for (Object next : Lookups.forPath("Projects/Actions").lookupAll(Object.class)) { + if (next instanceof Action) { + actions.add((Action) next); + } else if (next instanceof JSeparator) { + actions.add(null); } } Index: web/webapi/src/org/netbeans/modules/web/api/webmodule/WebFrameworkSupport.java =================================================================== RCS file: /shared/data/ccvs/repository/web/webapi/src/org/netbeans/modules/web/api/webmodule/WebFrameworkSupport.java,v retrieving revision 1.6 diff -u -r1.6 WebFrameworkSupport.java --- web/webapi/src/org/netbeans/modules/web/api/webmodule/WebFrameworkSupport.java 30 Jun 2006 22:35:15 -0000 1.6 +++ web/webapi/src/org/netbeans/modules/web/api/webmodule/WebFrameworkSupport.java 9 Apr 2007 20:39:45 -0000 @@ -20,14 +20,10 @@ package org.netbeans.modules.web.api.webmodule; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.Repository; import org.netbeans.modules.web.spi.webmodule.WebFrameworkProvider; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; +import org.openide.util.lookup.Lookups; /** * @@ -46,13 +42,8 @@ * @return List of all {@link org.netbeans.modules.web.spi.webmodule.WebFrameworkProvider}s, which are registered in the layer - j2ee/webtier/framework folder. */ public static List/**/ getFrameworkProviders(){ - FileObject f = Repository.getDefault().getDefaultFileSystem(). - findResource("j2ee/webtier/framework"); //NOI18N - if (f == null) - return Collections.EMPTY_LIST; - DataFolder folder = DataFolder.findFolder(f); - FolderLookup l = new FolderLookup(folder); - Lookup.Result result = l.getLookup().lookup(new Lookup.Template(WebFrameworkProvider.class)); + Lookup l = Lookups.forPath("j2ee/webtier/framework"); //NOI18N + Lookup.Result result = l.lookupResult(WebFrameworkProvider.class); return new ArrayList(result.allInstances()); // since allInstances() returns a Collection } } Index: websvc/registry/extsrc/org/netbeans/modules/websvc/registry/RegistryViewImpl.java =================================================================== RCS file: /shared/data/ccvs/repository/websvc/registry/extsrc/org/netbeans/modules/websvc/registry/RegistryViewImpl.java,v retrieving revision 1.7 diff -u -r1.7 RegistryViewImpl.java --- websvc/registry/extsrc/org/netbeans/modules/websvc/registry/RegistryViewImpl.java 9 Apr 2007 17:13:14 -0000 1.7 +++ websvc/registry/extsrc/org/netbeans/modules/websvc/registry/RegistryViewImpl.java 9 Apr 2007 20:39:45 -0000 @@ -37,16 +37,9 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.openide.ErrorManager; import org.openide.nodes.Node; -import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileStateInvalidException; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataFolder; -import org.openide.loaders.FolderLookup; -import org.openide.loaders.DataObjectNotFoundException; import org.openide.util.Lookup; import org.netbeans.modules.websvc.registry.model.WebServiceGroup; @@ -58,6 +51,7 @@ import org.netbeans.modules.websvc.registry.wsdl.WSDLInfo; import org.netbeans.modules.websvc.api.registry.WebServicesRegistryView; +import org.openide.util.lookup.Lookups; /** * @@ -73,16 +67,8 @@ public Node getRegistryRootNode() { Node rootNode = null; - try { - FileSystem defaultFileSystem = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = defaultFileSystem.findResource("UI/Runtime"); //NOI18N - DataFolder df = (DataFolder) DataObject.find(fo); - Lookup l = new FolderLookup(df).getLookup(); - rootNode = (WebServicesRootNode) l.lookup(WebServicesRootNode.class); - } catch (DataObjectNotFoundException ex) { - ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex); - rootNode = null; - } + Lookup l = Lookups.forPath("UI/Runtime"); // NOI18N + rootNode = (WebServicesRootNode) l.lookup(WebServicesRootNode.class); return rootNode; } Index: xml/catalog/src/org/netbeans/modules/xml/catalog/settings/CatalogSettings.java =================================================================== RCS file: /shared/data/ccvs/repository/xml/catalog/src/org/netbeans/modules/xml/catalog/settings/CatalogSettings.java,v retrieving revision 1.11 diff -u -r1.11 CatalogSettings.java --- xml/catalog/src/org/netbeans/modules/xml/catalog/settings/CatalogSettings.java 30 Jun 2006 22:49:40 -0000 1.11 +++ xml/catalog/src/org/netbeans/modules/xml/catalog/settings/CatalogSettings.java 9 Apr 2007 20:39:45 -0000 @@ -24,17 +24,9 @@ import org.netbeans.modules.xml.catalog.lib.IteratorIterator; import org.openide.*; -import org.openide.util.HelpCtx; import org.openide.util.io.NbMarshalledObject; import org.netbeans.modules.xml.catalog.spi.*; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.util.LookupListener; import org.openide.util.LookupEvent; @@ -252,16 +244,7 @@ */ private static Lookup getUserCatalogsLookup() { if (userCatalogLookup == null) { - FileSystem sfs = Repository.getDefault().getDefaultFileSystem(); - FileObject folder = sfs.findResource(REGISTRATIONS); - // do not cache any module providing it can be enabled at any time - if (folder == null) return Lookups.fixed(new Object[0]); - try { - DataFolder dataFolder = (DataFolder) DataObject.find(folder); - userCatalogLookup = new FolderLookup(dataFolder).getLookup(); - } catch (DataObjectNotFoundException ex) { - throw new IllegalStateException("There must be DataFolder for " + folder + "!"); - } + userCatalogLookup = Lookups.forPath(REGISTRATIONS); } return userCatalogLookup; } Index: xml/core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java =================================================================== RCS file: /shared/data/ccvs/repository/xml/core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java,v retrieving revision 1.6 diff -u -r1.6 GrammarQueryManager.java --- xml/core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java 30 Jun 2006 22:49:48 -0000 1.6 +++ xml/core/src/org/netbeans/modules/xml/api/model/GrammarQueryManager.java 9 Apr 2007 20:39:45 -0000 @@ -29,14 +29,8 @@ import java.util.Iterator; import org.netbeans.modules.xml.api.model.GrammarQuery; import org.openide.ErrorManager; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; -import org.xml.sax.InputSource; +import org.openide.util.lookup.Lookups; /** * GrammarQuery service provider definition. Manager methods @@ -182,25 +176,8 @@ return registrations.allInstances().iterator(); } - // try to initialize it - - try { - FileSystem fs = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = fs.findResource(FOLDER); - DataObject df = DataObject.find(fo); - if (df instanceof DataObject.Container) { - FolderLookup lookup = - new FolderLookup((DataObject.Container) df); - Lookup.Template template = - new Lookup.Template(GrammarQueryManager.class); - registrations = lookup.getLookup().lookup(template); - return registrations.allInstances().iterator(); - } else { - return new ArrayList(0).iterator(); - } - } catch (DataObjectNotFoundException ex) { - return new ArrayList(0).iterator(); - } + registrations = Lookups.forPath(FOLDER).lookupResult(GrammarQueryManager.class); + return registrations.allInstances().iterator(); } } } Index: xml/core/src/org/netbeans/modules/xml/core/scenario/NewScenarioPanel.java =================================================================== RCS file: /shared/data/ccvs/repository/xml/core/src/org/netbeans/modules/xml/core/scenario/NewScenarioPanel.java,v retrieving revision 1.6 diff -u -r1.6 NewScenarioPanel.java --- xml/core/src/org/netbeans/modules/xml/core/scenario/NewScenarioPanel.java 30 Jun 2006 22:50:11 -0000 1.6 +++ xml/core/src/org/netbeans/modules/xml/core/scenario/NewScenarioPanel.java 9 Apr 2007 20:39:45 -0000 @@ -20,14 +20,8 @@ import java.awt.Dialog; import java.util.Iterator; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.Repository; -import org.openide.loaders.FolderLookup; import org.openide.util.Lookup; import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import java.util.ArrayList; import java.util.Collection; import java.util.Vector; import javax.swing.DefaultComboBoxModel; @@ -37,6 +31,7 @@ import org.openide.util.HelpCtx; import org.netbeans.modules.xml.api.scenario.*; +import org.openide.util.lookup.Lookups; /** * A UI panel which allows the user to select a name and scenario type from @@ -59,42 +54,26 @@ nameField.setText(defaultName); nameField.setSelectionStart(0); nameField.setSelectionEnd(defaultName.length()); + - try { - // Load the ScenarioFactories from the XML layer - FileSystem fs = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = fs.findResource(FOLDER); - if (fo == null) throw new NoFactoriesException(); - DataObject df = DataObject.find(fo); - if (df instanceof DataObject.Container) { - FolderLookup lookup = - new FolderLookup((DataObject.Container) df); - Lookup.Template template = - new Lookup.Template(ScenarioFactory.class); - Lookup.Result registrations = lookup.getLookup().lookup(template); - - // Only display enabled factories for this DataObject - Collection allFactories = registrations.allInstances(); - Vector allowedFactories = new Vector(); - Iterator iter = allFactories.iterator(); - while(iter.hasNext()) { - ScenarioFactory factory = (ScenarioFactory)iter.next(); - if (factory.isEnabled(dataObject)) { - allowedFactories.add(factory); - } - } - - if (allowedFactories.size() == 0) { - throw new NoFactoriesException(); - } - - typeCombo.setModel(new javax.swing.DefaultComboBoxModel(allowedFactories.toArray())); - } else { - throw new NoFactoriesException(); + Lookup.Result registrations = Lookups.forPath(FOLDER).lookupResult(ScenarioFactory.class); + + // Only display enabled factories for this DataObject + Collection allFactories = registrations.allInstances(); + Vector allowedFactories = new Vector(); + Iterator iter = allFactories.iterator(); + while(iter.hasNext()) { + ScenarioFactory factory = (ScenarioFactory)iter.next(); + if (factory.isEnabled(dataObject)) { + allowedFactories.add(factory); } - } catch (DataObjectNotFoundException ex) { + } + + if (allowedFactories.size() == 0) { throw new NoFactoriesException(); } + + typeCombo.setModel(new javax.swing.DefaultComboBoxModel(allowedFactories.toArray())); } /** Index: xml/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java =================================================================== RCS file: /shared/data/ccvs/repository/xml/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java,v retrieving revision 1.45 diff -u -r1.45 XSLGrammarQuery.java --- xml/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java 15 Feb 2007 14:02:55 -0000 1.45 +++ xml/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java 9 Apr 2007 20:39:46 -0000 @@ -29,21 +29,13 @@ import org.netbeans.modules.xml.spi.dom.*; import org.netbeans.modules.xml.api.cookies.ScenarioCookie; import org.netbeans.modules.xsl.api.XSLCustomizer; -import org.netbeans.modules.xsl.api.XSLScenario; -import org.openide.filesystems.Repository; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileSystem; -import org.openide.loaders.FolderLookup; -import org.openide.loaders.DataFolder; import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.loaders.InstanceDataObject; import org.openide.nodes.PropertySupport; import org.openide.util.Lookup; import org.openide.util.NbBundle; +import org.openide.util.lookup.Lookups; import org.w3c.dom.*; -import org.w3c.dom.NodeList; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -809,32 +801,15 @@ * Looks up registered XSLCustomizer objects which will be used by this object */ private static XSLCustomizer lookupCustomizerInstance() { - try { - // Load the XSLCustomizer from the XML layer - FileSystem fs = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = fs.findResource(CUSTOMIZER_FOLDER); - if (fo == null) return null; - DataObject df = DataObject.find(fo); - if (!(df instanceof DataObject.Container)) { - return null; - } - - // ??? What is it? Should not we use naming instead? - - FolderLookup lookup = - new FolderLookup((DataObject.Container) df); - Lookup.Template template = - new Lookup.Template(XSLCustomizer.class); + Lookup.Template template = + new Lookup.Template(XSLCustomizer.class); - Lookup.Item lookupItem = lookup.getLookup().lookupItem(template); - if (lookupItem == null) { - return null; - } - - return (XSLCustomizer)lookupItem.getInstance(); - } catch (DataObjectNotFoundException e) { + Lookup.Item lookupItem = Lookups.forPath(CUSTOMIZER_FOLDER).lookupItem(template); + if (lookupItem == null) { return null; } + + return (XSLCustomizer)lookupItem.getInstance(); } /**