Attachment #62398 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 95-101 Link Here

(-)a/autoproject.core/nbproject/project.xml (-1 / +1 lines)
95	<build-prerequisite/>	95	<build-prerequisite/>
96	<compile-dependency/>	96	<compile-dependency/>
97	<run-dependency>	97	<run-dependency>
98	<specification-version>7.4</specification-version>	98	<specification-version>7.6</specification-version>
99	</run-dependency>	99	</run-dependency>
100	</dependency>	100	</dependency>
101	<dependency>	101	<dependency>




import java.util.List;
import java.util.MissingResourceException;
import javax.swing.Action;
import javax.swing.JSeparator;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.spi.project.ActionProvider;

import org.openide.actions.FindAction;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Node;
import org.openide.nodes.NodeOp;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;

                    }
                }
            }
            actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
            actions.addAll(NodeOp.actionsForPath("Projects/org-netbeans-modules-autoproject/Actions")); // NOI18N
            actions.add(null);
            actions.add(CommonProjectActions.setAsMainProjectAction());
            actions.add(CommonProjectActions.openSubprojectsAction());

            actions.add(null);
             */
            actions.add(SystemAction.get(FindAction.class));
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
            actions.add(null);
            /* XXX
            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);
                }
            }
        }

        /* XXX no rename support currently:

Lines 3-8 Link Here

(-)a/bluej-suite/bluej/nbproject/genfiles.properties (-1 / +1 lines)
3	build.xml.stylesheet.CRC32=05353c81	3	build.xml.stylesheet.CRC32=05353c81
4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.	4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.	5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6	nbproject/build-impl.xml.data.CRC32=ea3a93ce	6	nbproject/build-impl.xml.data.CRC32=e9e48e37
7	nbproject/build-impl.xml.script.CRC32=44346c8c	7	nbproject/build-impl.xml.script.CRC32=44346c8c
8	nbproject/build-impl.xml.stylesheet.CRC32=deb65f65	8	nbproject/build-impl.xml.stylesheet.CRC32=deb65f65

Lines 206-212 Link Here

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




package org.netbeans.bluej.nodes;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ResourceBundle;
import javax.swing.Action;
import javax.swing.JSeparator;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectUtils;

import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ui.support.CommonProjectActions;
import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
import org.openide.ErrorManager;
import org.openide.actions.FindAction;
import org.openide.actions.ToolsAction;
import org.openide.filesystems.FileObject;
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.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.actions.SystemAction;

        actions.add(SystemAction.get(FindAction.class));
        
        // honor 57874 contact
        actions.add(null);
        actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
            FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N
            if (fo != null) {
                DataObject dobj = DataObject.find(fo);
                FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
                Lookup.Template query = new Lookup.Template(Object.class);
                Lookup lookup = actionRegistry.getLookup();
                Iterator it = lookup.lookup(query).allInstances().iterator();
                if (it.hasNext()) {
                    actions.add(null);
                }
                while (it.hasNext()) {
                    Object next = it.next();
                    if (next instanceof Action) {
                        actions.add(next);
                    } else if (next instanceof JSeparator) {
                        actions.add(null);
                    }
                }
            }
        } catch (DataObjectNotFoundException ex) {
            // data folder for existing fileobject expected
            ErrorManager.getDefault().notify(ex);
        }
        
        actions.add(null);
        actions.add(SystemAction.get(ToolsAction.class));

Lines 3-8 Link Here

(-)a/contrib/latex/guiproject/nbproject/genfiles.properties (-2 / +2 lines)
3	build.xml.stylesheet.CRC32=1101b4cf	3	build.xml.stylesheet.CRC32=1101b4cf
4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.	4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.	5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6	nbproject/build-impl.xml.data.CRC32=0746c13d	6	nbproject/build-impl.xml.data.CRC32=3f1a3c64
7	nbproject/build-impl.xml.script.CRC32=a4116950	7	nbproject/build-impl.xml.script.CRC32=a4116950
8	nbproject/build-impl.xml.stylesheet.CRC32=3f8b4615	8	nbproject/build-impl.xml.stylesheet.CRC32=deb65f65




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.gsf.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.highlights</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

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

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




import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JSeparator;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.project.Project;

import org.openide.filesystems.FileStatusListener;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.Repository;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.loaders.FolderLookup;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.FilterNode;
import org.openide.nodes.Node;
import org.openide.nodes.NodeOp;
import org.openide.util.ChangeSupport;
import org.openide.util.Lookup;
import org.openide.util.RequestProcessor;

            actions.add(null);
            
            // honor 57874 contact
            actions.add(null);
            actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
                Repository repository  = Repository.getDefault();
                FileSystem sfs = repository.getDefaultFileSystem();
                FileObject fo = sfs.findResource("Projects/Actions");  // NOI18N
                if (fo != null) {
                    DataObject dobj = DataObject.find(fo);
                    FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
                    Lookup.Template query = new Lookup.Template(Object.class);
                    Lookup lookup = actionRegistry.getLookup();
                    Iterator it = lookup.lookup(query).allInstances().iterator();
                    if (it.hasNext()) {
                        actions.add(null);
                    }
                    while (it.hasNext()) {
                        Object next = it.next();
                        if (next instanceof Action) {
                            actions.add(next);
                        } else if (next instanceof JSeparator) {
                            actions.add(null);
                        }
                    }
                }
            } catch (DataObjectNotFoundException ex) {
                // data folder for exitinf fileobject expected
                ErrorManager.getDefault().notify(ex);
            }
            
            actions.add(null);
            actions.add(CommonProjectActions.customizeProjectAction());

Lines 180-186 Link Here

(-)a/erlang.project/nbproject/project.xml (-1 / +1 lines)
180	<build-prerequisite/>	180	<build-prerequisite/>
181	<compile-dependency/>	181	<compile-dependency/>
182	<run-dependency>	182	<run-dependency>
183	<specification-version>7.3</specification-version>	183	<specification-version>7.6</specification-version>
184	</run-dependency>	184	</run-dependency>
185	</dependency>	185	</dependency>
186	<dependency>	186	<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.api.project.FileOwnerQuery;

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 311-317 Link Here

(-)a/scala.project/nbproject/project.xml (-1 / +1 lines)
311	<build-prerequisite/>	311	<build-prerequisite/>
312	<compile-dependency/>	312	<compile-dependency/>
313	<run-dependency>	313	<run-dependency>
314	<specification-version>6.5</specification-version>	314	<specification-version>7.6</specification-version>
315	</run-dependency>	315	</run-dependency>
316	</dependency>	316	</dependency>
317	<dependency>	317	<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.scala.platform.ScalaPlatform;

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;

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




import org.openide.filesystems.FileObject;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.FilterNode;

            actions.add(null);
            actions.add(SystemAction.get(FindAction.class));
            actions.add(null);
            // org.openide.nodes 7.6: actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
            if (fo != null) {
                for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) {
                    if (next instanceof Action) {
                        actions.add((Action) next);
                    } else if (next instanceof JSeparator) {
                        actions.add(null);
                    }
                }
            }*/
            actions.add(null);
            actions.add(SystemAction.get(ToolsAction.class));
            actions.add(null);

