Issue 136334: provide a standard utility method to create a menu of actions from a layer folder. diff --git a/ant.freeform/nbproject/project.xml b/ant.freeform/nbproject/project.xml --- a/ant.freeform/nbproject/project.xml +++ b/ant.freeform/nbproject/project.xml @@ -157,7 +157,7 @@ - 6.2 + 7.6 diff --git a/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java b/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java --- a/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java +++ b/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java @@ -63,10 +63,8 @@ import java.util.regex.PatternSyntaxException; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.apache.tools.ant.module.api.support.ActionUtils; import org.netbeans.modules.ant.freeform.spi.support.Util; -import org.netbeans.modules.ant.freeform.ui.TargetMappingPanel; import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert; import org.netbeans.spi.project.ActionProvider; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -80,10 +78,10 @@ import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.loaders.DataObject; +import org.openide.nodes.NodeOp; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; -import org.openide.util.lookup.Lookups; import org.w3c.dom.Element; /** @@ -480,7 +478,7 @@ } } } - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N // Back to generic actions. actions.add(null); actions.add(CommonProjectActions.setAsMainProjectAction()); @@ -495,22 +493,11 @@ actions.add(SystemAction.get(FindAction.class)); // honor #57874 contract, see #58624: - addFromLayers(actions, "Projects/Actions"); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); - } - - private static void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } private static final class CustomAction extends AbstractAction { diff --git a/apisupport.project/nbproject/project.xml b/apisupport.project/nbproject/project.xml --- a/apisupport.project/nbproject/project.xml +++ b/apisupport.project/nbproject/project.xml @@ -299,7 +299,7 @@ - 6.2 + 7.6 diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java @@ -44,7 +44,6 @@ 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; @@ -54,7 +53,6 @@ import java.util.regex.Pattern; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.apache.tools.ant.module.api.support.ActionUtils; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.project.ProjectManager; @@ -79,11 +77,11 @@ import org.openide.actions.FindAction; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; +import org.openide.nodes.NodeOp; 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 { @@ -104,7 +102,7 @@ actions.add(createSimpleAction(project, new String[] {"run"}, NbBundle.getMessage(ModuleActions.class, "ACTION_run"))); } actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, NbBundle.getMessage(ModuleActions.class, "ACTION_debug"), null)); - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N if (project.supportsUnitTests()) { actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, NbBundle.getMessage(ModuleActions.class, "ACTION_test"), null)); } @@ -132,32 +130,10 @@ actions.add(null); actions.add(SystemAction.get(FindAction.class)); // Honor #57874 contract: - Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N - if (!res.isEmpty()) { - actions.add(null); - for (Object next : res) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); - } - - private static void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } private final NbModuleProject project; diff --git a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/SuiteActions.java @@ -44,10 +44,8 @@ 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; import org.apache.tools.ant.module.api.support.ActionUtils; import org.netbeans.api.project.Project; import org.netbeans.modules.apisupport.project.NbModuleProject; @@ -65,10 +63,10 @@ import org.openide.actions.FindAction; import org.openide.execution.ExecutorTask; import org.openide.filesystems.FileObject; +import org.openide.nodes.NodeOp; 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. @@ -86,7 +84,7 @@ actions.add(null); actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, NbBundle.getMessage(SuiteActions.class, "SUITE_ACTION_run"), null)); actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, NbBundle.getMessage(SuiteActions.class, "SUITE_ACTION_debug"), null)); - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N actions.add(null); NbPlatform platform = project.getPlatform(true); //true -> #96095 if (platform != null && platform.getHarnessVersion() >= NbPlatform.HARNESS_VERSION_61) { @@ -117,31 +115,11 @@ actions.add(null); actions.add(SystemAction.get(FindAction.class)); - Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N - if (!res.isEmpty()) { - actions.add(null); - for (Object next : res) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); - } - - private static void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } private final SuiteProject project; diff --git a/bpel.project/nbproject/project.xml b/bpel.project/nbproject/project.xml --- a/bpel.project/nbproject/project.xml +++ b/bpel.project/nbproject/project.xml @@ -125,6 +125,14 @@ + org.netbeans.modules.compapp.projects.base + + + + 1.1 + + + org.netbeans.modules.j2eeserver @@ -185,6 +193,15 @@ 1 1.7.1 + + + + org.netbeans.modules.soa.validation + + + + 1 + 1.1 @@ -316,7 +333,7 @@ - 6.7.1 + 7.6 @@ -336,23 +353,6 @@ 3.9.12 - - org.netbeans.modules.compapp.projects.base - - - - 1.1 - - - - org.netbeans.modules.soa.validation - - - - 1 - 1.1 - - org.netbeans.modules.bpel.editors diff --git a/bpel.project/src/org/netbeans/modules/bpel/project/ui/IcanproLogicalViewProvider.java b/bpel.project/src/org/netbeans/modules/bpel/project/ui/IcanproLogicalViewProvider.java --- a/bpel.project/src/org/netbeans/modules/bpel/project/ui/IcanproLogicalViewProvider.java +++ b/bpel.project/src/org/netbeans/modules/bpel/project/ui/IcanproLogicalViewProvider.java @@ -24,14 +24,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Enumeration; import java.util.List; import java.util.ResourceBundle; import java.util.StringTokenizer; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.api.project.Sources; import org.netbeans.spi.project.ui.support.DefaultProjectOperations; @@ -52,11 +50,9 @@ import org.netbeans.spi.project.ui.support.ProjectSensitiveActions; import org.netbeans.modules.bpel.model.api.support.Utils; import org.netbeans.modules.bpel.project.IcanproConstants; -import org.netbeans.modules.bpel.project.ProjectConstants; import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.Repository; import org.openide.loaders.DataFolder; import org.openide.loaders.DataObject; @@ -276,7 +272,7 @@ actions.add(null); actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // add versioning support - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N // null, // SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class), actions.add(null); @@ -286,17 +282,6 @@ return actions.toArray(new Action[actions.size()]); } - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - /** This action is created only when project has broken references. * Once these are resolved the action is disabled. */ diff --git a/cnd.makeproject/nbproject/project.xml b/cnd.makeproject/nbproject/project.xml --- a/cnd.makeproject/nbproject/project.xml +++ b/cnd.makeproject/nbproject/project.xml @@ -163,7 +163,7 @@ - 6.7.1 + 7.6 diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/MakeLogicalViewProvider.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/MakeLogicalViewProvider.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/MakeLogicalViewProvider.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/MakeLogicalViewProvider.java @@ -67,7 +67,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -115,6 +114,7 @@ import org.openide.nodes.Children; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.Lookup; import org.openide.util.Lookup.Template; import org.openide.util.LookupEvent; @@ -538,27 +538,16 @@ actions.add(standardActions[i]); actions.add(null); //actions.add(new CodeAssistanceAction()); - addActionsFromLayers(actions, "NativeProjects/Menu"); // NOI18N + actions.addAll(NodeOp.actionsForPath("NativeProjects/Menu")); // NOI18N actions.add(null); actions.add(SystemAction.get(org.openide.actions.FindAction.class )); - addActionsFromLayers(actions, "Projects/Actions"); // NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N // Add remaining actions actions.add(null); //actions.add(SystemAction.get(ToolsAction.class)); //actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return (Action[])actions.toArray(new Action[actions.size()]); - } - - private void addActionsFromLayers(final Vector actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } public boolean canRename() { diff --git a/compapp.projects.jbi/nbproject/project.xml b/compapp.projects.jbi/nbproject/project.xml --- a/compapp.projects.jbi/nbproject/project.xml +++ b/compapp.projects.jbi/nbproject/project.xml @@ -404,7 +404,7 @@ - 6.6.1 + 7.6 diff --git a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/JbiLogicalViewProvider.java b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/JbiLogicalViewProvider.java --- a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/JbiLogicalViewProvider.java +++ b/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/JbiLogicalViewProvider.java @@ -45,7 +45,6 @@ import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.modules.compapp.projects.jbi.JbiProject; import org.netbeans.modules.compapp.projects.jbi.ui.actions.AddProjectAction; -import org.netbeans.modules.compapp.projects.jbi.ui.actions.OpenEditorAction; import org.netbeans.modules.compapp.projects.jbi.ui.customizer.JbiProjectProperties; import org.netbeans.modules.compapp.test.ui.TestNode; @@ -549,7 +548,7 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - addFromLayers(actions, "Projects/Actions"); // NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N if (broken) { actions.add(brokenLinksAction); @@ -559,17 +558,6 @@ actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); - } - - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } /** diff --git a/etl.editor/nbproject/project.xml b/etl.editor/nbproject/project.xml --- a/etl.editor/nbproject/project.xml +++ b/etl.editor/nbproject/project.xml @@ -218,7 +218,7 @@ - 6.7.2 + 7.6 diff --git a/etl.editor/src/org/netbeans/modules/etl/ui/ETLEditorViewMultiViewElement.java b/etl.editor/src/org/netbeans/modules/etl/ui/ETLEditorViewMultiViewElement.java --- a/etl.editor/src/org/netbeans/modules/etl/ui/ETLEditorViewMultiViewElement.java +++ b/etl.editor/src/org/netbeans/modules/etl/ui/ETLEditorViewMultiViewElement.java @@ -41,11 +41,6 @@ import java.awt.BorderLayout; import java.awt.Color; -import java.awt.dnd.DropTarget; -import java.awt.dnd.DropTargetDragEvent; -import java.awt.dnd.DropTargetDropEvent; -import java.awt.dnd.DropTargetEvent; -import java.awt.dnd.DropTargetListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Externalizable; @@ -56,7 +51,6 @@ import java.util.Arrays; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.UIManager; import javax.swing.event.ChangeListener; import javax.swing.text.Document; @@ -73,16 +67,13 @@ import org.netbeans.modules.etl.ui.palette.PaletteSupport; import org.netbeans.modules.sql.framework.model.utils.SQLObjectUtil; import org.netbeans.modules.etl.ui.view.ETLCollaborationTopPanel; -import org.netbeans.modules.sql.framework.ui.graph.impl.GraphView; import org.netbeans.spi.palette.PaletteController; -import org.openide.DialogDisplayer; import org.openide.ErrorManager; -import org.openide.NotifyDescriptor; import org.openide.awt.StatusDisplayer; import org.openide.awt.UndoRedo; import org.openide.cookies.SaveCookie; import org.openide.nodes.Node; -import org.openide.text.ActiveEditorDrop; +import org.openide.nodes.NodeOp; import org.openide.util.Lookup; import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; @@ -432,22 +423,10 @@ for (Action action : super.getActions()) { actionsList.add(action); } - actionsList.add(addFromLayers()); + actionsList.addAll(NodeOp.actionsForPath("Projects/Actions")); Action[] actions = new Action[actionsList.size()]; actionsList.toArray(actions); return actions; } - private Action addFromLayers() { - Action action = null; - Lookup look = Lookups.forPath("Projects/Actions"); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - action = (Action) next; - } else if (next instanceof JSeparator) { - action = null; - } - } - return action; - } } diff --git a/etl.editor/src/org/netbeans/modules/etl/ui/ETLSourceMultiViewElement.java b/etl.editor/src/org/netbeans/modules/etl/ui/ETLSourceMultiViewElement.java --- a/etl.editor/src/org/netbeans/modules/etl/ui/ETLSourceMultiViewElement.java +++ b/etl.editor/src/org/netbeans/modules/etl/ui/ETLSourceMultiViewElement.java @@ -50,7 +50,6 @@ import java.util.ArrayList; import javax.swing.Action; import javax.swing.JComponent; -import javax.swing.JSeparator; import javax.swing.text.Document; import org.netbeans.core.spi.multiview.CloseOperationState; @@ -61,6 +60,7 @@ import org.openide.awt.UndoRedo; import org.openide.cookies.SaveCookie; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.text.CloneableEditor; import org.openide.text.NbDocument; import org.openide.util.Lookup; @@ -252,22 +252,10 @@ if(!(action instanceof FileSystemAction)) actionsList.add(action); } - actionsList.add(addFromLayers()); + actionsList.addAll(NodeOp.actionsForPath("Projects/Actions")); Action[] actions = new Action[actionsList.size()]; actionsList.toArray(actions); return actions; } - private Action addFromLayers() { - Action action = null; - Lookup look = Lookups.forPath("Projects/Actions"); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - action = (Action) next; - } else if (next instanceof JSeparator) { - action = null; - } - } - return action; - } } diff --git a/etl.project/nbproject/project.xml b/etl.project/nbproject/project.xml --- a/etl.project/nbproject/project.xml +++ b/etl.project/nbproject/project.xml @@ -226,7 +226,7 @@ - 6.6.1 + 7.6 diff --git a/etl.project/src/org/netbeans/modules/etl/project/ui/EtlproLogicalViewProvider.java b/etl.project/src/org/netbeans/modules/etl/project/ui/EtlproLogicalViewProvider.java --- a/etl.project/src/org/netbeans/modules/etl/project/ui/EtlproLogicalViewProvider.java +++ b/etl.project/src/org/netbeans/modules/etl/project/ui/EtlproLogicalViewProvider.java @@ -22,6 +22,8 @@ import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.ResourceBundle; @@ -30,7 +32,6 @@ import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.openide.filesystems.FileStateInvalidException; import org.openide.nodes.*; import org.openide.util.*; @@ -263,7 +264,7 @@ String nbBundle10 = "Generate Bulk Loader"; - return new Action[]{ + List actions = new ArrayList(Arrays.asList( CommonProjectActions.newFileAction(), null, ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_BUILD, nbBundle1, null), // NOI18N @@ -291,27 +292,15 @@ CommonProjectActions.copyProjectAction(), CommonProjectActions.deleteProjectAction(), null, - SystemAction.get(org.openide.actions.FindAction.class), - addFromLayers(), + SystemAction.get(org.openide.actions.FindAction.class))); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); + actions.addAll(Arrays.asList( null, SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class), null, brokenLinksAction, - CommonProjectActions.customizeProjectAction(), - }; - } - - private Action addFromLayers() { - Action action = null; - Lookup look = Lookups.forPath("Projects/Actions"); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - action = (Action) next; - } else if (next instanceof JSeparator) { - action = null; - } - } - return action; + CommonProjectActions.customizeProjectAction())); + return actions.toArray(new Action[actions.size()]); } /** This action is created only when project has broken references. diff --git a/groovy.grailsproject/nbproject/project.xml b/groovy.grailsproject/nbproject/project.xml --- a/groovy.grailsproject/nbproject/project.xml +++ b/groovy.grailsproject/nbproject/project.xml @@ -39,6 +39,15 @@ 1 1.10 + + + + org.netbeans.modules.extexecution + + + + 0-1 + 1.1 @@ -93,15 +102,6 @@ 1.23 - - org.netbeans.modules.extexecution - - - - 0-1 - 1.1 - - org.netbeans.modules.queries @@ -172,7 +172,7 @@ - 7.0 + 7.6 diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java @@ -46,7 +46,6 @@ import java.util.ArrayList; import java.util.List; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.modules.groovy.grailsproject.GrailsActionProvider; @@ -61,7 +60,7 @@ import org.openide.filesystems.FileObject; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; -import org.openide.util.Lookup; +import org.openide.nodes.NodeOp; import org.openide.util.NbBundle; import org.openide.util.Utilities; import org.openide.util.actions.SystemAction; @@ -147,24 +146,13 @@ actions.add(null); // honor 57874 contact - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); - } - - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } } diff --git a/j2ee.archive/nbproject/project.xml b/j2ee.archive/nbproject/project.xml --- a/j2ee.archive/nbproject/project.xml +++ b/j2ee.archive/nbproject/project.xml @@ -277,7 +277,7 @@ - 6.7.1 + 7.6 diff --git a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java b/j2ee.archive/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java --- a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java +++ b/j2ee.archive/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java @@ -44,11 +44,9 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.ResourceBundle; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.modules.j2ee.archive.project.ArchiveProject; @@ -63,6 +61,7 @@ import org.openide.nodes.Children; import org.openide.nodes.Node; //import org.openide.util.HelpCtx; +import org.openide.nodes.NodeOp; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; @@ -128,22 +127,8 @@ actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // honor 57874 contact - - - 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); - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N // actions.add(null); // if (brokenLinksAction != null && brokenLinksAction.isEnabled()) { diff --git a/j2ee.clientproject/nbproject/project.xml b/j2ee.clientproject/nbproject/project.xml --- a/j2ee.clientproject/nbproject/project.xml +++ b/j2ee.clientproject/nbproject/project.xml @@ -349,7 +349,7 @@ - 6.5 + 7.6 diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java --- a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java +++ b/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java @@ -53,14 +53,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -120,8 +118,8 @@ import org.openide.nodes.Children; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.Exceptions; -import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; import org.openide.util.Utilities; @@ -384,21 +382,8 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - - 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); - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); if (brokenLinksAction != null && brokenLinksAction.isEnabled()) { diff --git a/j2ee.earproject/nbproject/project.xml b/j2ee.earproject/nbproject/project.xml --- a/j2ee.earproject/nbproject/project.xml +++ b/j2ee.earproject/nbproject/project.xml @@ -329,7 +329,7 @@ - 6.2 + 7.6 diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java --- a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java +++ b/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java @@ -56,7 +56,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.api.java.platform.JavaPlatformManager; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; @@ -323,7 +322,7 @@ actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_DeployAction_Name" ), null)); actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N actions.add(null); actions.add(CommonProjectActions.setAsMainProjectAction()); @@ -337,7 +336,7 @@ actions.add(null); actions.add(SystemAction.get( FindAction.class )); - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N actions.add(null); @@ -350,17 +349,6 @@ actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); } - - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } /** This action is created only when project has broken references. * Once these are resolved the action is disabled. diff --git a/j2ee.ejbjarproject/nbproject/project.xml b/j2ee.ejbjarproject/nbproject/project.xml --- a/j2ee.ejbjarproject/nbproject/project.xml +++ b/j2ee.ejbjarproject/nbproject/project.xml @@ -413,7 +413,7 @@ - 6.2 + 7.6 diff --git a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java --- a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java +++ b/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java @@ -54,7 +54,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.java.platform.JavaPlatformManager; @@ -322,7 +321,7 @@ actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N actions.add(null); actions.add(CommonProjectActions.setAsMainProjectAction()); actions.add(CommonProjectActions.openSubprojectsAction()); @@ -337,7 +336,7 @@ // honor 57874 contract - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N actions.add(null); @@ -352,17 +351,6 @@ return actions.toArray(new javax.swing.Action[actions.size()]); } - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - /** This action is created only when project has broken references. * Once these are resolved the action is disabled. */ diff --git a/java.j2seproject/nbproject/project.xml b/java.j2seproject/nbproject/project.xml --- a/java.j2seproject/nbproject/project.xml +++ b/java.j2seproject/nbproject/project.xml @@ -278,7 +278,7 @@ - 6.5 + 7.6 diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java @@ -52,7 +52,6 @@ import java.util.ResourceBundle; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.java.platform.JavaPlatform; @@ -84,9 +83,9 @@ import org.openide.modules.SpecificationVersion; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.ChangeSupport; import org.openide.util.HelpCtx; -import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; import org.openide.util.Utilities; @@ -325,8 +324,8 @@ actions.add(ProjectSensitiveActions.projectCommandAction(JavaProjectConstants.COMMAND_JAVADOC, bundle.getString("LBL_JavadocAction_Name"), null)); // NOI18N actions.add(null); actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N - addFromLayers(actions, "Projects/Debugger_Actions_temporary"); //NOI18N - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Debugger_Actions_temporary")); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N actions.add(CommonProjectActions.setProjectConfigurationAction()); actions.add(null); @@ -342,7 +341,7 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N actions.add(null); if (broken) { @@ -352,17 +351,6 @@ return actions.toArray(new Action[actions.size()]); - } - - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } } private void setBroken(boolean broken) { diff --git a/mobility.project/nbproject/project.xml b/mobility.project/nbproject/project.xml --- a/mobility.project/nbproject/project.xml +++ b/mobility.project/nbproject/project.xml @@ -39,7 +39,8 @@ However, if you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. ---> +--> + org.netbeans.modules.apisupport.project @@ -322,7 +323,7 @@ - 6.2 + 7.6 diff --git a/mobility.project/src/org/netbeans/modules/mobility/project/ui/J2MEPhysicalViewProvider.java b/mobility.project/src/org/netbeans/modules/mobility/project/ui/J2MEPhysicalViewProvider.java --- a/mobility.project/src/org/netbeans/modules/mobility/project/ui/J2MEPhysicalViewProvider.java +++ b/mobility.project/src/org/netbeans/modules/mobility/project/ui/J2MEPhysicalViewProvider.java @@ -43,7 +43,6 @@ import java.io.CharConversionException; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; -import java.util.Iterator; import org.netbeans.api.project.*; import org.netbeans.api.project.libraries.LibraryManager; import org.netbeans.spi.project.ProjectConfiguration; @@ -66,17 +65,10 @@ import org.openide.ErrorManager; import org.openide.actions.FindAction; 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.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.util.HelpCtx; -import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; import org.openide.util.RequestProcessor.Task; @@ -92,6 +84,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.ResourceBundle; +import org.openide.nodes.NodeOp; import org.openide.util.WeakListeners; import org.openide.util.lookup.Lookups; import org.openide.xml.XMLUtil; @@ -404,34 +397,8 @@ act.add(new RefreshPackagesAction()); act.add(null); // honor 57874 contact - - try { - final Repository repository = Repository.getDefault(); - final FileSystem sfs = repository.getDefaultFileSystem(); - final FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N - if (fo != null) { - final DataObject dobj = DataObject.find(fo); - final FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj); - final Lookup.Template query = new Lookup.Template(Object.class); - final Lookup lookup = actionRegistry.getLookup(); - final Iterator it = lookup.lookup(query).allInstances().iterator(); - if (it.hasNext()) { - act.add(null); - } - while (it.hasNext()) { - final Object next = it.next(); - if (next instanceof Action) { - act.add((Action)next); - } else if (next instanceof JSeparator) { - act.add(null); - } - } - } - } catch (DataObjectNotFoundException ex) { - // data folder for exitinf fileobject expected - ErrorManager.getDefault().notify(ex); - } - + act.add(null); + act.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N act.add(null); act.add(CommonProjectActions.customizeProjectAction()); actions = act.toArray(new Action[act.size()]); diff --git a/openide.nodes/apichanges.xml b/openide.nodes/apichanges.xml --- a/openide.nodes/apichanges.xml +++ b/openide.nodes/apichanges.xml @@ -46,6 +46,21 @@ Nodes API + + + Added NodeOp.actionsForPath + + + + + +

