Attachment #62397 for bug #136334

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 136334
Collapse All | Expand All

Lines 157-163 Link Here

(-)a/ant.freeform/nbproject/project.xml (-1 / +1 lines)
157	<build-prerequisite/>	157	<build-prerequisite/>
158	<compile-dependency/>	158	<compile-dependency/>
159	<run-dependency>	159	<run-dependency>
160	<specification-version>6.2</specification-version>	160	<specification-version>7.6</specification-version>
161	</run-dependency>	161	</run-dependency>
162	</dependency>	162	</dependency>
163	<dependency>	163	<dependency>




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;

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;

/**

                }
            }
        }
        actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
        // Back to generic actions.
        actions.add(null);
        actions.add(CommonProjectActions.setAsMainProjectAction());

        actions.add(SystemAction.get(FindAction.class));
        
        // honor #57874 contract, see #58624:
        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<Action> 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 {

Lines 299-305 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
299	<build-prerequisite/>	299	<build-prerequisite/>
300	<compile-dependency/>	300	<compile-dependency/>
301	<run-dependency>	301	<run-dependency>
302	<specification-version>6.2</specification-version>	302	<specification-version>7.6</specification-version>
303	</run-dependency>	303	</run-dependency>
304	</dependency>	304	</dependency>
305	<dependency>	305	<dependency>




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;

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;

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 {
    

            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));
        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));
        }

        actions.add(null);
        actions.add(SystemAction.get(FindAction.class));
        // Honor #57874 contract:
        actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // 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.add(CommonProjectActions.customizeProjectAction());
        return actions.toArray(new Action[actions.size()]);
    }
    
    private static void addFromLayers(List<Action> 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;




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;

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.

        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));
        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) {

        
        actions.add(null);
        actions.add(SystemAction.get(FindAction.class));
        actions.add(null);
        actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
            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.add(CommonProjectActions.customizeProjectAction());
        return actions.toArray(new Action[actions.size()]);
    }
    
    private static void addFromLayers(List<Action> 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;

Lines 125-130 Link Here

(-)a/bpel.project/nbproject/project.xml (-18 / +18 lines)
125	</run-dependency>	125	</run-dependency>
126	</dependency>	126	</dependency>
127	<dependency>	127	<dependency>
		128	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
		129	<build-prerequisite/>
		130	<compile-dependency/>
		131	<run-dependency>
		132	<specification-version>1.1</specification-version>
		133	</run-dependency>
		134	</dependency>
		135	<dependency>
128	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>	136	<code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
129	<build-prerequisite/>	137	<build-prerequisite/>
130	<compile-dependency/>	138	<compile-dependency/>
Lines 185-190 Link Here
185	<run-dependency>	193	<run-dependency>
186	<release-version>1</release-version>	194	<release-version>1</release-version>
187	<specification-version>1.7.1</specification-version>	195	<specification-version>1.7.1</specification-version>
		196	</run-dependency>
		197	</dependency>
		198	<dependency>
		199	<code-name-base>org.netbeans.modules.soa.validation</code-name-base>
		200	<build-prerequisite/>
		201	<compile-dependency/>
		202	<run-dependency>
		203	<release-version>1</release-version>
		204	<specification-version>1.1</specification-version>
188	</run-dependency>	205	</run-dependency>
189	</dependency>	206	</dependency>
190	<dependency>	207	<dependency>
Lines 316-322 Link Here
316	<build-prerequisite/>	333	<build-prerequisite/>
317	<compile-dependency/>	334	<compile-dependency/>
318	<run-dependency>	335	<run-dependency>
319	<specification-version>6.7.1</specification-version>	336	<specification-version>7.6</specification-version>
320	</run-dependency>	337	</run-dependency>
321	</dependency>	338	</dependency>
322	<dependency>	339	<dependency>
Lines 336-358 Link Here
336	<specification-version>3.9.12</specification-version>	353	<specification-version>3.9.12</specification-version>
337	</run-dependency>	354	</run-dependency>
338	</dependency>	355	</dependency>
339	<dependency>
340	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
341	<build-prerequisite/>
342	<compile-dependency/>
343	<run-dependency>
344	<specification-version>1.1</specification-version>
345	</run-dependency>
346	</dependency>
347	<dependency>
348	<code-name-base>org.netbeans.modules.soa.validation</code-name-base>
349	<build-prerequisite/>
350	<compile-dependency/>
351	<run-dependency>
352	<release-version>1</release-version>
353	<specification-version>1.1</specification-version>
354	</run-dependency>
355	</dependency>
356	</module-dependencies>	356	</module-dependencies>
357	<friend-packages>	357	<friend-packages>
358	<friend>org.netbeans.modules.bpel.editors</friend>	358	<friend>org.netbeans.modules.bpel.editors</friend>




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;


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;

                actions.add(null);
                actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
                // add versioning support
                actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
//                null,
//                SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),
                actions.add(null);

            return actions.toArray(new Action[actions.size()]);
        }
        
        private void addFromLayers(List<Action> 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.
         */

Lines 163-169 Link Here

(-)a/cnd.makeproject/nbproject/project.xml (-1 / +1 lines)
163	<build-prerequisite/>	163	<build-prerequisite/>
164	<compile-dependency/>	164	<compile-dependency/>
165	<run-dependency>	165	<run-dependency>
166	<specification-version>6.7.1</specification-version>	166	<specification-version>7.6</specification-version>
167	</run-dependency>	167	</run-dependency>
168	</dependency>	168	</dependency>
169	<dependency>	169	<dependency>




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;

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;

                actions.add(standardActions[i]);
            actions.add(null);
            //actions.add(new CodeAssistanceAction());
            actions.addAll(NodeOp.actionsForPath("NativeProjects/Menu")); // NOI18N
            actions.add(null);
            actions.add(SystemAction.get(org.openide.actions.FindAction.class ));
            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() {

Lines 404-410 Link Here

(-)a/compapp.projects.jbi/nbproject/project.xml (-1 / +1 lines)
404	<build-prerequisite/>	404	<build-prerequisite/>
405	<compile-dependency/>	405	<compile-dependency/>
406	<run-dependency>	406	<run-dependency>
407	<specification-version>6.6.1</specification-version>	407	<specification-version>7.6</specification-version>
408	</run-dependency>	408	</run-dependency>
409	</dependency>	409	</dependency>
410	<dependency>	410	<dependency>




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;


            actions.add(SystemAction.get(FindAction.class));
            
            // honor 57874 contact
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
                        
            if (broken) {
                actions.add(brokenLinksAction);

            actions.add(CommonProjectActions.customizeProjectAction());
                        
            return actions.toArray(new Action[actions.size()]);            
        }
        
        private void addFromLayers(List<Action> 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);
                }
            }
        }
        
        /**

Lines 218-224 Link Here

(-)a/etl.editor/nbproject/project.xml (-1 / +1 lines)
218	<build-prerequisite/>	218	<build-prerequisite/>
219	<compile-dependency/>	219	<compile-dependency/>
220	<run-dependency>	220	<run-dependency>
221	<specification-version>6.7.2</specification-version>	221	<specification-version>7.6</specification-version>
222	</run-dependency>	222	</run-dependency>
223	</dependency>	223	</dependency>
224	<dependency>	224	<dependency>





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;

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;

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.nodes.NodeOp;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;

        for (Action action : super.getActions()) {            
            actionsList.add(action);
        }
        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;
    }
}




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;

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;

            if(!(action instanceof FileSystemAction))
            actionsList.add(action);
        }
        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;
    }
}

Lines 226-232 Link Here

(-)a/etl.project/nbproject/project.xml (-1 / +1 lines)
226	<build-prerequisite/>	226	<build-prerequisite/>
227	<compile-dependency/>	227	<compile-dependency/>
228	<run-dependency>	228	<run-dependency>
229	<specification-version>6.6.1</specification-version>	229	<specification-version>7.6</specification-version>
230	</run-dependency>	230	</run-dependency>
231	</dependency>	231	</dependency>
232	<dependency>	232	<dependency>

Lines 22-27 Link Here

(-)a/etl.project/src/org/netbeans/modules/etl/project/ui/EtlproLogicalViewProvider.java (-19 / +8 lines)
22	import java.awt.event.ActionEvent;	22	import java.awt.event.ActionEvent;
23	import java.beans.PropertyChangeEvent;	23	import java.beans.PropertyChangeEvent;
24	import java.beans.PropertyChangeListener;	24	import java.beans.PropertyChangeListener;
		25	import java.util.ArrayList;
		26	import java.util.Arrays;
25	import java.util.Collections;	27	import java.util.Collections;
26	import java.util.List;	28	import java.util.List;
27	import java.util.ResourceBundle;	29	import java.util.ResourceBundle;
Lines 30-36 Link Here
30	import javax.swing.AbstractAction;	32	import javax.swing.AbstractAction;
31	import javax.swing.Action;	33	import javax.swing.Action;
32		34
33	import javax.swing.JSeparator;
34	import org.openide.filesystems.FileStateInvalidException;	35	import org.openide.filesystems.FileStateInvalidException;
35	import org.openide.nodes.*;	36	import org.openide.nodes.*;
36	import org.openide.util.*;	37	import org.openide.util.*;
Lines 263-269 Link Here
263	String nbBundle10 = "Generate Bulk Loader";	264	String nbBundle10 = "Generate Bulk Loader";
264		265
265		266
266	return new Action[]{	267	List<Action> actions = new ArrayList<Action>(Arrays.asList(
267	CommonProjectActions.newFileAction(),	268	CommonProjectActions.newFileAction(),
268	null,	269	null,
269	ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_BUILD, nbBundle1, null), // NOI18N	270	ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_BUILD, nbBundle1, null), // NOI18N
Lines 291-317 Link Here
291	CommonProjectActions.copyProjectAction(),	292	CommonProjectActions.copyProjectAction(),
292	CommonProjectActions.deleteProjectAction(),	293	CommonProjectActions.deleteProjectAction(),
293	null,	294	null,
294	SystemAction.get(org.openide.actions.FindAction.class),	295	SystemAction.get(org.openide.actions.FindAction.class)));
295	addFromLayers(),	296	actions.addAll(NodeOp.actionsForPath("Projects/Actions"));
		297	actions.addAll(Arrays.asList(
296	null,	298	null,
297	SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),	299	SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),
298	null,	300	null,
299	brokenLinksAction,	301	brokenLinksAction,
300	CommonProjectActions.customizeProjectAction(),	302	CommonProjectActions.customizeProjectAction()));
301	};	303	return actions.toArray(new Action[actions.size()]);
302	}
303
304	private Action addFromLayers() {
305	Action action = null;
306	Lookup look = Lookups.forPath("Projects/Actions");
307	for (Object next : look.lookupAll(Object.class)) {
308	if (next instanceof Action) {
309	action = (Action) next;
310	} else if (next instanceof JSeparator) {
311	action = null;
312	}
313	}
314	return action;
315	}	304	}
316		305
317	/** This action is created only when project has broken references.	306	/** This action is created only when project has broken references.




                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.10</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.extexecution</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                        <specification-version>1.23</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.extexecution</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>                
                <dependency>
                    <code-name-base>org.netbeans.modules.queries</code-name-base>
                    <build-prerequisite/>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




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;

import org.openide.filesystems.FileObject;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Node;
import org.openide.nodes.NodeOp;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
import org.openide.util.actions.SystemAction;

            actions.add(null);

            // honor 57874 contact
            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<Action> 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);
                }
            }
        }

    }

Lines 277-283 Link Here

(-)a/j2ee.archive/nbproject/project.xml (-1 / +1 lines)
277	<build-prerequisite/>	277	<build-prerequisite/>
278	<compile-dependency/>	278	<compile-dependency/>
279	<run-dependency>	279	<run-dependency>
280	<specification-version>6.7.1</specification-version>	280	<specification-version>7.6</specification-version>
281	</run-dependency>	281	</run-dependency>
282	</dependency>	282	</dependency>
283	<dependency>	283	<dependency>





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;

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;

        actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
        
        // honor 57874 contact
        actions.add(null);
        actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
        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);
//        if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {

Lines 349-355 Link Here

(-)a/j2ee.clientproject/nbproject/project.xml (-1 / +1 lines)
349	<build-prerequisite/>	349	<build-prerequisite/>
350	<compile-dependency/>	350	<compile-dependency/>
351	<run-dependency>	351	<run-dependency>
352	<specification-version>6.5</specification-version>	352	<specification-version>7.6</specification-version>
353	</run-dependency>	353	</run-dependency>
354	</dependency>	354	</dependency>
355	<dependency>	355	<dependency>




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;

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;

            actions.add(SystemAction.get(FindAction.class));
            
            // honor 57874 contact
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("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);
            if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {

Lines 329-335 Link Here

(-)a/j2ee.earproject/nbproject/project.xml (-1 / +1 lines)
329	<build-prerequisite/>	329	<build-prerequisite/>
330	<compile-dependency/>	330	<compile-dependency/>
331	<run-dependency>	331	<run-dependency>
332	<specification-version>6.2</specification-version>	332	<specification-version>7.6</specification-version>
333	</run-dependency>	333	</run-dependency>
334	</dependency>	334	</dependency>
335	<dependency>	335	<dependency>




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;

            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
            actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
                
            actions.add(null);
            actions.add(CommonProjectActions.setAsMainProjectAction());

            actions.add(null);
            actions.add(SystemAction.get( FindAction.class ));
            
            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<Action> 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.

Lines 413-419 Link Here

(-)a/j2ee.ejbjarproject/nbproject/project.xml (-1 / +1 lines)
413	<build-prerequisite/>	413	<build-prerequisite/>
414	<compile-dependency/>	414	<compile-dependency/>
415	<run-dependency>	415	<run-dependency>
416	<specification-version>6.2</specification-version>	416	<specification-version>7.6</specification-version>
417	</run-dependency>	417	</run-dependency>
418	</dependency>	418	</dependency>
419	<dependency>	419	<dependency>




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;

            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
            actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
            actions.add(null);
            actions.add(CommonProjectActions.setAsMainProjectAction());
            actions.add(CommonProjectActions.openSubprojectsAction());

            
            // honor 57874 contract
            
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
            
            actions.add(null);
            

            return actions.toArray(new javax.swing.Action[actions.size()]);
        }
        
        private void addFromLayers(List<Action> 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.
         */