Return to bug 136334

Lines 44-50 Link Here

(-)a/autoproject.core/src/org/netbeans/modules/autoproject/core/LogicalViewImpl.java (-14 / +4 lines)
44	import java.util.List;	44	import java.util.List;
45	import java.util.MissingResourceException;	45	import java.util.MissingResourceException;
46	import javax.swing.Action;	46	import javax.swing.Action;
47	import javax.swing.JSeparator;
48	import org.netbeans.api.project.Project;	47	import org.netbeans.api.project.Project;
49	import org.netbeans.api.project.ProjectUtils;	48	import org.netbeans.api.project.ProjectUtils;
50	import org.netbeans.spi.project.ActionProvider;	49	import org.netbeans.spi.project.ActionProvider;
Lines 55-60 Link Here
55	import org.openide.actions.FindAction;	54	import org.openide.actions.FindAction;
56	import org.openide.nodes.AbstractNode;	55	import org.openide.nodes.AbstractNode;
57	import org.openide.nodes.Node;	56	import org.openide.nodes.Node;
		57	import org.openide.nodes.NodeOp;
58	import org.openide.util.Lookup;	58	import org.openide.util.Lookup;
59	import org.openide.util.NbBundle;	59	import org.openide.util.NbBundle;
60	import org.openide.util.Utilities;	60	import org.openide.util.Utilities;
Lines 127-134 Link Here
127	}	127	}
128	}	128	}
129	}	129	}
130	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	130	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
131	addFromLayers(actions, "Projects/org-netbeans-modules-autoproject/Actions"); // NOI18N	131	actions.addAll(NodeOp.actionsForPath("Projects/org-netbeans-modules-autoproject/Actions")); // NOI18N
132	actions.add(null);	132	actions.add(null);
133	actions.add(CommonProjectActions.setAsMainProjectAction());	133	actions.add(CommonProjectActions.setAsMainProjectAction());
134	actions.add(CommonProjectActions.openSubprojectsAction());	134	actions.add(CommonProjectActions.openSubprojectsAction());
Lines 142-163 Link Here
142	actions.add(null);	142	actions.add(null);
143	*/	143	*/
144	actions.add(SystemAction.get(FindAction.class));	144	actions.add(SystemAction.get(FindAction.class));
145	addFromLayers(actions, "Projects/Actions"); // NOI18N	145	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
146	actions.add(null);	146	actions.add(null);
147	/* XXX	147	/* XXX
148	actions.add(CommonProjectActions.customizeProjectAction());	148	actions.add(CommonProjectActions.customizeProjectAction());
149	*/	149	*/
150	return actions.toArray(new Action[actions.size()]);	150	return actions.toArray(new Action[actions.size()]);
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	}	151	}
162		152
163	/* XXX no rename support currently:	153	/* XXX no rename support currently:

Lines 42-52 Link Here

(-)a/bluej-suite/bluej/src/org/netbeans/bluej/nodes/BluejLogicalViewRootNode.java (-32 / +3 lines)
42	package org.netbeans.bluej.nodes;	42	package org.netbeans.bluej.nodes;
43		43
44	import java.util.ArrayList;	44	import java.util.ArrayList;
45	import java.util.Iterator;
46	import java.util.List;	45	import java.util.List;
47	import java.util.ResourceBundle;	46	import java.util.ResourceBundle;
48	import javax.swing.Action;	47	import javax.swing.Action;
49	import javax.swing.JSeparator;
50	import org.netbeans.api.java.project.JavaProjectConstants;	48	import org.netbeans.api.java.project.JavaProjectConstants;
51	import org.netbeans.api.project.ProjectInformation;	49	import org.netbeans.api.project.ProjectInformation;
52	import org.netbeans.api.project.ProjectUtils;	50	import org.netbeans.api.project.ProjectUtils;
Lines 58-75 Link Here
58	import org.netbeans.spi.project.ActionProvider;	56	import org.netbeans.spi.project.ActionProvider;
59	import org.netbeans.spi.project.ui.support.CommonProjectActions;	57	import org.netbeans.spi.project.ui.support.CommonProjectActions;
60	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;	58	import org.netbeans.spi.project.ui.support.ProjectSensitiveActions;
61	import org.openide.ErrorManager;
62	import org.openide.actions.FindAction;	59	import org.openide.actions.FindAction;
63	import org.openide.actions.ToolsAction;	60	import org.openide.actions.ToolsAction;
64	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
65	import org.openide.filesystems.Repository;
66	import org.openide.loaders.DataFolder;
67	import org.openide.loaders.DataObject;	62	import org.openide.loaders.DataObject;
68	import org.openide.loaders.DataObjectNotFoundException;
69	import org.openide.loaders.FolderLookup;
70	import org.openide.nodes.AbstractNode;	63	import org.openide.nodes.AbstractNode;
71	import org.openide.nodes.FilterNode;	64	import org.openide.nodes.FilterNode;
72	import org.openide.nodes.Node;	65	import org.openide.nodes.Node;
		66	import org.openide.nodes.NodeOp;
73	import org.openide.util.Lookup;	67	import org.openide.util.Lookup;
74	import org.openide.util.NbBundle;	68	import org.openide.util.NbBundle;
75	import org.openide.util.actions.SystemAction;	69	import org.openide.util.actions.SystemAction;
Lines 136-166 Link Here
136	actions.add(SystemAction.get(FindAction.class));	130	actions.add(SystemAction.get(FindAction.class));
137		131
138	// honor 57874 contact	132	// honor 57874 contact
139		133	actions.add(null);
140	try {	134	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
141	FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N
142	if (fo != null) {
143	DataObject dobj = DataObject.find(fo);
144	FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
145	Lookup.Template query = new Lookup.Template(Object.class);
146	Lookup lookup = actionRegistry.getLookup();
147	Iterator it = lookup.lookup(query).allInstances().iterator();
148	if (it.hasNext()) {
149	actions.add(null);
150	}
151	while (it.hasNext()) {
152	Object next = it.next();
153	if (next instanceof Action) {
154	actions.add(next);
155	} else if (next instanceof JSeparator) {
156	actions.add(null);
157	}
158	}
159	}
160	} catch (DataObjectNotFoundException ex) {
161	// data folder for existing fileobject expected
162	ErrorManager.getDefault().notify(ex);
163	}
164		135
165	actions.add(null);	136	actions.add(null);
166	actions.add(SystemAction.get(ToolsAction.class));	137	actions.add(SystemAction.get(ToolsAction.class));

Lines 61-67 Link Here

(-)a/contrib/latex/guiproject/src/org/netbeans/modules/latex/guiproject/LaTeXGUIProject.java (-31 / +3 lines)
61	import javax.swing.Action;	61	import javax.swing.Action;
62	import javax.swing.Icon;	62	import javax.swing.Icon;
63	import javax.swing.ImageIcon;	63	import javax.swing.ImageIcon;
64	import javax.swing.JSeparator;
65	import javax.swing.event.ChangeEvent;	64	import javax.swing.event.ChangeEvent;
66	import javax.swing.event.ChangeListener;	65	import javax.swing.event.ChangeListener;
67	import org.netbeans.api.project.Project;	66	import org.netbeans.api.project.Project;
Lines 82-96 Link Here
82	import org.openide.filesystems.FileStatusListener;	81	import org.openide.filesystems.FileStatusListener;
83	import org.openide.filesystems.FileSystem;	82	import org.openide.filesystems.FileSystem;
84	import org.openide.filesystems.FileUtil;	83	import org.openide.filesystems.FileUtil;
85	import org.openide.filesystems.Repository;
86	import org.openide.loaders.DataFolder;
87	import org.openide.loaders.DataObject;	84	import org.openide.loaders.DataObject;
88	import org.openide.loaders.DataObjectNotFoundException;	85	import org.openide.loaders.DataObjectNotFoundException;
89	import org.openide.loaders.FolderLookup;
90	import org.openide.nodes.AbstractNode;	86	import org.openide.nodes.AbstractNode;
91	import org.openide.nodes.Children;	87	import org.openide.nodes.Children;
92	import org.openide.nodes.FilterNode;	88	import org.openide.nodes.FilterNode;
93	import org.openide.nodes.Node;	89	import org.openide.nodes.Node;
		90	import org.openide.nodes.NodeOp;
94	import org.openide.util.ChangeSupport;	91	import org.openide.util.ChangeSupport;
95	import org.openide.util.Lookup;	92	import org.openide.util.Lookup;
96	import org.openide.util.RequestProcessor;	93	import org.openide.util.RequestProcessor;
Lines 284-316 Link Here
284	actions.add(null);	281	actions.add(null);
285		282
286	// honor 57874 contact	283	// honor 57874 contact
287		284	actions.add(null);
288	try {	285	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
289	Repository repository = Repository.getDefault();
290	FileSystem sfs = repository.getDefaultFileSystem();
291	FileObject fo = sfs.findResource("Projects/Actions"); // NOI18N
292	if (fo != null) {
293	DataObject dobj = DataObject.find(fo);
294	FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
295	Lookup.Template query = new Lookup.Template(Object.class);
296	Lookup lookup = actionRegistry.getLookup();
297	Iterator it = lookup.lookup(query).allInstances().iterator();
298	if (it.hasNext()) {
299	actions.add(null);
300	}
301	while (it.hasNext()) {
302	Object next = it.next();
303	if (next instanceof Action) {
304	actions.add(next);
305	} else if (next instanceof JSeparator) {
306	actions.add(null);
307	}
308	}
309	}
310	} catch (DataObjectNotFoundException ex) {
311	// data folder for exitinf fileobject expected
312	ErrorManager.getDefault().notify(ex);
313	}
314		286
315	actions.add(null);	287	actions.add(null);
316	actions.add(CommonProjectActions.customizeProjectAction());	288	actions.add(CommonProjectActions.customizeProjectAction());

Lines 44-54 Link Here

(-)a/erlang.project/src/org/netbeans/modules/erlang/project/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.api.project.FileOwnerQuery;	52	import org.netbeans.api.project.FileOwnerQuery;
Lines 77-82 Link Here
77	import org.openide.loaders.DataObject;	75	import org.openide.loaders.DataObject;
78	import org.openide.nodes.AbstractNode;	76	import org.openide.nodes.AbstractNode;
79	import org.openide.nodes.Node;	77	import org.openide.nodes.Node;
		78	import org.openide.nodes.NodeOp;
80	import org.openide.util.HelpCtx;	79	import org.openide.util.HelpCtx;
81	import org.openide.util.NbBundle;	80	import org.openide.util.NbBundle;
82	import org.openide.util.Utilities;	81	import org.openide.util.Utilities;
Lines 367-384 Link Here
367	actions.add(SystemAction.get(FindAction.class));	366	actions.add(SystemAction.get(FindAction.class));
368		367
369	// honor 57874 contact	368	// honor 57874 contact
370		369	actions.add(null);
371	Collection<? extends Object> res = Lookups.forPath("Projects/Actions").lookupAll(Object.class); // NOI18N	370	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
372	if (!res.isEmpty()) {
373	actions.add(null);
374	for (Object next : res) {
375	if (next instanceof Action) {
376	actions.add((Action) next);
377	} else if (next instanceof JSeparator) {
378	actions.add(null);
379	}
380	}
381	}
382		371
383	actions.add(null);	372	actions.add(null);
384	// if (broken) {	373	// if (broken) {

Lines 52-58 Link Here

(-)a/scala.project/src/org/netbeans/modules/scala/project/ui/J2SELogicalViewProvider.java (-15 / +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.scala.platform.ScalaPlatform;	57	import org.netbeans.api.scala.platform.ScalaPlatform;
Lines 85-90 Link Here
85	import org.openide.modules.SpecificationVersion;	84	import org.openide.modules.SpecificationVersion;
86	import org.openide.nodes.AbstractNode;	85	import org.openide.nodes.AbstractNode;
87	import org.openide.nodes.Node;	86	import org.openide.nodes.Node;
		87	import org.openide.nodes.NodeOp;
88	import org.openide.util.ChangeSupport;	88	import org.openide.util.ChangeSupport;
89	import org.openide.util.HelpCtx;	89	import org.openide.util.HelpCtx;
90	import org.openide.util.Lookup;	90	import org.openide.util.Lookup;
Lines 325-332 Link Here
325	actions.add(ProjectSensitiveActions.projectCommandAction(JavaProjectConstants.COMMAND_JAVADOC, bundle.getString("LBL_JavadocAction_Name"), null)); // NOI18N	325	actions.add(ProjectSensitiveActions.projectCommandAction(JavaProjectConstants.COMMAND_JAVADOC, bundle.getString("LBL_JavadocAction_Name"), null)); // NOI18N
326	actions.add(null);	326	actions.add(null);
327	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N	327	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N
328	addFromLayers(actions, "Projects/Debugger_Actions_temporary"); //NOI18N	328	actions.addAll(NodeOp.actionsForPath("Projects/Debugger_Actions_temporary")); //NOI18N
329	addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N	329	actions.addAll(NodeOp.actionsForPath("Projects/Profiler_Actions_temporary")); //NOI18N
330	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N	330	actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N
331	actions.add(CommonProjectActions.setProjectConfigurationAction());	331	actions.add(CommonProjectActions.setProjectConfigurationAction());
332	actions.add(null);	332	actions.add(null);
Lines 342-348 Link Here
342	actions.add(SystemAction.get(FindAction.class));	342	actions.add(SystemAction.get(FindAction.class));
343		343
344	// honor 57874 contact	344	// honor 57874 contact
345	addFromLayers(actions, "Projects/Actions"); //NOI18N	345	actions.addAll(NodeOp.actionsForPath("Projects/Actions")); //NOI18N
346		346
347	actions.add(null);	347	actions.add(null);
348	if (broken) {	348	if (broken) {
Lines 352-368 Link Here
352		352
353	return actions.toArray(new Action[actions.size()]);	353	return actions.toArray(new Action[actions.size()]);
354		354
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	}	355	}
367		356
368	private void setBroken(boolean broken) {	357	private void setBroken(boolean broken) {

Lines 66-72 Link Here

(-)a/themebuilder/src/org/netbeans/modules/themebuilder/project/view/ThemeBuilderViewProvider.java (-11 / +1 lines)
66	import org.openide.filesystems.FileObject;	66	import org.openide.filesystems.FileObject;
67	import org.openide.loaders.DataFolder;	67	import org.openide.loaders.DataFolder;
68	import org.openide.loaders.DataObjectNotFoundException;	68	import org.openide.loaders.DataObjectNotFoundException;
69	import org.openide.nodes.AbstractNode;
70	import org.openide.nodes.AbstractNode;	69	import org.openide.nodes.AbstractNode;
71	import org.openide.nodes.Children;	70	import org.openide.nodes.Children;
72	import org.openide.nodes.FilterNode;	71	import org.openide.nodes.FilterNode;
Lines 169-184 Link Here
169	actions.add(null);	168	actions.add(null);
170	actions.add(SystemAction.get(FindAction.class));	169	actions.add(SystemAction.get(FindAction.class));
171	actions.add(null);	170	actions.add(null);
172	/*FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N	171	// org.openide.nodes 7.6: actions.addAll(NodeOp.actionsForPath("Projects/Actions")); // NOI18N
173	if (fo != null) {
174	for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) {
175	if (next instanceof Action) {
176	actions.add((Action) next);
177	} else if (next instanceof JSeparator) {
178	actions.add(null);
179	}
180	}
181	}*/
182	actions.add(null);	172	actions.add(null);
183	actions.add(SystemAction.get(ToolsAction.class));	173	actions.add(SystemAction.get(ToolsAction.class));
184	actions.add(null);	174	actions.add(null);