Attachment #20482 for bug #54218

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 54218
Collapse All | Expand All





package org.netbeans.modules.html;

import java.util.*;
import java.io.IOException;

import org.openide.actions.*;
import org.openide.loaders.UniFileLoader;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.DataObjectExistsException;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;


/**
* Loader for Html DataObjects.

*/
public class HtmlLoader extends UniFileLoader {


    static final long serialVersionUID =-5809935261731217882L;
    
    public HtmlLoader() {


    }

    
    protected MultiDataObject createMultiObject (final FileObject primaryFile)
    throws DataObjectExistsException, IOException {
        return new HtmlDataObject (primaryFile, this);

                       getString("PROP_HtmlLoader_Name");
    }
    
    protected String actionsContext() {
        return "Loaders/text/html/Actions/"; // NOI18N
    protected SystemAction[] defaultActions () {
        return new SystemAction[] {
                        SystemAction.get (OpenAction.class),
                        SystemAction.get (ViewAction.class),
                        SystemAction.get (FileSystemAction.class),
                        null,
                        SystemAction.get (CutAction.class),
                        SystemAction.get (CopyAction.class),
                        SystemAction.get (PasteAction.class),
                        null,
                        SystemAction.get (DeleteAction.class),
                        SystemAction.get (RenameAction.class),
                        null,
                        SystemAction.get (SaveAsTemplateAction.class),
                        null,
                        SystemAction.get (ToolsAction.class),
                        SystemAction.get (PropertiesAction.class),
                    };

    }
    
}




package org.netbeans.modules.web.core.jsploader;

import java.io.IOException;

import org.openide.actions.*;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.ExtensionList;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.UniFileLoader;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;

/**
* Loader for JSPs.

        return NbBundle.getBundle(JspLoader.class).getString("PROP_JspLoader_Name");
    }
    
    protected String actionsContext() {
        return "Loaders/text/x-jsp/Actions/"; // NOI18N
     */
    protected SystemAction[] defaultActions () {
        return new SystemAction[] {
                        SystemAction.get (OpenAction.class),
                        SystemAction.get (EditServletAction.class),
                        SystemAction.get (FileSystemAction.class),
                        null,
                        SystemAction.get (CutAction.class),
                        SystemAction.get (CopyAction.class),
                        SystemAction.get (PasteAction.class),
                        null,
                        SystemAction.get (DeleteAction.class),
                        SystemAction.get (RenameAction.class),
                        null,
                        SystemAction.get (SaveAsTemplateAction.class),
                        null,
                        SystemAction.get (ToolsAction.class),
                        SystemAction.get (PropertiesAction.class),
                    };
    }
    