Lines 278-284 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
278	<build-prerequisite/>	278	<build-prerequisite/>
279	<compile-dependency/>	279	<compile-dependency/>
280	<run-dependency>	280	<run-dependency>
281	<specification-version>6.5</specification-version>	281	<specification-version>7.6</specification-version>
282	</run-dependency>	282	</run-dependency>
283	</dependency>	283	</dependency>
284	<dependency>	284	<dependency>




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;

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;

            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
            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);

            actions.add(SystemAction.get(FindAction.class));
            
            // honor 57874 contact
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
            
            actions.add(null);
            if (broken) {

            
            return actions.toArray(new Action[actions.size()]);
            
        }
        
        private void addFromLayers(List<Action> 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) {

Lines 39-45 Link Here

(-)a/mobility.project/nbproject/project.xml (-2 / +3 lines)
39	However, if you add GPL Version 2 code and therefore, elected the GPL	39	However, if you add GPL Version 2 code and therefore, elected the GPL
40	Version 2 license, then the option applies only if the new code is	40	Version 2 license, then the option applies only if the new code is
41	made subject to such option by the copyright holder.	41	made subject to such option by the copyright holder.
42	--><project xmlns="http://www.netbeans.org/ns/project/1">	42	-->
		43	<project xmlns="http://www.netbeans.org/ns/project/1">
43	<type>org.netbeans.modules.apisupport.project</type>	44	<type>org.netbeans.modules.apisupport.project</type>
44	<configuration>	45	<configuration>
45	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">	46	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
Lines 322-328 Link Here
322	<build-prerequisite/>	323	<build-prerequisite/>
323	<compile-dependency/>	324	<compile-dependency/>
324	<run-dependency>	325	<run-dependency>
325	<specification-version>6.2</specification-version>	326	<specification-version>7.6</specification-version>
326	</run-dependency>	327	</run-dependency>
327	</dependency>	328	</dependency>
328	<dependency>	329	<dependency>




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;

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;

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;

                act.add(new RefreshPackagesAction());
                act.add(null);
                // honor 57874 contact
                act.add(null);
                act.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
                    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<Object> query = new Lookup.Template<Object>(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.add(CommonProjectActions.customizeProjectAction());
                actions = act.toArray(new Action[act.size()]);




<apidef name="nodes">Nodes API</apidef>
</apidefs>
<changes>
    <change id="NodeOp.actionsForPath">
        <api name="nodes"/>
        <summary>Added <code>NodeOp.actionsForPath</code></summary>
        <version major="7" minor="6"/>
        <date day="11" month="6" year="2008"/>
        <author login="jglick"/>
        <compatibility addition="yes"/>
        <description>
            <p>
                Added utility method to construct a menu from a layer path.
            </p>
        </description>
        <class package="org.openide.nodes" name="NodeOp"/>
        <issue number="136334"/>
    </change>
    <change id="Children.getNodeAt">
        <api name="nodes"/>
        <summary>Children.getNodeAt is changing to public</summary>

Lines 44-47 Link Here

(-)a/openide.nodes/nbproject/project.properties (-1 / +1 lines)
44	javadoc.arch=${basedir}/arch.xml	44	javadoc.arch=${basedir}/arch.xml
45	javadoc.apichanges=${basedir}/apichanges.xml	45	javadoc.apichanges=${basedir}/apichanges.xml
46		46
47	spec.version.base=7.5.0	47	spec.version.base=7.6.0




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;

    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<? extends Action> actionsForPath(String path) {
        List<Action> actions = new ArrayList<Action>();
        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;
    }

}

Lines 197-203 Link Here

(-)a/php.project/nbproject/project.xml (-1 / +1 lines)
197	<build-prerequisite/>	197	<build-prerequisite/>
198	<compile-dependency/>	198	<compile-dependency/>
199	<run-dependency>	199	<run-dependency>
200	<specification-version>7.0</specification-version>	200	<specification-version>7.6</specification-version>
201	</run-dependency>	201	</run-dependency>
202	</dependency>	202	</dependency>
203	<dependency>	203	<dependency>




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;

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;

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;

            actions.add(SystemAction.get(FindAction.class));

            // honor 57874 contact
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
                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.add(CommonProjectActions.customizeProjectAction());
            return actions.toArray(new Action[actions.size()]);

Lines 187-193 Link Here

(-)a/projectui/nbproject/project.xml (-1 / +1 lines)
187	<build-prerequisite/>	187	<build-prerequisite/>
188	<compile-dependency/>	188	<compile-dependency/>
189	<run-dependency>	189	<run-dependency>
190	<specification-version>6.2</specification-version>	190	<specification-version>7.6</specification-version>
191	</run-dependency>	191	</run-dependency>
192	</dependency>	192	</dependency>
193	<dependency>	193	<dependency>




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;

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;

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;

        if (context || type == PHYSICAL_VIEW) {
            return new Action[0];
        } else {
            List<? extends Action> actions = NodeOp.actionsForPath(ACTIONS_FOLDER);
            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);
                }
            }
            return actions.toArray(new Action[actions.size()]);
        }
    }




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.api.progress</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.10.0.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.4</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gototest</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>0.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.api.progress</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.10.0.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.4</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




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;

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;

            actions.add(SystemAction.get(FindAction.class));
            
            // honor 57874 contact
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // 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);
//            if (broken) {

Lines 252-258 Link Here

(-)a/ruby.railsprojects/nbproject/project.xml (-1 / +1 lines)
252	<build-prerequisite/>	252	<build-prerequisite/>
253	<compile-dependency/>	253	<compile-dependency/>
254	<run-dependency>	254	<run-dependency>
255	<specification-version>6.9.0.1</specification-version>	255	<specification-version>7.6</specification-version>
256	</run-dependency>	256	</run-dependency>
257	</dependency>	257	</dependency>
258	<dependency>	258	<dependency>




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;

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;

            actions.add(SystemAction.get(FindAction.class));
            
            // honor 57874 contact
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // 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.add(CommonProjectActions.customizeProjectAction());




        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.sql.project</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.apache.tools.ant.module</code-name-base>
                    <build-prerequisite/>

                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                        <release-version>1</release-version>
                        <specification-version>1.13.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                    <build-prerequisite/>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.soa.libs.wsdl4j</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>

                    <run-dependency>
                        <specification-version>6.8</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                        <specification-version>3.9.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.soa.libs.wsdl4j</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <public-packages/>
        </data>
    </configuration>