+ Added utility method to construct a menu from a layer path. +

+ + + + Children.getNodeAt is changing to public diff --git a/openide.nodes/nbproject/project.properties b/openide.nodes/nbproject/project.properties --- a/openide.nodes/nbproject/project.properties +++ b/openide.nodes/nbproject/project.properties @@ -44,4 +44,4 @@ javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -spec.version.base=7.5.0 +spec.version.base=7.6.0 diff --git a/openide.nodes/src/org/openide/nodes/NodeOp.java b/openide.nodes/src/org/openide/nodes/NodeOp.java --- a/openide.nodes/src/org/openide/nodes/NodeOp.java +++ b/openide.nodes/src/org/openide/nodes/NodeOp.java @@ -54,6 +54,7 @@ import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.JPopupMenu; +import javax.swing.JSeparator; import org.openide.util.Enumerations; import org.openide.util.Lookup; import org.openide.util.Utilities; @@ -494,4 +495,28 @@ static void warning(Throwable ex) { Logger.getLogger(NodeOp.class.getName()).log(Level.WARNING, null, ex); } + + /** + * Load a menu sequence from a lookup path. + * Any {@link Action} instances are returned as is; + * any {@link JSeparator} instances are translated to nulls. + * Warnings are logged for any other instances. + * @param path a path as given to {@link Lookups#forPath}, generally a layer folder name + * @return a list of actions interspersed with null separators + * @since org.openide.nodes 7.6 + */ + public static List actionsForPath(String path) { + List actions = new ArrayList(); + for (Object item : Lookups.forPath(path).lookupAll(Object.class)) { + if (item instanceof Action) { + actions.add((Action) item); + } else if (item instanceof JSeparator) { + actions.add(null); + } else { + Logger.getLogger(NodeOp.class.getName()).warning("Unrecognized object of " + item.getClass() + " found in actions path " + path); + } + } + return actions; + } + } diff --git a/php.project/nbproject/project.xml b/php.project/nbproject/project.xml --- a/php.project/nbproject/project.xml +++ b/php.project/nbproject/project.xml @@ -197,7 +197,7 @@ - 7.0 + 7.6 diff --git a/php.project/src/org/netbeans/modules/php/project/PhpLogicalViewProvider.java b/php.project/src/org/netbeans/modules/php/project/PhpLogicalViewProvider.java --- a/php.project/src/org/netbeans/modules/php/project/PhpLogicalViewProvider.java +++ b/php.project/src/org/netbeans/modules/php/project/PhpLogicalViewProvider.java @@ -45,7 +45,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -53,7 +52,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -64,9 +62,7 @@ import org.netbeans.api.project.Sources; import org.netbeans.api.queries.VisibilityQuery; import org.netbeans.modules.php.project.ui.actions.DebugSingleCommand; -import org.netbeans.modules.php.project.ui.actions.DownloadCommand; import org.netbeans.modules.php.project.ui.actions.RunSingleCommand; -import org.netbeans.modules.php.project.ui.actions.UploadCommand; import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties; import org.netbeans.spi.project.ActionProvider; import org.netbeans.spi.project.support.ant.AntProjectHelper; @@ -243,17 +239,8 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N - if (!res.isEmpty()) { - actions.add(null); - for (Object next : res) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); return actions.toArray(new Action[actions.size()]); diff --git a/projectui/nbproject/project.xml b/projectui/nbproject/project.xml --- a/projectui/nbproject/project.xml +++ b/projectui/nbproject/project.xml @@ -187,7 +187,7 @@ - 6.2 + 7.6 diff --git a/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java b/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java --- a/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java +++ b/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java @@ -48,7 +48,6 @@ import java.lang.ref.Reference; import java.lang.ref.WeakReference; import java.text.MessageFormat; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -63,7 +62,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -86,6 +84,7 @@ import org.openide.nodes.Children; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -142,14 +141,7 @@ if (context || type == PHYSICAL_VIEW) { return new Action[0]; } else { - List actions = new ArrayList(); - for (Object o : Lookups.forPath(ACTIONS_FOLDER).lookupAll(Object.class)) { - if (o instanceof Action) { - actions.add((Action) o); - } else if (o instanceof JSeparator) { - actions.add(null); - } - } + List actions = NodeOp.actionsForPath(ACTIONS_FOLDER); return actions.toArray(new Action[actions.size()]); } } diff --git a/ruby.project/nbproject/project.xml b/ruby.project/nbproject/project.xml --- a/ruby.project/nbproject/project.xml +++ b/ruby.project/nbproject/project.xml @@ -24,6 +24,33 @@ + org.netbeans.api.progress + + + + 1 + 1.8 + + + + org.netbeans.modules.editor.lib + + + + 1 + 1.10.0.1 + + + + org.netbeans.modules.editor.lib2 + + + + 1 + 1.4 + + + org.netbeans.modules.gototest @@ -47,24 +74,6 @@ 1 0.30 - - - - org.netbeans.api.progress - - - - 1 - 1.8 - - - - org.netbeans.modules.editor.lib - - - - 1 - 1.10.0.1 @@ -100,15 +109,6 @@ 1 - - - - org.netbeans.modules.editor.lib2 - - - - 1 - 1.4 @@ -205,7 +205,7 @@ - 6.5 + 7.6 diff --git a/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/RubyLogicalViewProvider.java b/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/RubyLogicalViewProvider.java --- a/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/RubyLogicalViewProvider.java +++ b/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/RubyLogicalViewProvider.java @@ -44,11 +44,9 @@ import java.awt.Image; import java.io.CharConversionException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.ResourceBundle; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.modules.ruby.rubyproject.RubyActionProvider; @@ -75,6 +73,7 @@ import org.openide.loaders.DataObject; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.Utilities; @@ -347,18 +346,8 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - - Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N - if (!res.isEmpty()) { - actions.add(null); - for (Object next : res) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); // if (broken) { diff --git a/ruby.railsprojects/nbproject/project.xml b/ruby.railsprojects/nbproject/project.xml --- a/ruby.railsprojects/nbproject/project.xml +++ b/ruby.railsprojects/nbproject/project.xml @@ -252,7 +252,7 @@ - 6.9.0.1 + 7.6 diff --git a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/RailsLogicalViewProvider.java b/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/RailsLogicalViewProvider.java --- a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/RailsLogicalViewProvider.java +++ b/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/RailsLogicalViewProvider.java @@ -55,7 +55,6 @@ import java.util.ResourceBundle; import java.util.Set; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.modules.ruby.railsprojects.GenerateAction; @@ -96,6 +95,7 @@ import org.openide.loaders.DataObject; import org.openide.nodes.AbstractNode; import org.openide.nodes.Node; +import org.openide.nodes.NodeOp; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -520,18 +520,8 @@ actions.add(SystemAction.get(FindAction.class)); // honor 57874 contact - - Collection res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N - if (!res.isEmpty()) { - actions.add(null); - for (Object next : res) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } + actions.add(null); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N actions.add(null); actions.add(CommonProjectActions.customizeProjectAction()); diff --git a/sql.project/nbproject/project.xml b/sql.project/nbproject/project.xml --- a/sql.project/nbproject/project.xml +++ b/sql.project/nbproject/project.xml @@ -23,14 +23,6 @@ org.netbeans.modules.sql.project - - org.netbeans.modules.compapp.projects.base - - - - 1.1 - - org.apache.tools.ant.module @@ -65,6 +57,14 @@ 1 1.0 + + + + org.netbeans.modules.compapp.projects.base + + + + 1.1 @@ -126,7 +126,7 @@ 1 1.13.12 - + org.netbeans.modules.projectapi @@ -159,6 +159,15 @@ + 1.0 + + + + org.netbeans.soa.libs.wsdl4j + + + + 1 1.0 @@ -201,7 +210,7 @@ 6.8 - + org.openide.filesystems @@ -239,7 +248,7 @@ - 6.7.21 + 7.6 @@ -275,17 +284,8 @@ 3.9.12 - - org.netbeans.soa.libs.wsdl4j - - - - 1 - 1.0 - - - + diff --git a/sql.project/src/org/netbeans/modules/sql/project/ui/SQLproLogicalViewProvider.java b/sql.project/src/org/netbeans/modules/sql/project/ui/SQLproLogicalViewProvider.java --- a/sql.project/src/org/netbeans/modules/sql/project/ui/SQLproLogicalViewProvider.java +++ b/sql.project/src/org/netbeans/modules/sql/project/ui/SQLproLogicalViewProvider.java @@ -40,12 +40,9 @@ import java.lang.reflect.Method; import java.util.List; import java.util.ResourceBundle; -import java.util.Collections; -import java.util.StringTokenizer; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.modules.sql.project.SQLproProject; import org.openide.nodes.*; @@ -64,14 +61,10 @@ import org.netbeans.spi.project.support.ant.ReferenceHelper; import org.netbeans.spi.project.ui.LogicalViewProvider; import org.netbeans.spi.project.ui.support.ProjectSensitiveActions; -import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport; import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties; import org.netbeans.modules.compapp.projects.base.ui.IcanproLogicalViewProvider; import org.netbeans.modules.sql.project.wsdl.GenFiles; -import org.netbeans.modules.sql.project.wsdl.ActionImpl; -import org.netbeans.modules.compapp.projects.base.IcanproConstants; import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; import org.openide.util.lookup.Lookups; import org.openide.util.Lookup; @@ -199,7 +192,7 @@ generateWSDL(actions); actions.add(null); actions.add(SystemAction.get( org.openide.actions.FindAction.class )); - addFromLayers(actions, "Projects/Actions"); + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); actions.add(null); actions.add(brokenLinksAction); actions.add(CommonProjectActions.customizeProjectAction()); @@ -234,17 +227,6 @@ )};*/ } - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - private void generateWSDL(List actions) { Object genFiles = SystemAction.findObject(GenFiles.class, true); try { diff --git a/uml.designpattern/nbproject/project.xml b/uml.designpattern/nbproject/project.xml --- a/uml.designpattern/nbproject/project.xml +++ b/uml.designpattern/nbproject/project.xml @@ -135,7 +135,7 @@ - 6.5.1 + 7.6 diff --git a/uml.designpattern/src/org/netbeans/modules/uml/designpattern/DesignCenterComponent.java b/uml.designpattern/src/org/netbeans/modules/uml/designpattern/DesignCenterComponent.java --- a/uml.designpattern/src/org/netbeans/modules/uml/designpattern/DesignCenterComponent.java +++ b/uml.designpattern/src/org/netbeans/modules/uml/designpattern/DesignCenterComponent.java @@ -61,20 +61,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.ResourceBundle; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.InputMap; import javax.swing.JComponent; -import javax.swing.JSeparator; import javax.swing.KeyStroke; import org.netbeans.modules.uml.resources.images.ImageUtil; -import org.openide.cookies.InstanceCookie; -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.nodes.Node; import org.openide.windows.TopComponent; @@ -88,6 +82,7 @@ import org.netbeans.modules.uml.ui.swing.projecttree.ISwingProjectTreeModel; import org.netbeans.modules.uml.ui.swing.projecttree.JProjectTree; import org.netbeans.modules.uml.ui.swing.testbed.addin.menu.Separator; +import org.openide.nodes.NodeOp; /** * The DesignCenterComponent is a component that can be embedded into NetBeans @@ -500,66 +495,7 @@ */ protected Action[] getActionsFromRegistry(String path) { - ArrayList actions = new ArrayList(); - FileSystem system = Repository.getDefault().getDefaultFileSystem(); - - try - { - if (system != null) - { - FileObject lookupDir = system.findResource(path); - - if (lookupDir != null) - { - FileObject[] children = lookupDir.getChildren(); - - for (FileObject curObj : children) - { - try - { - DataObject dObj = DataObject.find(curObj); - - if (dObj != null) - { - InstanceCookie cookie = (InstanceCookie)dObj - .getCookie(InstanceCookie.class); - - if (cookie != null) - { - Object obj = cookie.instanceCreate(); - - if (obj instanceof Action) - { - actions.add((Action)obj); - } - else if (obj instanceof JSeparator) - { - actions.add(null); - } - } - } // dObj != null - } - - catch(ClassNotFoundException e) - { - // Unable to create the instance for some reason. So the - // do not worry about adding the instance to the list. - } - } // for-each FileObject - } // if lookupDir != null - } // if system != null - } - - catch(DataObjectNotFoundException e) - { - // Basically Bail at this time. - } - - catch(IOException ioE) - { - - } - + List actions = NodeOp.actionsForPath(path); Action[] retVal = new Action[actions.size()]; actions.toArray(retVal); return retVal; diff --git a/uml.project/nbproject/project.xml b/uml.project/nbproject/project.xml --- a/uml.project/nbproject/project.xml +++ b/uml.project/nbproject/project.xml @@ -205,7 +205,7 @@ - 6.5.1 + 7.6 diff --git a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/AbstractModelElementNode.java b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/AbstractModelElementNode.java --- a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/AbstractModelElementNode.java +++ b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/AbstractModelElementNode.java @@ -46,17 +46,11 @@ import java.awt.dnd.DnDConstants; import java.util.List; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.Repository; -import org.openide.loaders.DataObject; -import org.openide.cookies.InstanceCookie; -import org.openide.filesystems.FileObject; import java.awt.datatransfer.Transferable; import java.awt.EventQueue; import java.util.ArrayList; import java.util.LinkedList; import javax.swing.Action; -import javax.swing.JSeparator; import java.io.IOException; import org.openide.nodes.AbstractNode; @@ -85,8 +79,8 @@ import org.netbeans.modules.uml.propertysupport.DefinitionPropertyBuilder; import org.openide.actions.*; -import org.openide.loaders.DataFolder; import org.openide.nodes.Node.PropertySet; +import org.openide.nodes.NodeOp; import org.openide.util.datatransfer.ExTransferable; import org.openide.util.datatransfer.NewType; import org.openide.util.datatransfer.PasteType; @@ -711,45 +705,7 @@ */ protected Action[] getActionsFromRegistry(String path) { - ArrayList actions = new ArrayList(); - FileSystem system = Repository.getDefault().getDefaultFileSystem(); - - if (system != null) - { - FileObject fo = system.findResource(path); - DataFolder df = fo != null ? DataFolder.findFolder(fo) : null; - if (df != null) - { - DataObject actionObjects[] = df.getChildren(); - for (int i = 0; i < actionObjects.length; i++) - { - InstanceCookie ic = actionObjects[i].getCookie(InstanceCookie.class); - if (ic == null) continue; - Object instance; - try - { - instance = ic.instanceCreate(); - } - catch (IOException e) - { - // ignore - e.printStackTrace(); - continue; - } - catch (ClassNotFoundException e) - { - // ignore - e.printStackTrace(); - continue; - } - if (instance instanceof Action) - actions.add((Action)instance); - else if (instance instanceof JSeparator) - actions.add(null); - } - } - } - + List actions = NodeOp.actionsForPath(path); Action[] retVal = new Action[actions.size()]; actions.toArray(retVal); return retVal; diff --git a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLPhysicalViewProvider.java b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLPhysicalViewProvider.java --- a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLPhysicalViewProvider.java +++ b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLPhysicalViewProvider.java @@ -41,7 +41,6 @@ package org.netbeans.modules.uml.project.ui.nodes; -import java.util.Iterator; import java.awt.Image; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; @@ -58,7 +57,6 @@ import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -77,15 +75,8 @@ import org.netbeans.spi.project.support.ant.ReferenceHelper; import org.netbeans.spi.project.ui.LogicalViewProvider; -import org.openide.ErrorManager; import org.openide.filesystems.FileObject; -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.Children; import org.openide.nodes.Node; @@ -105,12 +96,11 @@ import org.netbeans.modules.uml.project.ui.nodes.actions.NewPackageType; import org.netbeans.modules.uml.resources.images.ImageUtil; import org.netbeans.modules.uml.ui.support.applicationmanager.IProduct; -import org.netbeans.spi.project.support.ant.AntProjectHelper; -import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.ui.support.CommonProjectActions; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; +import org.openide.nodes.NodeOp; import org.openide.util.Mutex; import org.openide.util.datatransfer.NewType; @@ -561,40 +551,7 @@ actions.add(null); actions.add(CommonProjectActions.deleteProjectAction()); actions.add(null); - - try - { - Repository repository = Repository.getDefault(); - FileSystem sfs = repository.getDefaultFileSystem(); - FileObject fo = sfs.findResource("UMLProjects/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 lkup = actionRegistry.getLookup(); - Iterator it = lkup.lookup(query).allInstances().iterator(); - - 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.addAll(NodeOp.actionsForPath("UMLProjects/Actions")); // NOI18N addContextMenus(actions); actions.add(null); diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -114,24 +114,6 @@ - org.netbeans.modules.gsfpath.api - - - - 1 - 0.30 - - - - org.netbeans.modules.gsf - - - - 2 - - - - org.netbeans.libs.javacapi @@ -150,6 +132,24 @@ 1 1.24 + + + + org.netbeans.modules.gsf + + + + 2 + + + + + org.netbeans.modules.gsfpath.api + + + + 1 + 0.30 @@ -455,7 +455,7 @@ - 6.2 + 7.6 diff --git a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java --- a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java +++ b/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java @@ -54,7 +54,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.db.explorer.ConnectionListener; @@ -348,9 +347,9 @@ actions.add(ProjectSensitiveActions.projectCommandAction( WebProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N - addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N - addFromLayers(actions, "Projects/Rest_Actions_holder"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Rest_Actions_holder")); //NOI18N actions.add(null); actions.add(CommonProjectActions.setAsMainProjectAction()); actions.add(CommonProjectActions.openSubprojectsAction()); @@ -365,7 +364,7 @@ // honor 57874 contact - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N actions.add(null); @@ -383,17 +382,6 @@ return actions.toArray(new Action[actions.size()]); } - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - /** This action is created only when project has broken references. * Once these are resolved the action is disabled. */ diff --git a/xslt.project/nbproject/project.xml b/xslt.project/nbproject/project.xml --- a/xslt.project/nbproject/project.xml +++ b/xslt.project/nbproject/project.xml @@ -23,15 +23,6 @@ org.netbeans.modules.xslt.project - - org.netbeans.modules.soa.ui - - - - 1 - 1.1 - - org.apache.tools.ant.module @@ -65,6 +56,14 @@ 1 1.5.22 + + + + org.netbeans.modules.compapp.projects.base + + + + 1.1 @@ -130,6 +129,24 @@ + org.netbeans.modules.soa.ui + + + + 1 + 1.1 + + + + org.netbeans.modules.soa.validation + + + + 1 + 1.1 + + + org.netbeans.modules.xml.catalogsupport @@ -154,6 +171,15 @@ + org.netbeans.modules.xml.search + + + + 1 + 1.1 + + + org.netbeans.modules.xml.wsdl.extensions @@ -170,15 +196,6 @@ - org.netbeans.modules.xslt.model - - - - 1 - 1.0 - - - org.netbeans.modules.xml.wsdlui @@ -192,6 +209,15 @@ 1 + + + + org.netbeans.modules.xslt.model + + + + 1 + 1.0 @@ -279,7 +305,7 @@ - 6.2 + 7.6 @@ -288,32 +314,6 @@ 7.4 - - - - org.netbeans.modules.compapp.projects.base - - - - 1.1 - - - - org.netbeans.modules.xml.search - - - - 1 - 1.1 - - - - org.netbeans.modules.soa.validation - - - - 1 - 1.1 diff --git a/xslt.project/src/org/netbeans/modules/xslt/project/wizard/IcanproLogicalViewProvider.java b/xslt.project/src/org/netbeans/modules/xslt/project/wizard/IcanproLogicalViewProvider.java --- a/xslt.project/src/org/netbeans/modules/xslt/project/wizard/IcanproLogicalViewProvider.java +++ b/xslt.project/src/org/netbeans/modules/xslt/project/wizard/IcanproLogicalViewProvider.java @@ -30,7 +30,6 @@ import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JSeparator; import org.netbeans.modules.xslt.project.XsltproProject; import org.netbeans.modules.xslt.project.nodes.IcanproViews; import org.netbeans.spi.project.ui.LogicalViewProvider; @@ -279,7 +278,7 @@ actions.add(null); actions.add(SystemAction.get( org.openide.actions.FindAction.class )); // add versioning support - addFromLayers(actions, "Projects/Actions"); //NOI18N + actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N // null, // SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class), actions.add(null); @@ -289,17 +288,6 @@ return actions.toArray(new Action[actions.size()]); } - private void addFromLayers(List actions, String path) { - Lookup look = Lookups.forPath(path); - for (Object next : look.lookupAll(Object.class)) { - if (next instanceof Action) { - actions.add((Action) next); - } else if (next instanceof JSeparator) { - actions.add(null); - } - } - } - /** This action is created only when project has broken references. * Once these are resolved the action is disabled. */