    public JspLoader() {

Lines 55-60 Link Here

(-)web/project/src/org/netbeans/modules/web/project/ui/resources/layer.xml (+111 lines)
55	<folder name="text">	55	<folder name="text">
56	<folder name="x-jsp">	56	<folder name="x-jsp">
57	<folder name="Actions">	57	<folder name="Actions">
		58	<file name="OpenAction.instance">
		59	<attr name="instanceClass" stringvalue="org.openide.actions.OpenAction" />
		60	</file>
58	<attr boolvalue="true" name="OpenAction.instance/web-project-separator-1.instance" />	61	<attr boolvalue="true" name="OpenAction.instance/web-project-separator-1.instance" />
59	<file name="web-project-separator-1.instance">	62	<file name="web-project-separator-1.instance">
60	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />	63	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
Lines 80-89 Link Here
80	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />	83	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
81	</file>	84	</file>
82	<attr boolvalue="true" name="web-project-separator-3.instance/FileSystemAction.instance" />	85	<attr boolvalue="true" name="web-project-separator-3.instance/FileSystemAction.instance" />
		86
		87	<file name="web-project-separator-4.instance">
		88	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		89	</file>
		90	<attr boolvalue="true" name="web-project-separator-4.instance/CutAction.instance" />
		91	<file name="CutAction.instance">
		92	<attr name="instanceClass" stringvalue="org.openide.actions.CutAction" />
		93	</file>
		94	<attr boolvalue="true" name="CutAction.instance/CopyAction.instance" />
		95	<file name="CopyAction.instance">
		96	<attr name="instanceClass" stringvalue="org.openide.actions.CopyAction" />
		97	</file>
		98	<attr boolvalue="true" name="CopyAction.instance/PasteAction.instance" />
		99	<file name="PasteAction.instance">
		100	<attr name="instanceClass" stringvalue="org.openide.actions.PasteAction" />
		101	</file>
		102	<attr boolvalue="true" name="PasteAction.instance/web-project-separator-5.instance" />
		103	<file name="web-project-separator-5.instance">
		104	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		105	</file>
		106	<attr boolvalue="true" name="web-project-separator-5.instance/NewAction.instance" />
		107	<file name="NewAction.instance">
		108	<attr name="instanceClass" stringvalue="org.openide.actions.NewAction" />
		109	</file>
		110	<attr boolvalue="true" name="NewAction.instance/DeleteAction.instance" />
		111	<file name="DeleteAction.instance">
		112	<attr name="instanceClass" stringvalue="org.openide.actions.DeleteAction" />
		113	</file>
		114	<attr boolvalue="true" name="DeleteAction.instance/RenameAction.instance" />
		115	<file name="RenameAction.instance">
		116	<attr name="instanceClass" stringvalue="org.openide.actions.RenameAction" />
		117	</file>
		118	<attr boolvalue="true" name="RenameAction.instance/web-project-separator-6.instance" />
		119	<file name="web-project-separator-6.instance">
		120	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		121	</file>
		122	<attr boolvalue="true" name="web-project-separator-6.instance/SaveAsTemplateAction.instance" />
		123	<file name="SaveAsTemplateAction.instance">
		124	<attr name="instanceClass" stringvalue="org.openide.actions.SaveAsTemplateAction" />
		125	</file>
		126	<attr boolvalue="true" name="SaveAsTemplateAction.instance/web-project-separator-7.instance" />
		127	<file name="web-project-separator-7.instance">
		128	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		129	</file>
		130	<attr boolvalue="true" name="web-project-separator-7.instance/ToolsAction.instance" />
		131	<file name="ToolsAction.instance">
		132	<attr name="instanceClass" stringvalue="org.openide.actions.ToolsAction" />
		133	</file>
		134	<attr boolvalue="true" name="ToolsAction.instance/PropertiesAction.instance" />
		135	<file name="PropertiesAction.instance">
		136	<attr name="instanceClass" stringvalue="org.openide.actions.PropertiesAction" />
		137	</file>
		138
83	</folder>	139	</folder>
84	</folder>	140	</folder>
85	<folder name="html">	141	<folder name="html">
86	<folder name="Actions">	142	<folder name="Actions">
		143	<file name="OpenAction.instance">
		144	<attr name="instanceClass" stringvalue="org.openide.actions.OpenAction" />
		145	</file>
87	<attr boolvalue="true" name="OpenAction.instance/web-project-separator-2.instance" />	146	<attr boolvalue="true" name="OpenAction.instance/web-project-separator-2.instance" />
88	<file name="web-project-separator-2.instance">	147	<file name="web-project-separator-2.instance">
89	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />	148	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
Lines 101-106 Link Here
101	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />	160	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
102	</file>	161	</file>
103	<attr boolvalue="true" name="web-project-separator-3.instance/FileSystemAction.instance" />	162	<attr boolvalue="true" name="web-project-separator-3.instance/FileSystemAction.instance" />
		163
		164	<file name="web-project-separator-4.instance">
		165	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		166	</file>
		167	<attr boolvalue="true" name="web-project-separator-4.instance/CutAction.instance" />
		168	<file name="CutAction.instance">
		169	<attr name="instanceClass" stringvalue="org.openide.actions.CutAction" />
		170	</file>
		171	<attr boolvalue="true" name="CutAction.instance/CopyAction.instance" />
		172	<file name="CopyAction.instance">
		173	<attr name="instanceClass" stringvalue="org.openide.actions.CopyAction" />
		174	</file>
		175	<attr boolvalue="true" name="CopyAction.instance/PasteAction.instance" />
		176	<file name="PasteAction.instance">
		177	<attr name="instanceClass" stringvalue="org.openide.actions.PasteAction" />
		178	</file>
		179	<attr boolvalue="true" name="PasteAction.instance/web-project-separator-5.instance" />
		180	<file name="web-project-separator-5.instance">
		181	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		182	</file>
		183	<attr boolvalue="true" name="web-project-separator-5.instance/NewAction.instance" />
		184	<file name="NewAction.instance">
		185	<attr name="instanceClass" stringvalue="org.openide.actions.NewAction" />
		186	</file>
		187	<attr boolvalue="true" name="NewAction.instance/DeleteAction.instance" />
		188	<file name="DeleteAction.instance">
		189	<attr name="instanceClass" stringvalue="org.openide.actions.DeleteAction" />
		190	</file>
		191	<attr boolvalue="true" name="DeleteAction.instance/RenameAction.instance" />
		192	<file name="RenameAction.instance">
		193	<attr name="instanceClass" stringvalue="org.openide.actions.RenameAction" />
		194	</file>
		195	<attr boolvalue="true" name="RenameAction.instance/web-project-separator-6.instance" />
		196	<file name="web-project-separator-6.instance">
		197	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		198	</file>
		199	<attr boolvalue="true" name="web-project-separator-6.instance/SaveAsTemplateAction.instance" />
		200	<file name="SaveAsTemplateAction.instance">
		201	<attr name="instanceClass" stringvalue="org.openide.actions.SaveAsTemplateAction" />
		202	</file>
		203	<attr boolvalue="true" name="SaveAsTemplateAction.instance/web-project-separator-7.instance" />
		204	<file name="web-project-separator-7.instance">
		205	<attr name="instanceClass" stringvalue="javax.swing.JSeparator" />
		206	</file>
		207	<attr boolvalue="true" name="web-project-separator-7.instance/ToolsAction.instance" />
		208	<file name="ToolsAction.instance">
		209	<attr name="instanceClass" stringvalue="org.openide.actions.ToolsAction" />
		210	</file>
		211	<attr boolvalue="true" name="ToolsAction.instance/PropertiesAction.instance" />
		212	<file name="PropertiesAction.instance">
		213	<attr name="instanceClass" stringvalue="org.openide.actions.PropertiesAction" />
		214	</file>
104	</folder>	215	</folder>
105	</folder>	216	</folder>
106	</folder>	217	</folder>

Return to bug 54218

Lines 13-29 Link Here

(-)html/src/org/netbeans/modules/html/HtmlLoader.java (-29 / +2 lines)
13		13
14	package org.netbeans.modules.html;	14	package org.netbeans.modules.html;
15		15
16	import java.util.*;
17	import java.io.IOException;	16	import java.io.IOException;
18
19	import org.openide.actions.*;
20	import org.openide.loaders.UniFileLoader;	17	import org.openide.loaders.UniFileLoader;
21	import org.openide.loaders.MultiDataObject;	18	import org.openide.loaders.MultiDataObject;
22	import org.openide.loaders.DataObjectExistsException;	19	import org.openide.loaders.DataObjectExistsException;
23	import org.openide.filesystems.FileObject;	20	import org.openide.filesystems.FileObject;
24	import org.openide.util.NbBundle;	21	import org.openide.util.NbBundle;
25	import org.openide.util.actions.SystemAction;
26
27		22
28	/**	23	/**
29	* Loader for Html DataObjects.	24	* Loader for Html DataObjects.
Lines 32-38 Link Here
32	*/	27	*/
33	public class HtmlLoader extends UniFileLoader {	28	public class HtmlLoader extends UniFileLoader {
34		29
35
36	static final long serialVersionUID =-5809935261731217882L;	30	static final long serialVersionUID =-5809935261731217882L;
37		31
38	public HtmlLoader() {	32	public HtmlLoader() {
Lines 47-53 Link Here
47		41
48	}	42	}
49		43
50
51	protected MultiDataObject createMultiObject (final FileObject primaryFile)	44	protected MultiDataObject createMultiObject (final FileObject primaryFile)
52	throws DataObjectExistsException, IOException {	45	throws DataObjectExistsException, IOException {
53	return new HtmlDataObject (primaryFile, this);	46	return new HtmlDataObject (primaryFile, this);
Lines 61-87 Link Here
61	getString("PROP_HtmlLoader_Name");	54	getString("PROP_HtmlLoader_Name");
62	}	55	}
63		56
64	/** Get default actions for HTML documents.	57	protected String actionsContext() {
65	*/	58	return "Loaders/text/html/Actions/"; // NOI18N
66	protected SystemAction[] defaultActions () {
67	return new SystemAction[] {
68	SystemAction.get (OpenAction.class),
69	SystemAction.get (ViewAction.class),
70	SystemAction.get (FileSystemAction.class),
71	null,
72	SystemAction.get (CutAction.class),
73	SystemAction.get (CopyAction.class),
74	SystemAction.get (PasteAction.class),
75	null,
76	SystemAction.get (DeleteAction.class),
77	SystemAction.get (RenameAction.class),
78	null,
79	SystemAction.get (SaveAsTemplateAction.class),
80	null,
81	SystemAction.get (ToolsAction.class),
82	SystemAction.get (PropertiesAction.class),
83	};
84
85	}	59	}
86
87	}	60	}

Lines 14-30 Link Here

(-)web/core/src/org/netbeans/modules/web/core/jsploader/JspLoader.java (-26 / +2 lines)
14	package org.netbeans.modules.web.core.jsploader;	14	package org.netbeans.modules.web.core.jsploader;
15		15
16	import java.io.IOException;	16	import java.io.IOException;
17
18	import org.openide.actions.*;
19	import org.openide.filesystems.FileObject;	17	import org.openide.filesystems.FileObject;
20	import org.openide.filesystems.FileStateInvalidException;
21	import org.openide.loaders.DataObjectExistsException;	18	import org.openide.loaders.DataObjectExistsException;
22	import org.openide.loaders.ExtensionList;	19	import org.openide.loaders.ExtensionList;
23	import org.openide.loaders.MultiDataObject;	20	import org.openide.loaders.MultiDataObject;
24	import org.openide.loaders.UniFileLoader;	21	import org.openide.loaders.UniFileLoader;
25	import org.openide.nodes.Node;
26	import org.openide.util.NbBundle;	22	import org.openide.util.NbBundle;
27	import org.openide.util.actions.SystemAction;
28		23
29	/**	24	/**
30	* Loader for JSPs.	25	* Loader for JSPs.
Lines 90-116 Link Here
90	return NbBundle.getBundle(JspLoader.class).getString("PROP_JspLoader_Name");	85	return NbBundle.getBundle(JspLoader.class).getString("PROP_JspLoader_Name");
91	}	86	}
92		87
93	/** Get default actions.	88	protected String actionsContext() {
94	* @return array of default system actions.	89	return "Loaders/text/x-jsp/Actions/"; // NOI18N
95	*/
96	protected SystemAction[] defaultActions () {
97	return new SystemAction[] {
98	SystemAction.get (OpenAction.class),
99	SystemAction.get (EditServletAction.class),
100	SystemAction.get (FileSystemAction.class),
101	null,
102	SystemAction.get (CutAction.class),
103	SystemAction.get (CopyAction.class),
104	SystemAction.get (PasteAction.class),
105	null,
106	SystemAction.get (DeleteAction.class),
107	SystemAction.get (RenameAction.class),
108	null,
109	SystemAction.get (SaveAsTemplateAction.class),
110	null,
111	SystemAction.get (ToolsAction.class),
112	SystemAction.get (PropertiesAction.class),
113	};
114	}	90	}
115		91
116	public JspLoader() {	92	public JspLoader() {