</project>




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.*;

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;


				generateWSDL(actions);
				actions.add(null);
                actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
                actions.addAll(NodeOp.actionsForPath("Projects/Actions"));
                actions.add(null);
                actions.add(brokenLinksAction);
                actions.add(CommonProjectActions.customizeProjectAction());

            )};*/
        }

        private void addFromLayers(List<Action> 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<Action> actions) {
        	Object genFiles = SystemAction.findObject(GenFiles.class, true);
        	try {

Lines 135-141 Link Here

(-)a/uml.designpattern/nbproject/project.xml (-1 / +1 lines)
135	<build-prerequisite/>	135	<build-prerequisite/>
136	<compile-dependency/>	136	<compile-dependency/>
137	<run-dependency>	137	<run-dependency>
138	<specification-version>6.5.1</specification-version>	138	<specification-version>7.6</specification-version>
139	</run-dependency>	139	</run-dependency>
140	</dependency>	140	</dependency>
141	<dependency>	141	<dependency>




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;

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

       */
      protected Action[] getActionsFromRegistry(String path)
      {
          List<? extends Action> actions = NodeOp.actionsForPath(path);
          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)
          {
              
          }
          
          Action[] retVal = new Action[actions.size()];
          actions.toArray(retVal);
          return retVal;

Lines 205-211 Link Here

(-)a/uml.project/nbproject/project.xml (-1 / +1 lines)
205	<build-prerequisite/>	205	<build-prerequisite/>
206	<compile-dependency/>	206	<compile-dependency/>
207	<run-dependency>	207	<run-dependency>
208	<specification-version>6.5.1</specification-version>	208	<specification-version>7.6</specification-version>
209	</run-dependency>	209	</run-dependency>
210	</dependency>	210	</dependency>
211	<dependency>	211	<dependency>




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;


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;

     */
    protected Action[] getActionsFromRegistry(String path)
    {
        List<? extends Action> actions = NodeOp.actionsForPath(path);
        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);
                }
            }
        }
        
        Action[] retVal = new Action[actions.size()];
        actions.toArray(retVal);
        return retVal;





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;


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.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;

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;


            actions.add(null);
            actions.add(CommonProjectActions.deleteProjectAction());
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("UMLProjects/Actions")); // NOI18N
            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);
            }
            
            addContextMenus(actions);
            actions.add(null);
            




                    <run-dependency/>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsfpath.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>0.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsf</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.libs.javacapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.24</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsf</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsfpath.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>0.30</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




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;

            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

            actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
            
            actions.addAll(NodeOp.actionsForPath("Projects/Rest_Actions_holder")); //NOI18N
            actions.add(null);
            actions.add(CommonProjectActions.setAsMainProjectAction());
            actions.add(CommonProjectActions.openSubprojectsAction());

            
            // honor 57874 contact
            
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
            
            actions.add(null);
            

            return actions.toArray(new Action[actions.size()]);
        }
        
        private void addFromLayers(List<Action> 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.
         */




        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.xslt.project</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.soa.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.apache.tools.ant.module</code-name-base>
                    <build-prerequisite/>

                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.5.22</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.soa.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.soa.validation</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.catalogsupport</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.search</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.wsdl.extensions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xslt.model</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.wsdlui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xslt.model</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.6</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.4</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.xml.search</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.soa.validation</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.1</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>





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;

                actions.add(null);
                actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
                // add versioning support
                actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
//                null,
//                SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),
                actions.add(null);

            return actions.toArray(new Action[actions.size()]);
        }

        private void addFromLayers(List<Action> 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.
         */

Return to bug 136334

Lines 63-72 Link Here

(-)a/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java (-16 / +3 lines)
63	import java.util.regex.PatternSyntaxException;	63	import java.util.regex.PatternSyntaxException;
64	import javax.swing.AbstractAction;	64	import javax.swing.AbstractAction;
65	import javax.swing.Action;	65	import javax.swing.Action;
66	import javax.swing.JSeparator;
67	import org.apache.tools.ant.module.api.support.ActionUtils;	66	import org.apache.tools.ant.module.api.support.ActionUtils;
68	import org.netbeans.modules.ant.freeform.spi.support.Util;	67	import org.netbeans.modules.ant.freeform.spi.support.Util;
69	import org.netbeans.modules.ant.freeform.ui.TargetMappingPanel;
70	import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert;	68	import org.netbeans.modules.ant.freeform.ui.UnboundTargetAlert;
71	import org.netbeans.spi.project.ActionProvider;	69	import org.netbeans.spi.project.ActionProvider;
72	import org.netbeans.spi.project.support.ant.AntProjectHelper;	70	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 80-89 Link Here
80	import org.openide.filesystems.FileObject;	78	import org.openide.filesystems.FileObject;
81	import org.openide.filesystems.FileUtil;	79	import org.openide.filesystems.FileUtil;
82	import org.openide.loaders.DataObject;	80	import org.openide.loaders.DataObject;
		81	import org.openide.nodes.NodeOp;
83	import org.openide.util.Lookup;	82	import org.openide.util.Lookup;
84	import org.openide.util.NbBundle;	83	import org.openide.util.NbBundle;
85	import org.openide.util.actions.SystemAction;	84	import org.openide.util.actions.SystemAction;
86	import org.openide.util.lookup.Lookups;
87	import org.w3c.dom.Element;	85	import org.w3c.dom.Element;
88		86
89	/**	87	/**
Lines 480-486 Link Here
480	}	478	}
481	}	479	}
482	}	480	}
483	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	481	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
484	// Back to generic actions.	482	// Back to generic actions.
485	actions.add(null);	483	actions.add(null);
486	actions.add(CommonProjectActions.setAsMainProjectAction());	484	actions.add(CommonProjectActions.setAsMainProjectAction());
Lines 495-516 Link Here
495	actions.add(SystemAction.get(FindAction.class));	493	actions.add(SystemAction.get(FindAction.class));
496		494
497	// honor #57874 contract, see #58624:	495	// honor #57874 contract, see #58624:
498	addFromLayers(actions, "Projects/Actions");	496	actions.addAll(NodeOp.actionsForPath("Projects/Actions"));
499		497
500	actions.add(null);	498	actions.add(null);
501	actions.add(CommonProjectActions.customizeProjectAction());	499	actions.add(CommonProjectActions.customizeProjectAction());
502	return actions.toArray(new Action[actions.size()]);	500	return actions.toArray(new Action[actions.size()]);
503	}
504
505	private static void addFromLayers(List<Action> actions, String path) {
506	Lookup look = Lookups.forPath(path);
507	for (Object next : look.lookupAll(Object.class)) {
508	if (next instanceof Action) {
509	actions.add((Action) next);
510	} else if (next instanceof JSeparator) {
511	actions.add(null);
512	}
513	}
514	}	501	}
515		502
516	private static final class CustomAction extends AbstractAction {	503	private static final class CustomAction extends AbstractAction {

Lines 44-50 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/ModuleActions.java (-27 / +3 lines)
44	import java.awt.event.ActionEvent;	44	import java.awt.event.ActionEvent;
45	import java.io.IOException;	45	import java.io.IOException;
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.Collection;
48	import java.util.HashMap;	47	import java.util.HashMap;
49	import java.util.HashSet;	48	import java.util.HashSet;
50	import java.util.List;	49	import java.util.List;
Lines 54-60 Link Here
54	import java.util.regex.Pattern;	53	import java.util.regex.Pattern;
55	import javax.swing.AbstractAction;	54	import javax.swing.AbstractAction;
56	import javax.swing.Action;	55	import javax.swing.Action;
57	import javax.swing.JSeparator;
58	import org.apache.tools.ant.module.api.support.ActionUtils;	56	import org.apache.tools.ant.module.api.support.ActionUtils;
59	import org.netbeans.api.java.project.JavaProjectConstants;	57	import org.netbeans.api.java.project.JavaProjectConstants;
60	import org.netbeans.api.project.ProjectManager;	58	import org.netbeans.api.project.ProjectManager;
Lines 79-89 Link Here
79	import org.openide.actions.FindAction;	77	import org.openide.actions.FindAction;
80	import org.openide.filesystems.FileObject;	78	import org.openide.filesystems.FileObject;
81	import org.openide.filesystems.FileUtil;	79	import org.openide.filesystems.FileUtil;
		80	import org.openide.nodes.NodeOp;
82	import org.openide.util.Lookup;	81	import org.openide.util.Lookup;
83	import org.openide.util.Mutex;	82	import org.openide.util.Mutex;
84	import org.openide.util.NbBundle;	83	import org.openide.util.NbBundle;
85	import org.openide.util.actions.SystemAction;	84	import org.openide.util.actions.SystemAction;
86	import org.openide.util.lookup.Lookups;
87		85
88	public final class ModuleActions implements ActionProvider {	86	public final class ModuleActions implements ActionProvider {
89		87
Lines 104-110 Link Here
104	actions.add(createSimpleAction(project, new String[] {"run"}, NbBundle.getMessage(ModuleActions.class, "ACTION_run")));	102	actions.add(createSimpleAction(project, new String[] {"run"}, NbBundle.getMessage(ModuleActions.class, "ACTION_run")));
105	}	103	}
106	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, NbBundle.getMessage(ModuleActions.class, "ACTION_debug"), null));	104	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, NbBundle.getMessage(ModuleActions.class, "ACTION_debug"), null));
107	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	105	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
108	if (project.supportsUnitTests()) {	106	if (project.supportsUnitTests()) {
109	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, NbBundle.getMessage(ModuleActions.class, "ACTION_test"), null));	107	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, NbBundle.getMessage(ModuleActions.class, "ACTION_test"), null));
110	}	108	}
Lines 132-163 Link Here
132	actions.add(null);	130	actions.add(null);
133	actions.add(SystemAction.get(FindAction.class));	131	actions.add(SystemAction.get(FindAction.class));
134	// Honor #57874 contract:	132	// Honor #57874 contract:
135	Collection<? extends Object> res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N	133	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
136	if (!res.isEmpty()) {
137	actions.add(null);
138	for (Object next : res) {
139	if (next instanceof Action) {
140	actions.add((Action) next);
141	} else if (next instanceof JSeparator) {
142	actions.add(null);
143	}
144	}
145	}
146
147	actions.add(null);	134	actions.add(null);
148	actions.add(CommonProjectActions.customizeProjectAction());	135	actions.add(CommonProjectActions.customizeProjectAction());
149	return actions.toArray(new Action[actions.size()]);	136	return actions.toArray(new Action[actions.size()]);
150	}
151
152	private static void addFromLayers(List<Action> actions, String path) {
153	Lookup look = Lookups.forPath(path);
154	for (Object next : look.lookupAll(Object.class)) {
155	if (next instanceof Action) {
156	actions.add((Action) next);
157	} else if (next instanceof JSeparator) {
158	actions.add(null);
159	}
160	}
161	}	137	}
162		138
163	private final NbModuleProject project;	139	private final NbModuleProject project;

Lines 24-37 Link Here

(-)a/bpel.project/src/org/netbeans/modules/bpel/project/ui/IcanproLogicalViewProvider.java (-16 / +1 lines)
24	import java.util.ArrayList;	24	import java.util.ArrayList;
25	import java.util.Arrays;	25	import java.util.Arrays;
26	import java.util.Collections;	26	import java.util.Collections;
27	import java.util.Enumeration;
28	import java.util.List;	27	import java.util.List;
29	import java.util.ResourceBundle;	28	import java.util.ResourceBundle;
30	import java.util.StringTokenizer;	29	import java.util.StringTokenizer;
31		30
32	import javax.swing.AbstractAction;	31	import javax.swing.AbstractAction;
33	import javax.swing.Action;	32	import javax.swing.Action;
34	import javax.swing.JSeparator;
35	import org.netbeans.api.project.Sources;	33	import org.netbeans.api.project.Sources;
36	import org.netbeans.spi.project.ui.support.DefaultProjectOperations;	34	import org.netbeans.spi.project.ui.support.DefaultProjectOperations;
37		35
Lines 52-62 Link Here
52	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;	50	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
53	import org.netbeans.modules.bpel.model.api.support.Utils;	51	import org.netbeans.modules.bpel.model.api.support.Utils;
54	import org.netbeans.modules.bpel.project.IcanproConstants;	52	import org.netbeans.modules.bpel.project.IcanproConstants;
55	import org.netbeans.modules.bpel.project.ProjectConstants;
56	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;	53	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;
57	import org.openide.filesystems.FileObject;	54	import org.openide.filesystems.FileObject;
58	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
59	import org.openide.filesystems.Repository;
60		56
61	import org.openide.loaders.DataFolder;	57	import org.openide.loaders.DataFolder;
62	import org.openide.loaders.DataObject;	58	import org.openide.loaders.DataObject;
Lines 276-282 Link Here
276	actions.add(null);	272	actions.add(null);
277	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));	273	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
278	// add versioning support	274	// add versioning support
279	addFromLayers(actions, "Projects/Actions"); //NOI18N	275	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
280	// null,	276	// null,
281	// SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),	277	// SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),
282	actions.add(null);	278	actions.add(null);
Lines 286-302 Link Here
286	return actions.toArray(new Action[actions.size()]);	282	return actions.toArray(new Action[actions.size()]);
287	}	283	}
288		284
289	private void addFromLayers(List<Action> actions, String path) {
290	Lookup look = Lookups.forPath(path);
291	for (Object next : look.lookupAll(Object.class)) {
292	if (next instanceof Action) {
293	actions.add((Action) next);
294	} else if (next instanceof JSeparator) {
295	actions.add(null);
296	}
297	}
298	}
299
300	/** This action is created only when project has broken references.	285	/** This action is created only when project has broken references.
301	* Once these are resolved the action is disabled.	286	* Once these are resolved the action is disabled.
302	*/	287	*/

Lines 67-73 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/MakeLogicalViewProvider.java (-14 / +3 lines)
67	import java.util.logging.Logger;	67	import java.util.logging.Logger;
68	import javax.swing.AbstractAction;	68	import javax.swing.AbstractAction;
69	import javax.swing.Action;	69	import javax.swing.Action;
70	import javax.swing.JSeparator;
71	import javax.swing.SwingUtilities;	70	import javax.swing.SwingUtilities;
72	import javax.swing.event.ChangeEvent;	71	import javax.swing.event.ChangeEvent;
73	import javax.swing.event.ChangeListener;	72	import javax.swing.event.ChangeListener;
Lines 115-120 Link Here
115	import org.openide.nodes.Children;	114	import org.openide.nodes.Children;
116	import org.openide.nodes.FilterNode;	115	import org.openide.nodes.FilterNode;
117	import org.openide.nodes.Node;	116	import org.openide.nodes.Node;
		117	import org.openide.nodes.NodeOp;
118	import org.openide.util.Lookup;	118	import org.openide.util.Lookup;
119	import org.openide.util.Lookup.Template;	119	import org.openide.util.Lookup.Template;
120	import org.openide.util.LookupEvent;	120	import org.openide.util.LookupEvent;
Lines 538-564 Link Here
538	actions.add(standardActions[i]);	538	actions.add(standardActions[i]);
539	actions.add(null);	539	actions.add(null);
540	//actions.add(new CodeAssistanceAction());	540	//actions.add(new CodeAssistanceAction());
541	addActionsFromLayers(actions, "NativeProjects/Menu"); // NOI18N	541	actions.addAll(NodeOp.actionsForPath("NativeProjects/Menu")); // NOI18N
542	actions.add(null);	542	actions.add(null);
543	actions.add(SystemAction.get(org.openide.actions.FindAction.class ));	543	actions.add(SystemAction.get(org.openide.actions.FindAction.class ));
544	addActionsFromLayers(actions, "Projects/Actions"); // NOI18N	544	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
545	// Add remaining actions	545	// Add remaining actions
546	actions.add(null);	546	actions.add(null);
547	//actions.add(SystemAction.get(ToolsAction.class));	547	//actions.add(SystemAction.get(ToolsAction.class));
548	//actions.add(null);	548	//actions.add(null);
549	actions.add(CommonProjectActions.customizeProjectAction());	549	actions.add(CommonProjectActions.customizeProjectAction());
550	return (Action[])actions.toArray(new Action[actions.size()]);	550	return (Action[])actions.toArray(new Action[actions.size()]);
551	}
552
553	private void addActionsFromLayers(final Vector actions, String path) {
554	Lookup look = Lookups.forPath(path);
555	for (Object next : look.lookupAll(Object.class)) {
556	if (next instanceof Action) {
557	actions.add((Action) next);
558	} else if (next instanceof JSeparator) {
559	actions.add(null);
560	}
561	}
562	}	551	}
563		552
564	public boolean canRename() {	553	public boolean canRename() {

Lines 45-51 Link Here

(-)a/compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/JbiLogicalViewProvider.java (-13 / +1 lines)
45	import org.netbeans.api.project.FileOwnerQuery;	45	import org.netbeans.api.project.FileOwnerQuery;
46	import org.netbeans.modules.compapp.projects.jbi.JbiProject;	46	import org.netbeans.modules.compapp.projects.jbi.JbiProject;
47	import org.netbeans.modules.compapp.projects.jbi.ui.actions.AddProjectAction;	47	import org.netbeans.modules.compapp.projects.jbi.ui.actions.AddProjectAction;
48	import org.netbeans.modules.compapp.projects.jbi.ui.actions.OpenEditorAction;
49	import org.netbeans.modules.compapp.projects.jbi.ui.customizer.JbiProjectProperties;	48	import org.netbeans.modules.compapp.projects.jbi.ui.customizer.JbiProjectProperties;
50	import org.netbeans.modules.compapp.test.ui.TestNode;	49	import org.netbeans.modules.compapp.test.ui.TestNode;
51		50
Lines 549-555 Link Here
549	actions.add(SystemAction.get(FindAction.class));	548	actions.add(SystemAction.get(FindAction.class));
550		549
551	// honor 57874 contact	550	// honor 57874 contact
552	addFromLayers(actions, "Projects/Actions"); // NOI18N	551	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
553		552
554	if (broken) {	553	if (broken) {
555	actions.add(brokenLinksAction);	554	actions.add(brokenLinksAction);
Lines 559-575 Link Here
559	actions.add(CommonProjectActions.customizeProjectAction());	558	actions.add(CommonProjectActions.customizeProjectAction());
560		559
561	return actions.toArray(new Action[actions.size()]);	560	return actions.toArray(new Action[actions.size()]);
562	}
563
564	private void addFromLayers(List<Action> actions, String path) {
565	Lookup look = Lookups.forPath(path);
566	for (Object next : look.lookupAll(Object.class)) {
567	if (next instanceof Action) {
568	actions.add((Action) next);
569	} else if (next instanceof JSeparator) {
570	actions.add(null);
571	}
572	}
573	}	561	}
574		562
575	/**	563	/**

Lines 41-51 Link Here

(-)a/etl.editor/src/org/netbeans/modules/etl/ui/ETLEditorViewMultiViewElement.java (-23 / +2 lines)
41		41
42	import java.awt.BorderLayout;	42	import java.awt.BorderLayout;
43	import java.awt.Color;	43	import java.awt.Color;
44	import java.awt.dnd.DropTarget;
45	import java.awt.dnd.DropTargetDragEvent;
46	import java.awt.dnd.DropTargetDropEvent;
47	import java.awt.dnd.DropTargetEvent;
48	import java.awt.dnd.DropTargetListener;
49	import java.beans.PropertyChangeEvent;	44	import java.beans.PropertyChangeEvent;
50	import java.beans.PropertyChangeListener;	45	import java.beans.PropertyChangeListener;
51	import java.io.Externalizable;	46	import java.io.Externalizable;
Lines 56-62 Link Here
56	import java.util.Arrays;	51	import java.util.Arrays;
57		52
58	import javax.swing.Action;	53	import javax.swing.Action;
59	import javax.swing.JSeparator;
60	import javax.swing.UIManager;	54	import javax.swing.UIManager;
61	import javax.swing.event.ChangeListener;	55	import javax.swing.event.ChangeListener;
62	import javax.swing.text.Document;	56	import javax.swing.text.Document;
Lines 73-88 Link Here
73	import org.netbeans.modules.etl.ui.palette.PaletteSupport;	67	import org.netbeans.modules.etl.ui.palette.PaletteSupport;
74	import org.netbeans.modules.sql.framework.model.utils.SQLObjectUtil;	68	import org.netbeans.modules.sql.framework.model.utils.SQLObjectUtil;
75	import org.netbeans.modules.etl.ui.view.ETLCollaborationTopPanel;	69	import org.netbeans.modules.etl.ui.view.ETLCollaborationTopPanel;
76	import org.netbeans.modules.sql.framework.ui.graph.impl.GraphView;
77	import org.netbeans.spi.palette.PaletteController;	70	import org.netbeans.spi.palette.PaletteController;
78	import org.openide.DialogDisplayer;
79	import org.openide.ErrorManager;	71	import org.openide.ErrorManager;
80	import org.openide.NotifyDescriptor;
81	import org.openide.awt.StatusDisplayer;	72	import org.openide.awt.StatusDisplayer;
82	import org.openide.awt.UndoRedo;	73	import org.openide.awt.UndoRedo;
83	import org.openide.cookies.SaveCookie;	74	import org.openide.cookies.SaveCookie;
84	import org.openide.nodes.Node;	75	import org.openide.nodes.Node;
85	import org.openide.text.ActiveEditorDrop;	76	import org.openide.nodes.NodeOp;
86	import org.openide.util.Lookup;	77	import org.openide.util.Lookup;
87	import org.openide.util.lookup.AbstractLookup;	78	import org.openide.util.lookup.AbstractLookup;
88	import org.openide.util.lookup.InstanceContent;	79	import org.openide.util.lookup.InstanceContent;
Lines 432-453 Link Here
432	for (Action action : super.getActions()) {	423	for (Action action : super.getActions()) {
433	actionsList.add(action);	424	actionsList.add(action);
434	}	425	}
435	actionsList.add(addFromLayers());	426	actionsList.addAll(NodeOp.actionsForPath("Projects/Actions"));
436	Action[] actions = new Action[actionsList.size()];	427	Action[] actions = new Action[actionsList.size()];
437	actionsList.toArray(actions);	428	actionsList.toArray(actions);
438	return actions;	429	return actions;
439	}	430	}
440		431
441	private Action addFromLayers() {
442	Action action = null;
443	Lookup look = Lookups.forPath("Projects/Actions");
444	for (Object next : look.lookupAll(Object.class)) {
445	if (next instanceof Action) {
446	action = (Action) next;
447	} else if (next instanceof JSeparator) {
448	action = null;
449	}
450	}
451	return action;
452	}
453	}	432	}

Lines 39-44 Link Here

(-)a/groovy.grailsproject/nbproject/project.xml (-10 / +10 lines)
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>1</release-version>
41	<specification-version>1.10</specification-version>	41	<specification-version>1.10</specification-version>
		42	</run-dependency>
		43	</dependency>
		44	<dependency>
		45	<code-name-base>org.netbeans.modules.extexecution</code-name-base>
		46	<build-prerequisite/>
		47	<compile-dependency/>
		48	<run-dependency>
		49	<release-version>0-1</release-version>
		50	<specification-version>1.1</specification-version>
42	</run-dependency>	51	</run-dependency>
43	</dependency>	52	</dependency>
44	<dependency>	53	<dependency>
Lines 93-107 Link Here
93	<specification-version>1.23</specification-version>	102	<specification-version>1.23</specification-version>
94	</run-dependency>	103	</run-dependency>
95	</dependency>	104	</dependency>
96	<dependency>
97	<code-name-base>org.netbeans.modules.extexecution</code-name-base>
98	<build-prerequisite/>
99	<compile-dependency/>
100	<run-dependency>
101	<release-version>0-1</release-version>
102	<specification-version>1.1</specification-version>
103	</run-dependency>
104	</dependency>
105	<dependency>	105	<dependency>
106	<code-name-base>org.netbeans.modules.queries</code-name-base>	106	<code-name-base>org.netbeans.modules.queries</code-name-base>
107	<build-prerequisite/>	107	<build-prerequisite/>
Lines 172-178 Link Here
172	<build-prerequisite/>	172	<build-prerequisite/>
173	<compile-dependency/>	173	<compile-dependency/>
174	<run-dependency>	174	<run-dependency>
175	<specification-version>7.0</specification-version>	175	<specification-version>7.6</specification-version>
176	</run-dependency>	176	</run-dependency>
177	</dependency>	177	</dependency>
178	<dependency>	178	<dependency>

Lines 46-52 Link Here

(-)a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/GrailsLogicalViewProvider.java (-14 / +2 lines)
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.List;	47	import java.util.List;
48	import javax.swing.Action;	48	import javax.swing.Action;
49	import javax.swing.JSeparator;
50	import org.netbeans.api.project.FileOwnerQuery;	49	import org.netbeans.api.project.FileOwnerQuery;
51	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
52	import org.netbeans.modules.groovy.grailsproject.GrailsActionProvider;	51	import org.netbeans.modules.groovy.grailsproject.GrailsActionProvider;
Lines 61-67 Link Here
61	import org.openide.filesystems.FileObject;	60	import org.openide.filesystems.FileObject;
62	import org.openide.nodes.AbstractNode;	61	import org.openide.nodes.AbstractNode;
63	import org.openide.nodes.Node;	62	import org.openide.nodes.Node;
64	import org.openide.util.Lookup;	63	import org.openide.nodes.NodeOp;
65	import org.openide.util.NbBundle;	64	import org.openide.util.NbBundle;
66	import org.openide.util.Utilities;	65	import org.openide.util.Utilities;
67	import org.openide.util.actions.SystemAction;	66	import org.openide.util.actions.SystemAction;
Lines 147-170 Link Here
147	actions.add(null);	146	actions.add(null);
148		147
149	// honor 57874 contact	148	// honor 57874 contact
150	addFromLayers(actions, "Projects/Actions"); //NOI18N	149	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
151		150
152	actions.add(null);	151	actions.add(null);
153	actions.add(CommonProjectActions.customizeProjectAction());	152	actions.add(CommonProjectActions.customizeProjectAction());
154		153
155	return actions.toArray(new Action[actions.size()]);	154	return actions.toArray(new Action[actions.size()]);
156		155
157	}
158
159	private void addFromLayers(List<Action> actions, String path) {
160	Lookup look = Lookups.forPath(path);
161	for (Object next : look.lookupAll(Object.class)) {
162	if (next instanceof Action) {
163	actions.add((Action) next);
164	} else if (next instanceof JSeparator) {
165	actions.add(null);
166	}
167	}
168	}	156	}
169		157
170	}	158	}

Lines 44-54 Link Here

(-)a/j2ee.archive/src/org/netbeans/modules/j2ee/archive/ui/RootNode.java (-18 / +3 lines)
44		44
45	import java.util.ArrayList;	45	import java.util.ArrayList;
46	import java.util.Collections;	46	import java.util.Collections;
47	import java.util.Iterator;
48	import java.util.List;	47	import java.util.List;
49	import java.util.ResourceBundle;	48	import java.util.ResourceBundle;
50	import javax.swing.Action;	49	import javax.swing.Action;
51	import javax.swing.JSeparator;
52	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
53	import org.netbeans.api.project.ProjectUtils;	51	import org.netbeans.api.project.ProjectUtils;
54	import org.netbeans.modules.j2ee.archive.project.ArchiveProject;	52	import org.netbeans.modules.j2ee.archive.project.ArchiveProject;
Lines 63-68 Link Here
63	import org.openide.nodes.Children;	61	import org.openide.nodes.Children;
64	import org.openide.nodes.Node;	62	import org.openide.nodes.Node;
65	//import org.openide.util.HelpCtx;	63	//import org.openide.util.HelpCtx;
		64	import org.openide.nodes.NodeOp;
66	import org.openide.util.Lookup;	65	import org.openide.util.Lookup;
67	import org.openide.util.NbBundle;	66	import org.openide.util.NbBundle;
68	import org.openide.util.actions.SystemAction;	67	import org.openide.util.actions.SystemAction;
Lines 128-149 Link Here
128	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));	127	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
129		128
130	// honor 57874 contact	129	// honor 57874 contact
131		130	actions.add(null);
132		131	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
133	Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N
134	Lookup.Template query = new Lookup.Template(Object.class);
135	Iterator it = lookup.lookup(query).allInstances().iterator();
136	if (it.hasNext()) {
137	actions.add(null);
138	}
139	while (it.hasNext()) {
140	Object next = it.next();
141	if (next instanceof Action) {
142	actions.add(next);
143	} else if (next instanceof JSeparator) {
144	actions.add(null);
145	}
146	}
147		132
148	// actions.add(null);	133	// actions.add(null);
149	// if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {	134	// if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {

Lines 53-66 Link Here

(-)a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java (-18 / +3 lines)
53	import java.util.ArrayList;	53	import java.util.ArrayList;
54	import java.util.Collection;	54	import java.util.Collection;
55	import java.util.Collections;	55	import java.util.Collections;
56	import java.util.Iterator;
57	import java.util.List;	56	import java.util.List;
58	import java.util.ResourceBundle;	57	import java.util.ResourceBundle;
59	import java.util.logging.Level;	58	import java.util.logging.Level;
60	import java.util.logging.Logger;	59	import java.util.logging.Logger;
61	import javax.swing.AbstractAction;	60	import javax.swing.AbstractAction;
62	import javax.swing.Action;	61	import javax.swing.Action;
63	import javax.swing.JSeparator;
64	import javax.swing.SwingUtilities;	62	import javax.swing.SwingUtilities;
65	import javax.swing.event.ChangeEvent;	63	import javax.swing.event.ChangeEvent;
66	import javax.swing.event.ChangeListener;	64	import javax.swing.event.ChangeListener;
Lines 120-127 Link Here
120	import org.openide.nodes.Children;	118	import org.openide.nodes.Children;
121	import org.openide.nodes.FilterNode;	119	import org.openide.nodes.FilterNode;
122	import org.openide.nodes.Node;	120	import org.openide.nodes.Node;
		121	import org.openide.nodes.NodeOp;
123	import org.openide.util.Exceptions;	122	import org.openide.util.Exceptions;
124	import org.openide.util.Lookup;
125	import org.openide.util.NbBundle;	123	import org.openide.util.NbBundle;
126	import org.openide.util.RequestProcessor;	124	import org.openide.util.RequestProcessor;
127	import org.openide.util.Utilities;	125	import org.openide.util.Utilities;
Lines 384-404 Link Here
384	actions.add(SystemAction.get(FindAction.class));	382	actions.add(SystemAction.get(FindAction.class));
385		383
386	// honor 57874 contact	384	// honor 57874 contact
387		385	actions.add(null);
388	Lookup lookup = Lookups.forPath("Projects/Actions"); // NOI18N	386	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
389	Lookup.Template query = new Lookup.Template(Object.class);
390	Iterator it = lookup.lookup(query).allInstances().iterator();
391	if (it.hasNext()) {
392	actions.add(null);
393	}
394	while (it.hasNext()) {
395	Object next = it.next();
396	if (next instanceof Action) {
397	actions.add((Action) next);
398	} else if (next instanceof JSeparator) {
399	actions.add(null);
400	}
401	}
402		387
403	actions.add(null);	388	actions.add(null);
404	if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {	389	if (brokenLinksAction != null && brokenLinksAction.isEnabled()) {

Lines 56-62 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java (-14 / +2 lines)
56	import java.util.logging.Logger;	56	import java.util.logging.Logger;
57	import javax.swing.AbstractAction;	57	import javax.swing.AbstractAction;
58	import javax.swing.Action;	58	import javax.swing.Action;
59	import javax.swing.JSeparator;
60	import org.netbeans.api.java.platform.JavaPlatformManager;	59	import org.netbeans.api.java.platform.JavaPlatformManager;
61	import org.netbeans.api.project.FileOwnerQuery;	60	import org.netbeans.api.project.FileOwnerQuery;
62	import org.netbeans.api.project.Project;	61	import org.netbeans.api.project.Project;
Lines 323-329 Link Here
323	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N	322	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
324	actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_DeployAction_Name" ), null));	323	actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_DeployAction_Name" ), null));
325	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N	324	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
326	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	325	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
327		326
328	actions.add(null);	327	actions.add(null);
329	actions.add(CommonProjectActions.setAsMainProjectAction());	328	actions.add(CommonProjectActions.setAsMainProjectAction());
Lines 337-343 Link Here
337	actions.add(null);	336	actions.add(null);
338	actions.add(SystemAction.get( FindAction.class ));	337	actions.add(SystemAction.get( FindAction.class ));
339		338
340	addFromLayers(actions, "Projects/Actions"); //NOI18N	339	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
341		340
342	actions.add(null);	341	actions.add(null);
343		342
Lines 350-366 Link Here
350	actions.add(CommonProjectActions.customizeProjectAction());	349	actions.add(CommonProjectActions.customizeProjectAction());
351	return actions.toArray(new Action[actions.size()]);	350	return actions.toArray(new Action[actions.size()]);
352	}	351	}
353
354	private void addFromLayers(List<Action> actions, String path) {
355	Lookup look = Lookups.forPath(path);
356	for (Object next : look.lookupAll(Object.class)) {
357	if (next instanceof Action) {
358	actions.add((Action) next);
359	} else if (next instanceof JSeparator) {
360	actions.add(null);
361	}
362	}
363	}
364		352
365	/** This action is created only when project has broken references.	353	/** This action is created only when project has broken references.
366	* Once these are resolved the action is disabled.	354	* Once these are resolved the action is disabled.

Lines 54-60 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java (-14 / +2 lines)
54	import java.util.logging.Logger;	54	import java.util.logging.Logger;
55	import javax.swing.AbstractAction;	55	import javax.swing.AbstractAction;
56	import javax.swing.Action;	56	import javax.swing.Action;
57	import javax.swing.JSeparator;
58	import javax.swing.event.ChangeEvent;	57	import javax.swing.event.ChangeEvent;
59	import javax.swing.event.ChangeListener;	58	import javax.swing.event.ChangeListener;
60	import org.netbeans.api.java.platform.JavaPlatformManager;	59	import org.netbeans.api.java.platform.JavaPlatformManager;
Lines 322-328 Link Here
322	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N	321	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
323	actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N	322	actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
324	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N	323	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
325	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	324	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
326	actions.add(null);	325	actions.add(null);
327	actions.add(CommonProjectActions.setAsMainProjectAction());	326	actions.add(CommonProjectActions.setAsMainProjectAction());
328	actions.add(CommonProjectActions.openSubprojectsAction());	327	actions.add(CommonProjectActions.openSubprojectsAction());
Lines 337-343 Link Here
337		336
338	// honor 57874 contract	337	// honor 57874 contract
339		338
340	addFromLayers(actions, "Projects/Actions"); //NOI18N	339	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
341		340
342	actions.add(null);	341	actions.add(null);
343		342
Lines 352-368 Link Here
352	return actions.toArray(new javax.swing.Action[actions.size()]);	351	return actions.toArray(new javax.swing.Action[actions.size()]);
353	}	352	}
354		353
355	private void addFromLayers(List<Action> actions, String path) {
356	Lookup look = Lookups.forPath(path);
357	for (Object next : look.lookupAll(Object.class)) {
358	if (next instanceof Action) {
359	actions.add((Action) next);
360	} else if (next instanceof JSeparator) {
361	actions.add(null);
362	}
363	}
364	}
365
366	/** This action is created only when project has broken references.	354	/** This action is created only when project has broken references.
367	* Once these are resolved the action is disabled.	355	* Once these are resolved the action is disabled.
368	*/	356	*/

Lines 52-58 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java (-16 / +4 lines)
52	import java.util.ResourceBundle;	52	import java.util.ResourceBundle;
53	import javax.swing.AbstractAction;	53	import javax.swing.AbstractAction;
54	import javax.swing.Action;	54	import javax.swing.Action;
55	import javax.swing.JSeparator;
56	import javax.swing.event.ChangeEvent;	55	import javax.swing.event.ChangeEvent;
57	import javax.swing.event.ChangeListener;	56	import javax.swing.event.ChangeListener;
58	import org.netbeans.api.java.platform.JavaPlatform;	57	import org.netbeans.api.java.platform.JavaPlatform;
Lines 84-92 Link Here
84	import org.openide.modules.SpecificationVersion;	83	import org.openide.modules.SpecificationVersion;
85	import org.openide.nodes.AbstractNode;	84	import org.openide.nodes.AbstractNode;
86	import org.openide.nodes.Node;	85	import org.openide.nodes.Node;
		86	import org.openide.nodes.NodeOp;
87	import org.openide.util.ChangeSupport;	87	import org.openide.util.ChangeSupport;
88	import org.openide.util.HelpCtx;	88	import org.openide.util.HelpCtx;
89	import org.openide.util.Lookup;
90	import org.openide.util.NbBundle;	89	import org.openide.util.NbBundle;
91	import org.openide.util.RequestProcessor;	90	import org.openide.util.RequestProcessor;
92	import org.openide.util.Utilities;	91	import org.openide.util.Utilities;
Lines 325-332 Link Here
325	actions.add(ProjectSensitiveActions.projectCommandAction(JavaProjectConstants.COMMAND_JAVADOC, bundle.getString("LBL_JavadocAction_Name"), null)); // NOI18N	324	actions.add(ProjectSensitiveActions.projectCommandAction(JavaProjectConstants.COMMAND_JAVADOC, bundle.getString("LBL_JavadocAction_Name"), null)); // NOI18N
326	actions.add(null);	325	actions.add(null);
327	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N	326	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N
328	addFromLayers(actions, "Projects/Debugger_Actions_temporary"); //NOI18N	327	actions.addAll(NodeOp.actionsForPath("Projects/Debugger_Actions_temporary")); //NOI18N
329	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	328	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
330	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N	329	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N
331	actions.add(CommonProjectActions.setProjectConfigurationAction());	330	actions.add(CommonProjectActions.setProjectConfigurationAction());
332	actions.add(null);	331	actions.add(null);
Lines 342-348 Link Here
342	actions.add(SystemAction.get(FindAction.class));	341	actions.add(SystemAction.get(FindAction.class));
343		342
344	// honor 57874 contact	343	// honor 57874 contact
345	addFromLayers(actions, "Projects/Actions"); //NOI18N	344	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
346		345
347	actions.add(null);	346	actions.add(null);
348	if (broken) {	347	if (broken) {
Lines 352-368 Link Here
352		351
353	return actions.toArray(new Action[actions.size()]);	352	return actions.toArray(new Action[actions.size()]);
354		353
355	}
356
357	private void addFromLayers(List<Action> actions, String path) {
358	Lookup look = Lookups.forPath(path);
359	for (Object next : look.lookupAll(Object.class)) {
360	if (next instanceof Action) {
361	actions.add((Action) next);
362	} else if (next instanceof JSeparator) {
363	actions.add(null);
364	}
365	}
366	}	354	}
367		355
368	private void setBroken(boolean broken) {	356	private void setBroken(boolean broken) {

Lines 43-49 Link Here

(-)a/mobility.project/src/org/netbeans/modules/mobility/project/ui/J2MEPhysicalViewProvider.java (-36 / +3 lines)
43	import java.io.CharConversionException;	43	import java.io.CharConversionException;
44	import java.beans.PropertyChangeListener;	44	import java.beans.PropertyChangeListener;
45	import java.beans.PropertyChangeEvent;	45	import java.beans.PropertyChangeEvent;
46	import java.util.Iterator;
47	import org.netbeans.api.project.*;	46	import org.netbeans.api.project.*;
48	import org.netbeans.api.project.libraries.LibraryManager;	47	import org.netbeans.api.project.libraries.LibraryManager;
49	import org.netbeans.spi.project.ProjectConfiguration;	48	import org.netbeans.spi.project.ProjectConfiguration;
Lines 66-82 Link Here
66	import org.openide.ErrorManager;	65	import org.openide.ErrorManager;
67	import org.openide.actions.FindAction;	66	import org.openide.actions.FindAction;
68	import org.openide.filesystems.FileObject;	67	import org.openide.filesystems.FileObject;
69	import org.openide.filesystems.FileSystem;
70	import org.openide.filesystems.Repository;
71	import org.openide.loaders.DataFolder;
72	import org.openide.loaders.DataObject;
73	import org.openide.loaders.DataObjectNotFoundException;
74	import org.openide.loaders.FolderLookup;
75	import org.openide.nodes.AbstractNode;	68	import org.openide.nodes.AbstractNode;
76	import org.openide.nodes.Children;	69	import org.openide.nodes.Children;
77	import org.openide.nodes.Node;	70	import org.openide.nodes.Node;
78	import org.openide.util.HelpCtx;	71	import org.openide.util.HelpCtx;
79	import org.openide.util.Lookup;
80	import org.openide.util.NbBundle;	72	import org.openide.util.NbBundle;
81	import org.openide.util.RequestProcessor;	73	import org.openide.util.RequestProcessor;
82	import org.openide.util.RequestProcessor.Task;	74	import org.openide.util.RequestProcessor.Task;
Lines 92-97 Link Here
92	import java.util.Enumeration;	84	import java.util.Enumeration;
93	import java.util.HashMap;	85	import java.util.HashMap;
94	import java.util.ResourceBundle;	86	import java.util.ResourceBundle;
		87	import org.openide.nodes.NodeOp;
95	import org.openide.util.WeakListeners;	88	import org.openide.util.WeakListeners;
96	import org.openide.util.lookup.Lookups;	89	import org.openide.util.lookup.Lookups;
97	import org.openide.xml.XMLUtil;	90	import org.openide.xml.XMLUtil;
Lines 404-437 Link Here
404	act.add(new RefreshPackagesAction());	397	act.add(new RefreshPackagesAction());
405	act.add(null);	398	act.add(null);
406	// honor 57874 contact	399	// honor 57874 contact
407		400	act.add(null);
408	try {	401	act.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
409	final Repository repository = Repository.getDefault();
410	final FileSystem sfs = repository.getDefaultFileSystem();
411	final FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N
412	if (fo != null) {
413	final DataObject dobj = DataObject.find(fo);
414	final FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
415	final Lookup.Template<Object> query = new Lookup.Template<Object>(Object.class);
416	final Lookup lookup = actionRegistry.getLookup();
417	final Iterator it = lookup.lookup(query).allInstances().iterator();
418	if (it.hasNext()) {
419	act.add(null);
420	}
421	while (it.hasNext()) {
422	final Object next = it.next();
423	if (next instanceof Action) {
424	act.add((Action)next);
425	} else if (next instanceof JSeparator) {
426	act.add(null);
427	}
428	}
429	}
430	} catch (DataObjectNotFoundException ex) {
431	// data folder for exitinf fileobject expected
432	ErrorManager.getDefault().notify(ex);
433	}
434
435	act.add(null);	402	act.add(null);
436	act.add(CommonProjectActions.customizeProjectAction());	403	act.add(CommonProjectActions.customizeProjectAction());
437	actions = act.toArray(new Action[act.size()]);	404	actions = act.toArray(new Action[act.size()]);

Lines 46-51 Link Here

(-)a/openide.nodes/apichanges.xml (+15 lines)
46	<apidef name="nodes">Nodes API</apidef>	46	<apidef name="nodes">Nodes API</apidef>
47	</apidefs>	47	</apidefs>
48	<changes>	48	<changes>
		49	<change id="NodeOp.actionsForPath">
		50	<api name="nodes"/>
		51	<summary>Added <code>NodeOp.actionsForPath</code></summary>
		52	<version major="7" minor="6"/>
		53	<date day="11" month="6" year="2008"/>
		54	<author login="jglick"/>
		55	<compatibility addition="yes"/>
		56	<description>
		57	<p>
		58	Added utility method to construct a menu from a layer path.
		59	</p>
		60	</description>
		61	<class package="org.openide.nodes" name="NodeOp"/>
		62	<issue number="136334"/>
		63	</change>
49	<change id="Children.getNodeAt">	64	<change id="Children.getNodeAt">
50	<api name="nodes"/>	65	<api name="nodes"/>
51	<summary>Children.getNodeAt is changing to public</summary>	66	<summary>Children.getNodeAt is changing to public</summary>

Lines 54-59 Link Here

(-)a/openide.nodes/src/org/openide/nodes/NodeOp.java (+25 lines)
54	import javax.swing.Action;	54	import javax.swing.Action;
55	import javax.swing.ActionMap;	55	import javax.swing.ActionMap;
56	import javax.swing.JPopupMenu;	56	import javax.swing.JPopupMenu;
		57	import javax.swing.JSeparator;
57	import org.openide.util.Enumerations;	58	import org.openide.util.Enumerations;
58	import org.openide.util.Lookup;	59	import org.openide.util.Lookup;
59	import org.openide.util.Utilities;	60	import org.openide.util.Utilities;
Lines 494-497 Link Here
494	static void warning(Throwable ex) {	495	static void warning(Throwable ex) {
495	Logger.getLogger(NodeOp.class.getName()).log(Level.WARNING, null, ex);	496	Logger.getLogger(NodeOp.class.getName()).log(Level.WARNING, null, ex);
496	}	497	}
		498
		499	/**
		500	* Load a menu sequence from a lookup path.
		501	* Any {@link Action} instances are returned as is;
		502	* any {@link JSeparator} instances are translated to nulls.
		503	* Warnings are logged for any other instances.
		504	* @param path a path as given to {@link Lookups#forPath}, generally a layer folder name
		505	* @return a list of actions interspersed with null separators
		506	* @since org.openide.nodes 7.6
		507	*/
		508	public static List<? extends Action> actionsForPath(String path) {
		509	List<Action> actions = new ArrayList<Action>();
		510	for (Object item : Lookups.forPath(path).lookupAll(Object.class)) {
		511	if (item instanceof Action) {
		512	actions.add((Action) item);
		513	} else if (item instanceof JSeparator) {
		514	actions.add(null);
		515	} else {
		516	Logger.getLogger(NodeOp.class.getName()).warning("Unrecognized object of " + item.getClass() + " found in actions path " + path);
		517	}
		518	}
		519	return actions;
		520	}
		521
497	}	522	}

Lines 45-51 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/PhpLogicalViewProvider.java (-15 / +2 lines)
45	import java.io.IOException;	45	import java.io.IOException;
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.Arrays;	47	import java.util.Arrays;
48	import java.util.Collection;
49	import java.util.Collections;	48	import java.util.Collections;
50	import java.util.HashMap;	49	import java.util.HashMap;
51	import java.util.Iterator;	50	import java.util.Iterator;
Lines 53-59 Link Here
53	import java.util.logging.Level;	52	import java.util.logging.Level;
54	import java.util.logging.Logger;	53	import java.util.logging.Logger;
55	import javax.swing.Action;	54	import javax.swing.Action;
56	import javax.swing.JSeparator;
57	import javax.swing.SwingUtilities;	55	import javax.swing.SwingUtilities;
58	import javax.swing.event.ChangeEvent;	56	import javax.swing.event.ChangeEvent;
59	import javax.swing.event.ChangeListener;	57	import javax.swing.event.ChangeListener;
Lines 64-72 Link Here
64	import org.netbeans.api.project.Sources;	62	import org.netbeans.api.project.Sources;
65	import org.netbeans.api.queries.VisibilityQuery;	63	import org.netbeans.api.queries.VisibilityQuery;
66	import org.netbeans.modules.php.project.ui.actions.DebugSingleCommand;	64	import org.netbeans.modules.php.project.ui.actions.DebugSingleCommand;
67	import org.netbeans.modules.php.project.ui.actions.DownloadCommand;
68	import org.netbeans.modules.php.project.ui.actions.RunSingleCommand;	65	import org.netbeans.modules.php.project.ui.actions.RunSingleCommand;
69	import org.netbeans.modules.php.project.ui.actions.UploadCommand;
70	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;	66	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;
71	import org.netbeans.spi.project.ActionProvider;	67	import org.netbeans.spi.project.ActionProvider;
72	import org.netbeans.spi.project.support.ant.AntProjectHelper;	68	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 243-259 Link Here
243	actions.add(SystemAction.get(FindAction.class));	239	actions.add(SystemAction.get(FindAction.class));
244		240
245	// honor 57874 contact	241	// honor 57874 contact
246	Collection<? extends Object> res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N	242	actions.add(null);
247	if (!res.isEmpty()) {	243	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
248	actions.add(null);
249	for (Object next : res) {
250	if (next instanceof Action) {
251	actions.add((Action) next);
252	} else if (next instanceof JSeparator) {
253	actions.add(null);
254	}
255	}
256	}
257	actions.add(null);	244	actions.add(null);
258	actions.add(CommonProjectActions.customizeProjectAction());	245	actions.add(CommonProjectActions.customizeProjectAction());
259	return actions.toArray(new Action[actions.size()]);	246	return actions.toArray(new Action[actions.size()]);

Lines 48-54 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java (-10 / +2 lines)
48	import java.lang.ref.Reference;	48	import java.lang.ref.Reference;
49	import java.lang.ref.WeakReference;	49	import java.lang.ref.WeakReference;
50	import java.text.MessageFormat;	50	import java.text.MessageFormat;
51	import java.util.ArrayList;
52	import java.util.Arrays;	51	import java.util.Arrays;
53	import java.util.Collection;	52	import java.util.Collection;
54	import java.util.Collections;	53	import java.util.Collections;
Lines 63-69 Link Here
63	import java.util.logging.Level;	62	import java.util.logging.Level;
64	import java.util.logging.Logger;	63	import java.util.logging.Logger;
65	import javax.swing.Action;	64	import javax.swing.Action;
66	import javax.swing.JSeparator;
67	import javax.swing.SwingUtilities;	65	import javax.swing.SwingUtilities;
68	import javax.swing.event.ChangeEvent;	66	import javax.swing.event.ChangeEvent;
69	import javax.swing.event.ChangeListener;	67	import javax.swing.event.ChangeListener;
Lines 86-91 Link Here
86	import org.openide.nodes.Children;	84	import org.openide.nodes.Children;
87	import org.openide.nodes.FilterNode;	85	import org.openide.nodes.FilterNode;
88	import org.openide.nodes.Node;	86	import org.openide.nodes.Node;
		87	import org.openide.nodes.NodeOp;
89	import org.openide.util.Lookup;	88	import org.openide.util.Lookup;
90	import org.openide.util.NbBundle;	89	import org.openide.util.NbBundle;
91	import org.openide.util.RequestProcessor;	90	import org.openide.util.RequestProcessor;
Lines 142-155 Link Here
142	if (context \|\| type == PHYSICAL_VIEW) {	141	if (context \|\| type == PHYSICAL_VIEW) {
143	return new Action[0];	142	return new Action[0];
144	} else {	143	} else {
145	List<Action> actions = new ArrayList<Action>();	144	List<? extends Action> actions = NodeOp.actionsForPath(ACTIONS_FOLDER);
146	for (Object o : Lookups.forPath(ACTIONS_FOLDER).lookupAll(Object.class)) {
147	if (o instanceof Action) {
148	actions.add((Action) o);
149	} else if (o instanceof JSeparator) {
150	actions.add(null);
151	}
152	}
153	return actions.toArray(new Action[actions.size()]);	145	return actions.toArray(new Action[actions.size()]);
154	}	146	}
155	}	147	}

