Index: html/src/org/netbeans/modules/html/HtmlLoader.java
===================================================================
RCS file: /cvs/html/src/org/netbeans/modules/html/HtmlLoader.java,v
retrieving revision 1.38
diff -u -r1.38 HtmlLoader.java
--- html/src/org/netbeans/modules/html/HtmlLoader.java 19 May 2004 12:32:52 -0000 1.38
+++ html/src/org/netbeans/modules/html/HtmlLoader.java 23 Feb 2005 16:04:08 -0000
@@ -13,17 +13,12 @@
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.
@@ -32,7 +27,6 @@
*/
public class HtmlLoader extends UniFileLoader {
-
static final long serialVersionUID =-5809935261731217882L;
public HtmlLoader() {
@@ -47,7 +41,6 @@
}
-
protected MultiDataObject createMultiObject (final FileObject primaryFile)
throws DataObjectExistsException, IOException {
return new HtmlDataObject (primaryFile, this);
@@ -61,27 +54,7 @@
getString("PROP_HtmlLoader_Name");
}
- /** Get default actions for HTML documents.
- */
- 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),
- };
-
+ protected String actionsContext() {
+ return "Loaders/text/html/Actions/"; // NOI18N
}
-
}
Index: web/core/src/org/netbeans/modules/web/core/jsploader/JspLoader.java
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/jsploader/JspLoader.java,v
retrieving revision 1.19
diff -u -r1.19 JspLoader.java
--- web/core/src/org/netbeans/modules/web/core/jsploader/JspLoader.java 22 May 2004 00:43:34 -0000 1.19
+++ web/core/src/org/netbeans/modules/web/core/jsploader/JspLoader.java 23 Feb 2005 16:04:08 -0000
@@ -14,17 +14,12 @@
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.
@@ -90,27 +85,8 @@
return NbBundle.getBundle(JspLoader.class).getString("PROP_JspLoader_Name");
}
- /** Get default actions.
- * @return array of default system actions.
- */
- 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),
- };
+ protected String actionsContext() {
+ return "Loaders/text/x-jsp/Actions/"; // NOI18N
}
public JspLoader() {
Index: web/project/src/org/netbeans/modules/web/project/ui/resources/layer.xml
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/ui/resources/layer.xml,v
retrieving revision 1.16
diff -u -r1.16 layer.xml
--- web/project/src/org/netbeans/modules/web/project/ui/resources/layer.xml 28 Jan 2005 12:46:20 -0000 1.16
+++ web/project/src/org/netbeans/modules/web/project/ui/resources/layer.xml 23 Feb 2005 16:04:08 -0000
@@ -55,6 +55,9 @@
+
+
+
@@ -80,10 +83,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -101,6 +160,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+