Lines 24-29 Link Here

(-)a/ruby.project/nbproject/project.xml (-28 / +28 lines)
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>
		27	<code-name-base>org.netbeans.api.progress</code-name-base>
		28	<build-prerequisite/>
		29	<compile-dependency/>
		30	<run-dependency>
		31	<release-version>1</release-version>
		32	<specification-version>1.8</specification-version>
		33	</run-dependency>
		34	</dependency>
		35	<dependency>
		36	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
		37	<build-prerequisite/>
		38	<compile-dependency/>
		39	<run-dependency>
		40	<release-version>1</release-version>
		41	<specification-version>1.10.0.1</specification-version>
		42	</run-dependency>
		43	</dependency>
		44	<dependency>
		45	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
		46	<build-prerequisite/>
		47	<compile-dependency/>
		48	<run-dependency>
		49	<release-version>1</release-version>
		50	<specification-version>1.4</specification-version>
		51	</run-dependency>
		52	</dependency>
		53	<dependency>
27	<code-name-base>org.netbeans.modules.gototest</code-name-base>	54	<code-name-base>org.netbeans.modules.gototest</code-name-base>
28	<build-prerequisite/>	55	<build-prerequisite/>
29	<compile-dependency/>	56	<compile-dependency/>
Lines 47-70 Link Here
47	<run-dependency>	74	<run-dependency>
48	<release-version>1</release-version>	75	<release-version>1</release-version>
49	<specification-version>0.30</specification-version>	76	<specification-version>0.30</specification-version>
50	</run-dependency>
51	</dependency>
52	<dependency>
53	<code-name-base>org.netbeans.api.progress</code-name-base>
54	<build-prerequisite/>
55	<compile-dependency/>
56	<run-dependency>
57	<release-version>1</release-version>
58	<specification-version>1.8</specification-version>
59	</run-dependency>
60	</dependency>
61	<dependency>
62	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
63	<build-prerequisite/>
64	<compile-dependency/>
65	<run-dependency>
66	<release-version>1</release-version>
67	<specification-version>1.10.0.1</specification-version>
68	</run-dependency>	77	</run-dependency>
69	</dependency>	78	</dependency>
70	<dependency>	79	<dependency>
Lines 100-114 Link Here
100	<compile-dependency/>	109	<compile-dependency/>
101	<run-dependency>	110	<run-dependency>
102	<release-version>1</release-version>	111	<release-version>1</release-version>
103	</run-dependency>
104	</dependency>
105	<dependency>
106	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
107	<build-prerequisite/>
108	<compile-dependency/>
109	<run-dependency>
110	<release-version>1</release-version>
111	<specification-version>1.4</specification-version>
112	</run-dependency>	112	</run-dependency>
113	</dependency>	113	</dependency>
114	<dependency>	114	<dependency>
Lines 205-211 Link Here
205	<build-prerequisite/>	205	<build-prerequisite/>
206	<compile-dependency/>	206	<compile-dependency/>
207	<run-dependency>	207	<run-dependency>
208	<specification-version>6.5</specification-version>	208	<specification-version>7.6</specification-version>
209	</run-dependency>	209	</run-dependency>
210	</dependency>	210	</dependency>
211	<dependency>	211	<dependency>

Lines 44-54 Link Here

(-)a/ruby.project/src/org/netbeans/modules/ruby/rubyproject/ui/RubyLogicalViewProvider.java (-14 / +3 lines)
44	import java.awt.Image;	44	import java.awt.Image;
45	import java.io.CharConversionException;	45	import java.io.CharConversionException;
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.Collection;
48	import java.util.List;	47	import java.util.List;
49	import java.util.ResourceBundle;	48	import java.util.ResourceBundle;
50	import javax.swing.Action;	49	import javax.swing.Action;
51	import javax.swing.JSeparator;
52	import javax.swing.event.ChangeEvent;	50	import javax.swing.event.ChangeEvent;
53	import javax.swing.event.ChangeListener;	51	import javax.swing.event.ChangeListener;
54	import org.netbeans.modules.ruby.rubyproject.RubyActionProvider;	52	import org.netbeans.modules.ruby.rubyproject.RubyActionProvider;
Lines 75-80 Link Here
75	import org.openide.loaders.DataObject;	73	import org.openide.loaders.DataObject;
76	import org.openide.nodes.AbstractNode;	74	import org.openide.nodes.AbstractNode;
77	import org.openide.nodes.Node;	75	import org.openide.nodes.Node;
		76	import org.openide.nodes.NodeOp;
78	import org.openide.util.HelpCtx;	77	import org.openide.util.HelpCtx;
79	import org.openide.util.NbBundle;	78	import org.openide.util.NbBundle;
80	import org.openide.util.Utilities;	79	import org.openide.util.Utilities;
Lines 347-364 Link Here
347	actions.add(SystemAction.get(FindAction.class));	346	actions.add(SystemAction.get(FindAction.class));
348		347
349	// honor 57874 contact	348	// honor 57874 contact
350		349	actions.add(null);
351	Collection<? extends Object> res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N	350	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
352	if (!res.isEmpty()) {
353	actions.add(null);
354	for (Object next : res) {
355	if (next instanceof Action) {
356	actions.add((Action) next);
357	} else if (next instanceof JSeparator) {
358	actions.add(null);
359	}
360	}
361	}
362		351
363	actions.add(null);	352	actions.add(null);
364	// if (broken) {	353	// if (broken) {

Lines 55-61 Link Here

(-)a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/ui/RailsLogicalViewProvider.java (-13 / +3 lines)
55	import java.util.ResourceBundle;	55	import java.util.ResourceBundle;
56	import java.util.Set;	56	import java.util.Set;
57	import javax.swing.Action;	57	import javax.swing.Action;
58	import javax.swing.JSeparator;
59	import javax.swing.event.ChangeEvent;	58	import javax.swing.event.ChangeEvent;
60	import javax.swing.event.ChangeListener;	59	import javax.swing.event.ChangeListener;
61	import org.netbeans.modules.ruby.railsprojects.GenerateAction;	60	import org.netbeans.modules.ruby.railsprojects.GenerateAction;
Lines 96-101 Link Here
96	import org.openide.loaders.DataObject;	95	import org.openide.loaders.DataObject;
97	import org.openide.nodes.AbstractNode;	96	import org.openide.nodes.AbstractNode;
98	import org.openide.nodes.Node;	97	import org.openide.nodes.Node;
		98	import org.openide.nodes.NodeOp;
99	import org.openide.util.HelpCtx;	99	import org.openide.util.HelpCtx;
100	import org.openide.util.NbBundle;	100	import org.openide.util.NbBundle;
101	import org.openide.util.RequestProcessor;	101	import org.openide.util.RequestProcessor;
Lines 520-537 Link Here
520	actions.add(SystemAction.get(FindAction.class));	520	actions.add(SystemAction.get(FindAction.class));
521		521
522	// honor 57874 contact	522	// honor 57874 contact
523		523	actions.add(null);
524	Collection<? extends Object> res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N	524	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
525	if (!res.isEmpty()) {
526	actions.add(null);
527	for (Object next : res) {
528	if (next instanceof Action) {
529	actions.add((Action) next);
530	} else if (next instanceof JSeparator) {
531	actions.add(null);
532	}
533	}
534	}
535		525
536	actions.add(null);	526	actions.add(null);
537	actions.add(CommonProjectActions.customizeProjectAction());	527	actions.add(CommonProjectActions.customizeProjectAction());

Lines 23-36 Link Here

(-)a/sql.project/nbproject/project.xml (-21 / +21 lines)
23	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">	23	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
24	<code-name-base>org.netbeans.modules.sql.project</code-name-base>	24	<code-name-base>org.netbeans.modules.sql.project</code-name-base>
25	<module-dependencies>	25	<module-dependencies>
26	<dependency>
27	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
28	<build-prerequisite/>
29	<compile-dependency/>
30	<run-dependency>
31	<specification-version>1.1</specification-version>
32	</run-dependency>
33	</dependency>
34	<dependency>	26	<dependency>
35	<code-name-base>org.apache.tools.ant.module</code-name-base>	27	<code-name-base>org.apache.tools.ant.module</code-name-base>
36	<build-prerequisite/>	28	<build-prerequisite/>
Lines 65-70 Link Here
65	<run-dependency>	57	<run-dependency>
66	<release-version>1</release-version>	58	<release-version>1</release-version>
67	<specification-version>1.0</specification-version>	59	<specification-version>1.0</specification-version>
		60	</run-dependency>
		61	</dependency>
		62	<dependency>
		63	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
		64	<build-prerequisite/>
		65	<compile-dependency/>
		66	<run-dependency>
		67	<specification-version>1.1</specification-version>
68	</run-dependency>	68	</run-dependency>
69	</dependency>	69	</dependency>
70	<dependency>	70	<dependency>
Lines 126-132 Link Here
126	<release-version>1</release-version>	126	<release-version>1</release-version>
127	<specification-version>1.13.12</specification-version>	127	<specification-version>1.13.12</specification-version>
128	</run-dependency>	128	</run-dependency>
129	</dependency>	129	</dependency>
130	<dependency>	130	<dependency>
131	<code-name-base>org.netbeans.modules.projectapi</code-name-base>	131	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
132	<build-prerequisite/>	132	<build-prerequisite/>
Lines 159-164 Link Here
159	<build-prerequisite/>	159	<build-prerequisite/>
160	<compile-dependency/>	160	<compile-dependency/>
161	<run-dependency>	161	<run-dependency>
		162	<specification-version>1.0</specification-version>
		163	</run-dependency>
		164	</dependency>
		165	<dependency>
		166	<code-name-base>org.netbeans.soa.libs.wsdl4j</code-name-base>
		167	<build-prerequisite/>
		168	<compile-dependency/>
		169	<run-dependency>
		170	<release-version>1</release-version>
162	<specification-version>1.0</specification-version>	171	<specification-version>1.0</specification-version>
163	</run-dependency>	172	</run-dependency>
164	</dependency>	173	</dependency>
Lines 201-207 Link Here
201	<run-dependency>	210	<run-dependency>
202	<specification-version>6.8</specification-version>	211	<specification-version>6.8</specification-version>
203	</run-dependency>	212	</run-dependency>
204	</dependency>	213	</dependency>
205	<dependency>	214	<dependency>
206	<code-name-base>org.openide.filesystems</code-name-base>	215	<code-name-base>org.openide.filesystems</code-name-base>
207	<build-prerequisite/>	216	<build-prerequisite/>
Lines 239-245 Link Here
239	<build-prerequisite/>	248	<build-prerequisite/>
240	<compile-dependency/>	249	<compile-dependency/>
241	<run-dependency>	250	<run-dependency>
242	<specification-version>6.7.21</specification-version>	251	<specification-version>7.6</specification-version>
243	</run-dependency>	252	</run-dependency>
244	</dependency>	253	</dependency>
245	<dependency>	254	<dependency>
Lines 275-291 Link Here
275	<specification-version>3.9.12</specification-version>	284	<specification-version>3.9.12</specification-version>
276	</run-dependency>	285	</run-dependency>
277	</dependency>	286	</dependency>
278	<dependency>
279	<code-name-base>org.netbeans.soa.libs.wsdl4j</code-name-base>
280	<build-prerequisite/>
281	<compile-dependency/>
282	<run-dependency>
283	<release-version>1</release-version>
284	<specification-version>1.0</specification-version>
285	</run-dependency>
286	</dependency>
287	</module-dependencies>	287	</module-dependencies>
288	<public-packages/>	288	<public-packages/>
289	</data>	289	</data>
290	</configuration>	290	</configuration>
291	</project>	291	</project>

Lines 40-51 Link Here

(-)a/sql.project/src/org/netbeans/modules/sql/project/ui/SQLproLogicalViewProvider.java (-19 / +1 lines)
40	import java.lang.reflect.Method;	40	import java.lang.reflect.Method;
41	import java.util.List;	41	import java.util.List;
42	import java.util.ResourceBundle;	42	import java.util.ResourceBundle;
43	import java.util.Collections;
44	import java.util.StringTokenizer;
45		43
46	import javax.swing.AbstractAction;	44	import javax.swing.AbstractAction;
47	import javax.swing.Action;	45	import javax.swing.Action;
48	import javax.swing.JSeparator;
49	import org.netbeans.modules.sql.project.SQLproProject;	46	import org.netbeans.modules.sql.project.SQLproProject;
50		47
51	import org.openide.nodes.*;	48	import org.openide.nodes.*;
Lines 64-77 Link Here
64	import org.netbeans.spi.project.support.ant.ReferenceHelper;	61	import org.netbeans.spi.project.support.ant.ReferenceHelper;
65	import org.netbeans.spi.project.ui.LogicalViewProvider;	62	import org.netbeans.spi.project.ui.LogicalViewProvider;
66	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;	63	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
67	import org.netbeans.spi.java.project.support.ui.BrokenReferencesSupport;
68	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;	64	import org.netbeans.modules.compapp.projects.base.ui.customizer.IcanproProjectProperties;
69	import org.netbeans.modules.compapp.projects.base.ui.IcanproLogicalViewProvider;	65	import org.netbeans.modules.compapp.projects.base.ui.IcanproLogicalViewProvider;
70	import org.netbeans.modules.sql.project.wsdl.GenFiles;	66	import org.netbeans.modules.sql.project.wsdl.GenFiles;
71	import org.netbeans.modules.sql.project.wsdl.ActionImpl;
72	import org.netbeans.modules.compapp.projects.base.IcanproConstants;
73	import org.openide.loaders.DataFolder;	67	import org.openide.loaders.DataFolder;
74	import org.openide.loaders.DataObject;
75	import org.openide.util.lookup.Lookups;	68	import org.openide.util.lookup.Lookups;
76	import org.openide.util.Lookup;	69	import org.openide.util.Lookup;
77		70
Lines 199-205 Link Here
199	generateWSDL(actions);	192	generateWSDL(actions);
200	actions.add(null);	193	actions.add(null);
201	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));	194	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
202	addFromLayers(actions, "Projects/Actions");	195	actions.addAll(NodeOp.actionsForPath("Projects/Actions"));
203	actions.add(null);	196	actions.add(null);
204	actions.add(brokenLinksAction);	197	actions.add(brokenLinksAction);
205	actions.add(CommonProjectActions.customizeProjectAction());	198	actions.add(CommonProjectActions.customizeProjectAction());
Lines 234-250 Link Here
234	)};*/	227	)};*/
235	}	228	}
236		229
237	private void addFromLayers(List<Action> actions, String path) {
238	Lookup look = Lookups.forPath(path);
239	for (Object next : look.lookupAll(Object.class)) {
240	if (next instanceof Action) {
241	actions.add((Action) next);
242	} else if (next instanceof JSeparator) {
243	actions.add(null);
244	}
245	}
246	}
247
248	private void generateWSDL(List<Action> actions) {	230	private void generateWSDL(List<Action> actions) {
249	Object genFiles = SystemAction.findObject(GenFiles.class, true);	231	Object genFiles = SystemAction.findObject(GenFiles.class, true);
250	try {	232	try {

Lines 61-80 Link Here

(-)a/uml.designpattern/src/org/netbeans/modules/uml/designpattern/DesignCenterComponent.java (-67 / +3 lines)
61	import java.io.IOException;	61	import java.io.IOException;
62	import java.util.ArrayList;	62	import java.util.ArrayList;
63	import java.util.HashSet;	63	import java.util.HashSet;
		64	import java.util.List;
64	import java.util.ResourceBundle;	65	import java.util.ResourceBundle;
65	import javax.swing.AbstractAction;	66	import javax.swing.AbstractAction;
66	import javax.swing.Action;	67	import javax.swing.Action;
67	import javax.swing.InputMap;	68	import javax.swing.InputMap;
68	import javax.swing.JComponent;	69	import javax.swing.JComponent;
69	import javax.swing.JSeparator;
70	import javax.swing.KeyStroke;	70	import javax.swing.KeyStroke;
71	import org.netbeans.modules.uml.resources.images.ImageUtil;	71	import org.netbeans.modules.uml.resources.images.ImageUtil;
72	import org.openide.cookies.InstanceCookie;
73	import org.openide.filesystems.FileObject;
74	import org.openide.filesystems.FileSystem;
75	import org.openide.filesystems.Repository;
76	import org.openide.loaders.DataObject;
77	import org.openide.loaders.DataObjectNotFoundException;
78	import org.openide.nodes.Node;	72	import org.openide.nodes.Node;
79		73
80	import org.openide.windows.TopComponent;	74	import org.openide.windows.TopComponent;
Lines 88-93 Link Here
88	import org.netbeans.modules.uml.ui.swing.projecttree.ISwingProjectTreeModel;	82	import org.netbeans.modules.uml.ui.swing.projecttree.ISwingProjectTreeModel;
89	import org.netbeans.modules.uml.ui.swing.projecttree.JProjectTree;	83	import org.netbeans.modules.uml.ui.swing.projecttree.JProjectTree;
90	import org.netbeans.modules.uml.ui.swing.testbed.addin.menu.Separator;	84	import org.netbeans.modules.uml.ui.swing.testbed.addin.menu.Separator;
		85	import org.openide.nodes.NodeOp;
91		86
92	/**	87	/**
93	* The DesignCenterComponent is a component that can be embedded into NetBeans	88	* The DesignCenterComponent is a component that can be embedded into NetBeans
Lines 500-565 Link Here
500	*/	495	*/
501	protected Action[] getActionsFromRegistry(String path)	496	protected Action[] getActionsFromRegistry(String path)
502	{	497	{
503	ArrayList<Action> actions = new ArrayList<Action>();	498	List<? extends Action> actions = NodeOp.actionsForPath(path);
504	FileSystem system = Repository.getDefault().getDefaultFileSystem();
505
506	try
507	{
508	if (system != null)
509	{
510	FileObject lookupDir = system.findResource(path);
511
512	if (lookupDir != null)
513	{
514	FileObject[] children = lookupDir.getChildren();
515
516	for (FileObject curObj : children)
517	{
518	try
519	{
520	DataObject dObj = DataObject.find(curObj);
521
522	if (dObj != null)
523	{
524	InstanceCookie cookie = (InstanceCookie)dObj
525	.getCookie(InstanceCookie.class);
526
527	if (cookie != null)
528	{
529	Object obj = cookie.instanceCreate();
530
531	if (obj instanceof Action)
532	{
533	actions.add((Action)obj);
534	}
535	else if (obj instanceof JSeparator)
536	{
537	actions.add(null);
538	}
539	}
540	} // dObj != null
541	}
542
543	catch(ClassNotFoundException e)
544	{
545	// Unable to create the instance for some reason. So the
546	// do not worry about adding the instance to the list.
547	}
548	} // for-each FileObject
549	} // if lookupDir != null
550	} // if system != null
551	}
552
553	catch(DataObjectNotFoundException e)
554	{
555	// Basically Bail at this time.
556	}
557
558	catch(IOException ioE)
559	{
560
561	}
562
563	Action[] retVal = new Action[actions.size()];	499	Action[] retVal = new Action[actions.size()];
564	actions.toArray(retVal);	500	actions.toArray(retVal);
565	return retVal;	501	return retVal;

Lines 46-62 Link Here

(-)a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/AbstractModelElementNode.java (-46 / +2 lines)
46	import java.awt.dnd.DnDConstants;	46	import java.awt.dnd.DnDConstants;
47		47
48	import java.util.List;	48	import java.util.List;
49	import org.openide.filesystems.FileSystem;
50	import org.openide.filesystems.Repository;
51	import org.openide.loaders.DataObject;
52	import org.openide.cookies.InstanceCookie;
53	import org.openide.filesystems.FileObject;
54	import java.awt.datatransfer.Transferable;	49	import java.awt.datatransfer.Transferable;
55	import java.awt.EventQueue;	50	import java.awt.EventQueue;
56	import java.util.ArrayList;	51	import java.util.ArrayList;
57	import java.util.LinkedList;	52	import java.util.LinkedList;
58	import javax.swing.Action;	53	import javax.swing.Action;
59	import javax.swing.JSeparator;
60	import java.io.IOException;	54	import java.io.IOException;
61		55
62	import org.openide.nodes.AbstractNode;	56	import org.openide.nodes.AbstractNode;
Lines 85-92 Link Here
85		79
86	import org.netbeans.modules.uml.propertysupport.DefinitionPropertyBuilder;	80	import org.netbeans.modules.uml.propertysupport.DefinitionPropertyBuilder;
87	import org.openide.actions.*;	81	import org.openide.actions.*;
88	import org.openide.loaders.DataFolder;
89	import org.openide.nodes.Node.PropertySet;	82	import org.openide.nodes.Node.PropertySet;
		83	import org.openide.nodes.NodeOp;
90	import org.openide.util.datatransfer.ExTransferable;	84	import org.openide.util.datatransfer.ExTransferable;
91	import org.openide.util.datatransfer.NewType;	85	import org.openide.util.datatransfer.NewType;
92	import org.openide.util.datatransfer.PasteType;	86	import org.openide.util.datatransfer.PasteType;
Lines 711-755 Link Here
711	*/	705	*/
712	protected Action[] getActionsFromRegistry(String path)	706	protected Action[] getActionsFromRegistry(String path)
713	{	707	{
714	ArrayList<Action> actions = new ArrayList<Action>();	708	List<? extends Action> actions = NodeOp.actionsForPath(path);
715	FileSystem system = Repository.getDefault().getDefaultFileSystem();
716
717	if (system != null)
718	{
719	FileObject fo = system.findResource(path);
720	DataFolder df = fo != null ? DataFolder.findFolder(fo) : null;
721	if (df != null)
722	{
723	DataObject actionObjects[] = df.getChildren();
724	for (int i = 0; i < actionObjects.length; i++)
725	{
726	InstanceCookie ic = actionObjects[i].getCookie(InstanceCookie.class);
727	if (ic == null) continue;
728	Object instance;
729	try
730	{
731	instance = ic.instanceCreate();
732	}
733	catch (IOException e)
734	{
735	// ignore
736	e.printStackTrace();
737	continue;
738	}
739	catch (ClassNotFoundException e)
740	{
741	// ignore
742	e.printStackTrace();
743	continue;
744	}
745	if (instance instanceof Action)
746	actions.add((Action)instance);
747	else if (instance instanceof JSeparator)
748	actions.add(null);
749	}
750	}
751	}
752
753	Action[] retVal = new Action[actions.size()];	709	Action[] retVal = new Action[actions.size()];
754	actions.toArray(retVal);	710	actions.toArray(retVal);
755	return retVal;	711	return retVal;

Lines 41-47 Link Here

(-)a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLPhysicalViewProvider.java (-45 / +2 lines)
41		41
42	package org.netbeans.modules.uml.project.ui.nodes;	42	package org.netbeans.modules.uml.project.ui.nodes;
43		43
44	import java.util.Iterator;
45	import java.awt.Image;	44	import java.awt.Image;
46	import java.awt.event.ActionEvent;	45	import java.awt.event.ActionEvent;
47	import java.beans.PropertyChangeEvent;	46	import java.beans.PropertyChangeEvent;
Lines 58-64 Link Here
58		57
59	import javax.swing.AbstractAction;	58	import javax.swing.AbstractAction;
60	import javax.swing.Action;	59	import javax.swing.Action;
61	import javax.swing.JSeparator;
62	import javax.swing.event.ChangeEvent;	60	import javax.swing.event.ChangeEvent;
63	import javax.swing.event.ChangeListener;	61	import javax.swing.event.ChangeListener;
64		62
Lines 77-91 Link Here
77	import org.netbeans.spi.project.support.ant.ReferenceHelper;	75	import org.netbeans.spi.project.support.ant.ReferenceHelper;
78	import org.netbeans.spi.project.ui.LogicalViewProvider;	76	import org.netbeans.spi.project.ui.LogicalViewProvider;
79		77
80	import org.openide.ErrorManager;
81	import org.openide.filesystems.FileObject;	78	import org.openide.filesystems.FileObject;
82	import org.openide.filesystems.FileSystem;
83	import org.openide.filesystems.FileUtil;	79	import org.openide.filesystems.FileUtil;
84	import org.openide.filesystems.Repository;
85	import org.openide.loaders.DataFolder;
86	import org.openide.loaders.DataObject;
87	import org.openide.loaders.DataObjectNotFoundException;
88	import org.openide.loaders.FolderLookup;
89	import org.openide.nodes.AbstractNode;	80	import org.openide.nodes.AbstractNode;
90	import org.openide.nodes.Children;	81	import org.openide.nodes.Children;
91	import org.openide.nodes.Node;	82	import org.openide.nodes.Node;
Lines 105-116 Link Here
105	import org.netbeans.modules.uml.project.ui.nodes.actions.NewPackageType;	96	import org.netbeans.modules.uml.project.ui.nodes.actions.NewPackageType;
106	import org.netbeans.modules.uml.resources.images.ImageUtil;	97	import org.netbeans.modules.uml.resources.images.ImageUtil;
107	import org.netbeans.modules.uml.ui.support.applicationmanager.IProduct;	98	import org.netbeans.modules.uml.ui.support.applicationmanager.IProduct;
108	import org.netbeans.spi.project.support.ant.AntProjectHelper;
109	import org.netbeans.spi.project.support.ant.EditableProperties;
110	import org.netbeans.spi.project.ui.support.CommonProjectActions;	99	import org.netbeans.spi.project.ui.support.CommonProjectActions;
111		100
112	import org.openide.DialogDisplayer;	101	import org.openide.DialogDisplayer;
113	import org.openide.NotifyDescriptor;	102	import org.openide.NotifyDescriptor;
		103	import org.openide.nodes.NodeOp;
114	import org.openide.util.Mutex;	104	import org.openide.util.Mutex;
115	import org.openide.util.datatransfer.NewType;	105	import org.openide.util.datatransfer.NewType;
116		106
Lines 561-600 Link Here
561	actions.add(null);	551	actions.add(null);
562	actions.add(CommonProjectActions.deleteProjectAction());	552	actions.add(CommonProjectActions.deleteProjectAction());
563	actions.add(null);	553	actions.add(null);
564		554	actions.addAll(NodeOp.actionsForPath("UMLProjects/Actions")); // NOI18N
565	try
566	{
567	Repository repository = Repository.getDefault();
568	FileSystem sfs = repository.getDefaultFileSystem();
569	FileObject fo = sfs.findResource("UMLProjects/Actions"); // NOI18N
570
571	if (fo != null)
572	{
573	DataObject dobj = DataObject.find(fo);
574	FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
575	Lookup.Template query = new Lookup.Template(Object.class);
576	Lookup lkup = actionRegistry.getLookup();
577	Iterator it = lkup.lookup(query).allInstances().iterator();
578
579	while (it.hasNext())
580	{
581	Object next = it.next();
582
583	if (next instanceof Action)
584	actions.add(next);
585
586	else if (next instanceof JSeparator)
587	actions.add(null);
588	}
589	}
590	}
591
592	catch (DataObjectNotFoundException ex)
593	{
594	// data folder for exitinf fileobject expected
595	ErrorManager.getDefault().notify(ex);
596	}
597
598	addContextMenus(actions);	555	addContextMenus(actions);
599	actions.add(null);	556	actions.add(null);
600		557

Lines 114-137 Link Here

(-)a/web.project/nbproject/project.xml (-19 / +19 lines)
114	<run-dependency/>	114	<run-dependency/>
115	</dependency>	115	</dependency>
116	<dependency>	116	<dependency>
117	<code-name-base>org.netbeans.modules.gsfpath.api</code-name-base>
118	<build-prerequisite/>
119	<compile-dependency/>
120	<run-dependency>
121	<release-version>1</release-version>
122	<specification-version>0.30</specification-version>
123	</run-dependency>
124	</dependency>
125	<dependency>
126	<code-name-base>org.netbeans.modules.gsf</code-name-base>
127	<build-prerequisite/>
128	<compile-dependency/>
129	<run-dependency>
130	<release-version>2</release-version>
131	<implementation-version/>
132	</run-dependency>
133	</dependency>
134	<dependency>
135	<code-name-base>org.netbeans.libs.javacapi</code-name-base>	117	<code-name-base>org.netbeans.libs.javacapi</code-name-base>
136	<build-prerequisite/>	118	<build-prerequisite/>
137	<compile-dependency/>	119	<compile-dependency/>
Lines 150-155 Link Here
150	<run-dependency>	132	<run-dependency>
151	<release-version>1</release-version>	133	<release-version>1</release-version>
152	<specification-version>1.24</specification-version>	134	<specification-version>1.24</specification-version>
		135	</run-dependency>
		136	</dependency>
		137	<dependency>
		138	<code-name-base>org.netbeans.modules.gsf</code-name-base>
		139	<build-prerequisite/>
		140	<compile-dependency/>
		141	<run-dependency>
		142	<release-version>2</release-version>
		143	<implementation-version/>
		144	</run-dependency>
		145	</dependency>
		146	<dependency>
		147	<code-name-base>org.netbeans.modules.gsfpath.api</code-name-base>
		148	<build-prerequisite/>
		149	<compile-dependency/>
		150	<run-dependency>
		151	<release-version>1</release-version>
		152	<specification-version>0.30</specification-version>
153	</run-dependency>	153	</run-dependency>
154	</dependency>	154	</dependency>
155	<dependency>	155	<dependency>
Lines 455-461 Link Here
455	<build-prerequisite/>	455	<build-prerequisite/>
456	<compile-dependency/>	456	<compile-dependency/>
457	<run-dependency>	457	<run-dependency>
458	<specification-version>6.2</specification-version>	458	<specification-version>7.6</specification-version>
459	</run-dependency>	459	</run-dependency>
460	</dependency>	460	</dependency>
461	<dependency>	461	<dependency>

Lines 54-60 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java (-15 / +3 lines)
54	import java.util.logging.Logger;	54	import java.util.logging.Logger;
55	import javax.swing.AbstractAction;	55	import javax.swing.AbstractAction;
56	import javax.swing.Action;	56	import javax.swing.Action;
57	import javax.swing.JSeparator;
58	import javax.swing.event.ChangeEvent;	57	import javax.swing.event.ChangeEvent;
59	import javax.swing.event.ChangeListener;	58	import javax.swing.event.ChangeListener;
60	import org.netbeans.api.db.explorer.ConnectionListener;	59	import org.netbeans.api.db.explorer.ConnectionListener;
Lines 348-356 Link Here
348	actions.add(ProjectSensitiveActions.projectCommandAction( WebProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N	347	actions.add(ProjectSensitiveActions.projectCommandAction( WebProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
349	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N	348	actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
350		349
351	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	350	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
352		351
353	addFromLayers(actions, "Projects/Rest_Actions_holder"); //NOI18N	352	actions.addAll(NodeOp.actionsForPath("Projects/Rest_Actions_holder")); //NOI18N
354	actions.add(null);	353	actions.add(null);
355	actions.add(CommonProjectActions.setAsMainProjectAction());	354	actions.add(CommonProjectActions.setAsMainProjectAction());
356	actions.add(CommonProjectActions.openSubprojectsAction());	355	actions.add(CommonProjectActions.openSubprojectsAction());
Lines 365-371 Link Here
365		364
366	// honor 57874 contact	365	// honor 57874 contact
367		366
368	addFromLayers(actions, "Projects/Actions"); //NOI18N	367	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
369		368
370	actions.add(null);	369	actions.add(null);
371		370
Lines 383-399 Link Here
383	return actions.toArray(new Action[actions.size()]);	382	return actions.toArray(new Action[actions.size()]);
384	}	383	}
385		384
386	private void addFromLayers(List<Action> actions, String path) {
387	Lookup look = Lookups.forPath(path);
388	for (Object next : look.lookupAll(Object.class)) {
389	if (next instanceof Action) {
390	actions.add((Action) next);
391	} else if (next instanceof JSeparator) {
392	actions.add(null);
393	}
394	}
395	}
396
397	/** This action is created only when project has broken references.	385	/** This action is created only when project has broken references.
398	* Once these are resolved the action is disabled.	386	* Once these are resolved the action is disabled.
399	*/	387	*/

Lines 23-37 Link Here

(-)a/xslt.project/nbproject/project.xml (-45 / +45 lines)
23	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">	23	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
24	<code-name-base>org.netbeans.modules.xslt.project</code-name-base>	24	<code-name-base>org.netbeans.modules.xslt.project</code-name-base>
25	<module-dependencies>	25	<module-dependencies>
26	<dependency>
27	<code-name-base>org.netbeans.modules.soa.ui</code-name-base>
28	<build-prerequisite/>
29	<compile-dependency/>
30	<run-dependency>
31	<release-version>1</release-version>
32	<specification-version>1.1</specification-version>
33	</run-dependency>
34	</dependency>
35	<dependency>	26	<dependency>
36	<code-name-base>org.apache.tools.ant.module</code-name-base>	27	<code-name-base>org.apache.tools.ant.module</code-name-base>
37	<build-prerequisite/>	28	<build-prerequisite/>
Lines 65-70 Link Here
65	<run-dependency>	56	<run-dependency>
66	<release-version>1</release-version>	57	<release-version>1</release-version>
67	<specification-version>1.5.22</specification-version>	58	<specification-version>1.5.22</specification-version>
		59	</run-dependency>
		60	</dependency>
		61	<dependency>
		62	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
		63	<build-prerequisite/>
		64	<compile-dependency/>
		65	<run-dependency>
		66	<specification-version>1.1</specification-version>
68	</run-dependency>	67	</run-dependency>
69	</dependency>	68	</dependency>
70	<dependency>	69	<dependency>
Lines 130-135 Link Here
130	</run-dependency>	129	</run-dependency>
131	</dependency>	130	</dependency>
132	<dependency>	131	<dependency>
		132	<code-name-base>org.netbeans.modules.soa.ui</code-name-base>
		133	<build-prerequisite/>
		134	<compile-dependency/>
		135	<run-dependency>
		136	<release-version>1</release-version>
		137	<specification-version>1.1</specification-version>
		138	</run-dependency>
		139	</dependency>
		140	<dependency>
		141	<code-name-base>org.netbeans.modules.soa.validation</code-name-base>
		142	<build-prerequisite/>
		143	<compile-dependency/>
		144	<run-dependency>
		145	<release-version>1</release-version>
		146	<specification-version>1.1</specification-version>
		147	</run-dependency>
		148	</dependency>
		149	<dependency>
133	<code-name-base>org.netbeans.modules.xml.catalogsupport</code-name-base>	150	<code-name-base>org.netbeans.modules.xml.catalogsupport</code-name-base>
134	<build-prerequisite/>	151	<build-prerequisite/>
135	<compile-dependency/>	152	<compile-dependency/>
Lines 154-159 Link Here
154	</run-dependency>	171	</run-dependency>
155	</dependency>	172	</dependency>
156	<dependency>	173	<dependency>
		174	<code-name-base>org.netbeans.modules.xml.search</code-name-base>
		175	<build-prerequisite/>
		176	<compile-dependency/>
		177	<run-dependency>
		178	<release-version>1</release-version>
		179	<specification-version>1.1</specification-version>
		180	</run-dependency>
		181	</dependency>
		182	<dependency>
157	<code-name-base>org.netbeans.modules.xml.wsdl.extensions</code-name-base>	183	<code-name-base>org.netbeans.modules.xml.wsdl.extensions</code-name-base>
158	<build-prerequisite/>	184	<build-prerequisite/>
159	<compile-dependency/>	185	<compile-dependency/>
Lines 170-184 Link Here
170	</run-dependency>	196	</run-dependency>
171	</dependency>	197	</dependency>
172	<dependency>	198	<dependency>
173	<code-name-base>org.netbeans.modules.xslt.model</code-name-base>
174	<build-prerequisite/>
175	<compile-dependency/>
176	<run-dependency>
177	<release-version>1</release-version>
178	<specification-version>1.0</specification-version>
179	</run-dependency>
180	</dependency>
181	<dependency>
182	<code-name-base>org.netbeans.modules.xml.wsdlui</code-name-base>	199	<code-name-base>org.netbeans.modules.xml.wsdlui</code-name-base>
183	<build-prerequisite/>	200	<build-prerequisite/>
184	<compile-dependency/>	201	<compile-dependency/>
Lines 192-197 Link Here
192	<compile-dependency/>	209	<compile-dependency/>
193	<run-dependency>	210	<run-dependency>
194	<release-version>1</release-version>	211	<release-version>1</release-version>
		212	</run-dependency>
		213	</dependency>
		214	<dependency>
		215	<code-name-base>org.netbeans.modules.xslt.model</code-name-base>
		216	<build-prerequisite/>
		217	<compile-dependency/>
		218	<run-dependency>
		219	<release-version>1</release-version>
		220	<specification-version>1.0</specification-version>
195	</run-dependency>	221	</run-dependency>
196	</dependency>	222	</dependency>
197	<dependency>	223	<dependency>
Lines 279-285 Link Here
279	<build-prerequisite/>	305	<build-prerequisite/>
280	<compile-dependency/>	306	<compile-dependency/>
281	<run-dependency>	307	<run-dependency>
282	<specification-version>6.2</specification-version>	308	<specification-version>7.6</specification-version>
283	</run-dependency>	309	</run-dependency>
284	</dependency>	310	</dependency>
285	<dependency>	311	<dependency>
Lines 288-319 Link Here
288	<compile-dependency/>	314	<compile-dependency/>
289	<run-dependency>	315	<run-dependency>
290	<specification-version>7.4</specification-version>	316	<specification-version>7.4</specification-version>
291	</run-dependency>
292	</dependency>
293	<dependency>
294	<code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
295	<build-prerequisite/>
296	<compile-dependency/>
297	<run-dependency>
298	<specification-version>1.1</specification-version>
299	</run-dependency>
300	</dependency>
301	<dependency>
302	<code-name-base>org.netbeans.modules.xml.search</code-name-base>
303	<build-prerequisite/>
304	<compile-dependency/>
305	<run-dependency>
306	<release-version>1</release-version>
307	<specification-version>1.1</specification-version>
308	</run-dependency>
309	</dependency>
310	<dependency>
311	<code-name-base>org.netbeans.modules.soa.validation</code-name-base>
312	<build-prerequisite/>
313	<compile-dependency/>
314	<run-dependency>
315	<release-version>1</release-version>
316	<specification-version>1.1</specification-version>
317	</run-dependency>	317	</run-dependency>
318	</dependency>	318	</dependency>
319	</module-dependencies>	319	</module-dependencies>

Lines 30-36 Link Here

(-)a/xslt.project/src/org/netbeans/modules/xslt/project/wizard/IcanproLogicalViewProvider.java (-13 / +1 lines)
30		30
31	import javax.swing.AbstractAction;	31	import javax.swing.AbstractAction;
32	import javax.swing.Action;	32	import javax.swing.Action;
33	import javax.swing.JSeparator;
34	import org.netbeans.modules.xslt.project.XsltproProject;	33	import org.netbeans.modules.xslt.project.XsltproProject;
35	import org.netbeans.modules.xslt.project.nodes.IcanproViews;	34	import org.netbeans.modules.xslt.project.nodes.IcanproViews;
36	import org.netbeans.spi.project.ui.LogicalViewProvider;	35	import org.netbeans.spi.project.ui.LogicalViewProvider;
Lines 279-285 Link Here
279	actions.add(null);	278	actions.add(null);
280	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));	279	actions.add(SystemAction.get( org.openide.actions.FindAction.class ));
281	// add versioning support	280	// add versioning support
282	addFromLayers(actions, "Projects/Actions"); //NOI18N	281	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
283	// null,	282	// null,
284	// SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),	283	// SystemAction.get(org.openide.actions.OpenLocalExplorerAction.class),
285	actions.add(null);	284	actions.add(null);
Lines 289-305 Link Here
289	return actions.toArray(new Action[actions.size()]);	288	return actions.toArray(new Action[actions.size()]);
290	}	289	}
291		290
292	private void addFromLayers(List<Action> actions, String path) {
293	Lookup look = Lookups.forPath(path);
294	for (Object next : look.lookupAll(Object.class)) {
295	if (next instanceof Action) {
296	actions.add((Action) next);
297	} else if (next instanceof JSeparator) {
298	actions.add(null);
299	}
300	}
301	}
302
303	/** This action is created only when project has broken references.	291	/** This action is created only when project has broken references.
304	* Once these are resolved the action is disabled.	292	* Once these are resolved the action is disabled.
305	*/	293	*/