[hg] main-silver: Registering mime types with @MimeResolver.xyzR...
- From: Jaroslav Tulach < >
- To: , , , , , , , , , , , , , , , , , , , ,
- Subject: [hg] main-silver: Registering mime types with @MimeResolver.xyzR...
- Date: Thu, 02 Feb 2012 11:27:04 -0800
changeset e7d30459a7f9 in main-silver (marshall-mime-resolvers-191777)
details: http://hg.netbeans.org/main-silver/rev/e7d30459a7f9
description:
Registering mime types with @MimeResolver.xyzRegistration
diffstat:
cnd.asm/nbproject/project.xml
| 2 +-
cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
| 7 +
cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
| 1 +
cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmResolver.xml
| 13 -
cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
| 1 -
cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
| 9 -
cnd.script/src/org/netbeans/modules/cnd/script/loaders/ShellDataObject.java
| 4 +-
cnd.script/src/org/netbeans/modules/cnd/script/resources/layer.xml
| 12 -
cnd.source/nbproject/project.xml
| 2 +-
cnd.source/src/org/netbeans/modules/cnd/source/Bundle.properties
| 3 +
cnd.source/src/org/netbeans/modules/cnd/source/CCDataObject.java
| 3 +
cnd.source/src/org/netbeans/modules/cnd/source/resources/Bundle.properties
| 2 -
cnd.source/src/org/netbeans/modules/cnd/source/resources/layer.xml
| 14 -
cnd/nbproject/project.xml
| 2 +-
cnd/src/org/netbeans/modules/cnd/loaders/Bundle.properties
| 6 +-
cnd/src/org/netbeans/modules/cnd/loaders/CMakeDataObject.java
| 7 +-
cnd/src/org/netbeans/modules/cnd/loaders/CndDataNode.java
| 6 +
cnd/src/org/netbeans/modules/cnd/loaders/ExeObject.java
| 6 +
cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
| 17 --
core.ide/src/org/netbeans/core/ide/ServiceTabProcessor.java
| 9 +
core.ide/src/org/netbeans/core/ide/resources/layer.xml
| 7 -
core.ide/src/org/netbeans/core/ide/resources/plain-text-resolver.xml
| 52 -------
css.editor/nbproject/project.xml
| 2 +-
css.editor/src/org/netbeans/modules/css/editor/CssProjectSupport.java
| 9 +
css.editor/src/org/netbeans/modules/css/resources/cssResolver.xml
| 8 -
css.editor/src/org/netbeans/modules/css/resources/layer.xml
| 9 -
db.core/nbproject/project.xml
| 2 +-
db.core/src/org/netbeans/modules/db/core/Bundle.properties
| 1 -
db.core/src/org/netbeans/modules/db/core/resources/layer.xml
| 8 -
db.core/src/org/netbeans/modules/db/sql/loader/Bundle.properties
| 2 +
db.core/src/org/netbeans/modules/db/sql/loader/SQLDataObject.java
| 7 +
dbschema/nbproject/project.xml
| 2 +-
dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
| 7 +
dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/dbschema-mime-resolver.xml
| 16 --
dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/mf-layer.xml
| 9 -
dbschema/src/org/netbeans/modules/dbschema/resources/Bundle.properties
| 3 +-
groovy.editor/nbproject/project.xml
| 2 +-
groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
| 2 -
groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
| 4 +-
groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
| 8 +-
groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyMimeResolver.xml
| 51 -------
groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
| 10 -
html/nbproject/project.xml
| 2 +-
html/src/org/netbeans/modules/html/Bundle.properties
| 2 +-
html/src/org/netbeans/modules/html/HtmlDataObject.java
| 7 +-
html/src/org/netbeans/modules/html/mf-layer.xml
| 10 -
image/nbproject/project.xml
| 2 +-
image/src/org/netbeans/modules/image/Bundle.properties
| 5 +-
image/src/org/netbeans/modules/image/ImageDataObject.java
| 25 +++
image/src/org/netbeans/modules/image/Layer.xml
| 11 -
image/src/org/netbeans/modules/image/image-mime-resolver.xml
| 72 ----------
j2ee.sun.appsrv/nbproject/project.xml
| 2 +-
j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/XResolver.xml
| 11 -
j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/layer.xml
| 9 -
j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
| 13 +-
java.hints.declarative/nbproject/project.xml
| 2 +-
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/HintDataObject.java
| 4 +
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestResolver.xml
| 11 -
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintResolver.xml
| 11 -
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/layer.xml
| 12 -
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/DeclarativeHintsTestDataObject.java
| 4 +
java.j2seplatform/nbproject/project.xml
| 2 +-
java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/Bundle.properties
| 49 ------
java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
| 6 -
java.j2seplatform/src/org/netbeans/modules/java/jarloader/Bundle.properties
| 1 +
java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataObject.java
| 2 +
javacard.apdufile/nbproject/project.xml
| 20 +-
javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduDataObject.java
| 2 +
javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduResolver.xml
| 11 -
javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/layer.xml
| 8 -
javacard.ri.platform/nbproject/project.xml
| 2 +-
javacard.ri.platform/src/org/netbeans/modules/javacard/ri/card/CardProperties.java
| 9 +
javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/CardResolver.xml
| 52 -------
javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/JavacardPlatformResolver.xml
| 52 -------
javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/layer.xml
| 12 -
javafx2.editor/nbproject/project.xml
| 2 +-
javafx2.editor/src/org/netbeans/modules/javafx2/editor/fxml/FXMLDataObject.java
| 2 +
javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/fxml-mime-resolver.xml
| 51 -------
javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/layer.xml
| 9 -
javascript.editing/src/org/netbeans/modules/javascript/editing/Bundle.properties
| 2 +-
javascript.editing/src/org/netbeans/modules/javascript/editing/JsUtils.java
| 3 +-
javascript.editing/src/org/netbeans/modules/javascript/editing/layer.xml
| 9 -
javawebstart/nbproject/project.xml
| 2 +-
javawebstart/src/org/netbeans/modules/javawebstart/Bundle.properties
| 2 +-
javawebstart/src/org/netbeans/modules/javawebstart/JnlpDataObject.java
| 7 +
javawebstart/src/org/netbeans/modules/javawebstart/JnlpResolver.xml
| 51 -------
javawebstart/src/org/netbeans/modules/javawebstart/layer.xml
| 8 -
languages.diff/nbproject/project.xml
| 2 +-
languages.diff/src/org/netbeans/modules/languages/diff/Bundle.properties
| 2 +-
languages.diff/src/org/netbeans/modules/languages/diff/Diff.xml
| 27 ---
languages.diff/src/org/netbeans/modules/languages/diff/DiffDataObject.java
| 7 +
languages.diff/src/org/netbeans/modules/languages/diff/layer.xml
| 8 -
languages.ini/nbproject/project.xml
| 2 +-
languages.ini/src/org/netbeans/modules/languages/ini/IniDataObject.java
| 8 +
languages.ini/src/org/netbeans/modules/languages/ini/resources/Bundle.properties
| 1 -
languages.ini/src/org/netbeans/modules/languages/ini/resources/Ini.xml
| 26 ---
languages.ini/src/org/netbeans/modules/languages/ini/resources/layer.xml
| 8 -
languages.manifest/nbproject/project.xml
| 2 +-
languages.manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties
| 2 +-
languages.manifest/src/org/netbeans/modules/languages/manifest/Manifest.xml
| 26 ---
languages.manifest/src/org/netbeans/modules/languages/manifest/MfDataObject.java
| 8 +-
languages.manifest/src/org/netbeans/modules/languages/manifest/layer.xml
| 8 -
languages.neon/nbproject/project.xml
| 2 +-
languages.neon/src/org/netbeans/modules/languages/neon/NeonDataObject.java
| 8 +
languages.neon/src/org/netbeans/modules/languages/neon/resources/Bundle.properties
| 1 -
languages.neon/src/org/netbeans/modules/languages/neon/resources/NeonResolver.xml
| 11 -
languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml
| 8 -
languages.yaml/nbproject/project.xml
| 24 +-
languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties
| 2 +-
languages.yaml/src/org/netbeans/modules/languages/yaml/YAML.xml
| 52 -------
languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
| 7 +
languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
| 8 -
languages/nbproject/project.xml
| 2 +-
languages/src/org/netbeans/modules/languages/dataobject/Bundle.properties
| 1 +
languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java
| 7 +
languages/src/org/netbeans/modules/languages/resources/Languagesresolver.xml
| 51 -------
languages/src/org/netbeans/modules/languages/resources/layer.xml
| 8 -
maven.grammar/nbproject/project.xml
| 2 +-
maven.grammar/src/org/netbeans/modules/maven/grammar/Bundle.properties
| 2 +-
maven.grammar/src/org/netbeans/modules/maven/grammar/POMDataObject.java
| 6 +
maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
| 8 -
mobility.end2end/nbproject/project.xml
| 2 +-
mobility.end2end/src/org/netbeans/modules/mobility/end2end/E2EDataObject.java
| 12 +-
mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/e2e-mime-resolver.xml
| 11 -
mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/layer.xml
| 7 -
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/Bundle.properties
| 3 +-
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/SVGDataObject.java
| 12 +-
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties
| 1 +
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java
| 7 +
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGPaletteItemResolver.xml
| 8 -
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGResolver.xml
| 54 -------
mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/layer.xml
| 12 -
o.apache.tools.ant.module/nbproject/project.xml
| 2 +-
o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java
| 6 +
o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/Bundle.properties
| 2 +
o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
| 8 -
o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Bundle.properties
| 1 -
php.editor/nbproject/project.xml
| 2 +-
php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
| 12 +-
php.editor/src/org/netbeans/modules/php/editor/resources/Bundle.properties
| 1 -
php.editor/src/org/netbeans/modules/php/editor/resources/PHPMimeResolver.xml
| 58 --------
php.editor/src/org/netbeans/modules/php/editor/resources/layer.xml
| 8 -
php.project/nbproject/project.xml
| 2 +-
php.project/src/org/netbeans/modules/php/project/resources/Bundle.properties
| 2 +-
php.project/src/org/netbeans/modules/php/project/resources/layer.xml
| 8 -
php.project/src/org/netbeans/modules/php/project/resources/package-info.java
| 48 ++++++
php.smarty/nbproject/project.xml
| 2 +-
php.smarty/src/org/netbeans/modules/php/smarty/editor/Bundle.properties
| 1 +
php.smarty/src/org/netbeans/modules/php/smarty/editor/TplDataObject.java
| 7 +
php.smarty/src/org/netbeans/modules/php/smarty/resources/Bundle.properties
| 1 -
php.smarty/src/org/netbeans/modules/php/smarty/resources/layer.xml
| 11 -
php.smarty/src/org/netbeans/modules/php/smarty/resources/tpl-mime-resolver.xml
| 52 -------
php.twig/nbproject/project.xml
| 2 +-
php.twig/src/org/netbeans/modules/php/twig/editor/TwigDataObject.java
| 8 +
php.twig/src/org/netbeans/modules/php/twig/resources/Bundle.properties
| 1 -
php.twig/src/org/netbeans/modules/php/twig/resources/TwigResolver.xml
| 51 -------
php.twig/src/org/netbeans/modules/php/twig/resources/layer.xml
| 7 -
profiler.oql.language/nbproject/project.xml
| 5 +
profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/Bundle.properties
| 2 +-
profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLanguageProvider.java
| 7 +
profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/layer.xml
| 8 -
profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/text-x-oql-mime-resolver.xml
| 31 ----
profiler.snaptracer/nbproject/project.xml
| 2 +-
profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/Bundle.properties
| 2 +-
profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/NpssDataObject.java
| 2 +
profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/resources/layer.xml
| 9 -
properties/nbproject/project.xml
| 2 +-
properties/src/org/netbeans/modules/properties/Bundle.properties
| 2 +-
properties/src/org/netbeans/modules/properties/Layer.xml
| 11 -
properties/src/org/netbeans/modules/properties/PropertiesDataObject.java
| 7 +
properties/src/org/netbeans/modules/properties/res-mime-resolver.xml
| 52 -------
utilities/nbproject/project.xml
| 2 +-
utilities/src/org/netbeans/modules/pdf/Bundle.properties
| 2 +-
utilities/src/org/netbeans/modules/pdf/PDFDataObject.java
| 7 +
utilities/src/org/netbeans/modules/pdf/uu-mime-resolver.xml
| 52 -------
utilities/src/org/netbeans/modules/url/Bundle.properties
| 2 +-
utilities/src/org/netbeans/modules/url/URLDataObject.java
| 7 +
utilities/src/org/netbeans/modules/url/url-mime-resolver.xml
| 52 -------
utilities/src/org/netbeans/modules/utilities/Layer.xml
| 27 ---
vmd.io.javame/nbproject/project.xml
| 2 +-
vmd.io.javame/src/org/netbeans/modules/vmd/io/javame/Bundle.properties
| 2 +-
vmd.io.javame/src/org/netbeans/modules/vmd/io/javame/MEDesignDataObject.java
| 6 +
vmd.io.javame/src/org/netbeans/modules/vmd/io/javame/VMDResolver.xml
| 51 -------
vmd.io.javame/src/org/netbeans/modules/vmd/io/javame/layer.xml
| 8 -
vmd.palette/nbproject/project.xml
| 2 +-
vmd.palette/src/org/netbeans/modules/vmd/palette/LResolver.xml
| 8 -
vmd.palette/src/org/netbeans/modules/vmd/palette/PaletteItemDataObject.java
| 8 +
vmd.palette/src/org/netbeans/modules/vmd/palette/layer.xml
| 8 -
vmd.palette/src/org/netbeans/modules/vmd/palette/resources/Bundle.properties
| 1 -
web.core/nbproject/project.xml
| 2 +-
web.core/src/org/netbeans/modules/web/core/Bundle.properties
| 1 -
web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
| 5 +
web.core/src/org/netbeans/modules/web/core/resources/layer.xml
| 17 --
xml.jaxb/nbproject/project.xml
| 2 +-
xml.jaxb/src/org/netbeans/modules/xml/jaxb/Bundle.properties
| 2 +-
xml.jaxb/src/org/netbeans/modules/xml/jaxb/JAXBWizard.java
| 8 +
xml.jaxb/src/org/netbeans/modules/xml/jaxb/layer.xml
| 9 -
xml.jaxb/src/org/netbeans/modules/xml/jaxb/resources/jaxb-binding-resolver.xml
| 52 -------
xml/src/org/netbeans/modules/xml/DTDDataObject.java
| 3 +-
xml/src/org/netbeans/modules/xml/EntityDataObject.java
| 3 +-
200 files changed, 459 insertions(+), 1751 deletions(-)
diffs (truncated from 4375 to 3000 lines):
diff --git a/cnd.asm/nbproject/project.xml b/cnd.asm/nbproject/project.xml
--- a/cnd.asm/nbproject/project.xml
+++ b/cnd.asm/nbproject/project.xml
@@ -105,7 +105,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.3</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
---
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
+++
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
@@ -52,6 +52,7 @@
import org.netbeans.modules.cnd.utils.MIMENames;
import org.openide.cookies.SaveCookie;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
@@ -60,6 +61,12 @@
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
+@MIMEResolver.ExtensionRegistration(
+ displayName="#AsmResolver",
+ position=458,
+ extension={ "s", "S", "asm", "ASM", "as", "il" },
+ mimeType="text/x-asm"
+)
public class AsmDataObject extends MultiDataObject {
public AsmDataObject(FileObject fo, AsmDataLoader loader) throws
DataObjectExistsException, IOException {
super(fo, loader);
diff --git
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
---
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
+++
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
@@ -1,2 +1,3 @@
CTL_AsmCompileAction=Compile
LBL_Asm_loader_name=Asm Data Objects
+AsmResolver=Asm Files
diff --git
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmResolver.xml
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmResolver.xml
deleted file mode 100644
--- a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmResolver.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="s"/>
- <ext name="S"/>
- <ext name="asm"/>
- <ext name="ASM"/>
- <ext name="as"/>
- <ext name="il"/>
- <resolver mime="text/x-asm"/>
- </file>
-</MIME-resolver>
diff --git
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
---
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
+++
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
@@ -4,7 +4,6 @@
OpenIDE-Module-Name=C/C++ Assembler
OpenIDE-Module-Short-Description=Assembler support
-Services/MIMEResolver/AsmResolver.xml=Asm Files
Loaders/text/x-asm/Factories/org-netbeans-modules-asm-core-dataobjects-AsmDataLoader.instance=ASM
Files
Templates/asmFiles=Assembler
diff --git
a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
--- a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
+++ b/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
@@ -143,15 +143,6 @@
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="AsmResolver.xml" url="AsmResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.asm.core.resources.Bundle"/>
- <attr name="position" intvalue="458"/>
- </file>
- </folder>
- </folder>
-
<folder name="CND">
<folder name="Extensions">
<file name="Assembler">
diff --git
a/cnd.script/src/org/netbeans/modules/cnd/script/loaders/ShellDataObject.java
b/cnd.script/src/org/netbeans/modules/cnd/script/loaders/ShellDataObject.java
---
a/cnd.script/src/org/netbeans/modules/cnd/script/loaders/ShellDataObject.java
+++
b/cnd.script/src/org/netbeans/modules/cnd/script/loaders/ShellDataObject.java
@@ -50,10 +50,10 @@
import org.openide.loaders.MultiFileLoader;
import org.openide.loaders.DataObjectExistsException;
import org.openide.nodes.Node;
-import org.openide.nodes.CookieSet;
import org.netbeans.modules.cnd.execution.ShellExecSupport;
import org.netbeans.modules.cnd.utils.MIMENames;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.MultiDataObject;
import org.openide.util.Lookup;
import org.openide.util.NbBundle.Messages;
@@ -62,6 +62,8 @@
/**
* Represents a Shell object in the Repository.
*/
+@Messages("ShellResolver=Common Shell Extensions")
+@MIMEResolver.Registration(displayName="#ShellResolver", position=139,
resource="../resources/mime-resolver.xml")
public class ShellDataObject extends MultiDataObject {
/** Serial version number */
diff --git
a/cnd.script/src/org/netbeans/modules/cnd/script/resources/layer.xml
b/cnd.script/src/org/netbeans/modules/cnd/script/resources/layer.xml
--- a/cnd.script/src/org/netbeans/modules/cnd/script/resources/layer.xml
+++ b/cnd.script/src/org/netbeans/modules/cnd/script/resources/layer.xml
@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
<filesystem>
-
- <folder name="Services">
-
- <folder name="MIMEResolver">
- <file name="mime-resolver.xml" url="mime-resolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.script.resources.Bundle"/>
- <attr name="position" intvalue="139"/>
- </file>
- </folder>
-
- </folder>
-
<folder name="Loaders">
<folder name="text">
diff --git a/cnd.source/nbproject/project.xml
b/cnd.source/nbproject/project.xml
--- a/cnd.source/nbproject/project.xml
+++ b/cnd.source/nbproject/project.xml
@@ -70,7 +70,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.33</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/cnd.source/src/org/netbeans/modules/cnd/source/Bundle.properties
b/cnd.source/src/org/netbeans/modules/cnd/source/Bundle.properties
--- a/cnd.source/src/org/netbeans/modules/cnd/source/Bundle.properties
+++ b/cnd.source/src/org/netbeans/modules/cnd/source/Bundle.properties
@@ -41,3 +41,6 @@
FMT_Not_Valid_FileName=The specified name is not valid for use in a source
file: {0}
Source=Source
TabLabel_Source=Source
+
+ExtResolver=C/C++/H/Fortran MIME Resolver (ext-based)
+ContentResolver=H MIME Resolver (content-based)
diff --git a/cnd.source/src/org/netbeans/modules/cnd/source/CCDataObject.java
b/cnd.source/src/org/netbeans/modules/cnd/source/CCDataObject.java
--- a/cnd.source/src/org/netbeans/modules/cnd/source/CCDataObject.java
+++ b/cnd.source/src/org/netbeans/modules/cnd/source/CCDataObject.java
@@ -47,14 +47,17 @@
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.netbeans.modules.cnd.utils.MIMENames;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.windows.TopComponent;
/** Represents a C++ object in the Repository */
+@MIMEResolver.Registration(displayName="#ExtResolver", position=214,
resource="resources/mime-resolver-ext-based.xml")
public class CCDataObject extends SourceDataObject {
+ @MIMEResolver.Registration(displayName="#ContentResolver", position=470,
resource="resources/mime-resolver-content-based.xml")
/** Serial version number */
static final long serialVersionUID = -5855103267479484214L;
diff --git
a/cnd.source/src/org/netbeans/modules/cnd/source/resources/Bundle.properties
b/cnd.source/src/org/netbeans/modules/cnd/source/resources/Bundle.properties
---
a/cnd.source/src/org/netbeans/modules/cnd/source/resources/Bundle.properties
+++
b/cnd.source/src/org/netbeans/modules/cnd/source/resources/Bundle.properties
@@ -7,5 +7,3 @@
Loaders/text/x-h/Factories/org-netbeans-modules-cnd-source-HDataLoader.instance=H
Data Loader
Loaders/text/x-fortran/Factories/org-netbeans-modules-cnd-source-FortranDataLoader.instance=Fortran
Data Loader
-Services/MIMEResolver/cnd-source-resolver-ext-based.xml=C/C++/H/Fortran MIME
Resolver (ext-based)
-Services/MIMEResolver/cnd-source-resolver-content-based.xml=H MIME Resolver
(content-based)
diff --git
a/cnd.source/src/org/netbeans/modules/cnd/source/resources/layer.xml
b/cnd.source/src/org/netbeans/modules/cnd/source/resources/layer.xml
--- a/cnd.source/src/org/netbeans/modules/cnd/source/resources/layer.xml
+++ b/cnd.source/src/org/netbeans/modules/cnd/source/resources/layer.xml
@@ -1,20 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
<filesystem>
-
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="cnd-source-resolver-ext-based.xml"
url="mime-resolver-ext-based.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.source.resources.Bundle"/>
- <attr name="position" intvalue="214"/>
- </file>
- <file name="cnd-source-resolver-content-based.xml"
url="mime-resolver-content-based.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.source.resources.Bundle"/>
- <attr name="position" intvalue="470"/>
- </file>
- </folder>
- </folder>
-
<folder name="Loaders">
<folder name="text">
<folder name="x-cnd+sourcefile">
diff --git a/cnd/nbproject/project.xml b/cnd/nbproject/project.xml
--- a/cnd/nbproject/project.xml
+++ b/cnd/nbproject/project.xml
@@ -163,7 +163,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/cnd/src/org/netbeans/modules/cnd/loaders/Bundle.properties
b/cnd/src/org/netbeans/modules/cnd/loaders/Bundle.properties
--- a/cnd/src/org/netbeans/modules/cnd/loaders/Bundle.properties
+++ b/cnd/src/org/netbeans/modules/cnd/loaders/Bundle.properties
@@ -77,4 +77,8 @@
LBL_CMakeProperty_loader_name=CMakeProperty Files
-Source=&Source
\ No newline at end of file
+Source=&Source
+
+NameExtResolver=C Make Files
+ExtBasedResolver=Common C/C++ Extensions
+HexBasedResolver=Magic C/C++ Headers
diff --git a/cnd/src/org/netbeans/modules/cnd/loaders/CMakeDataObject.java
b/cnd/src/org/netbeans/modules/cnd/loaders/CMakeDataObject.java
--- a/cnd/src/org/netbeans/modules/cnd/loaders/CMakeDataObject.java
+++ b/cnd/src/org/netbeans/modules/cnd/loaders/CMakeDataObject.java
@@ -48,11 +48,11 @@
import org.netbeans.modules.cnd.builds.CMakeExecSupport;
import org.netbeans.modules.cnd.utils.MIMENames;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
-import org.openide.nodes.CookieSet;
import org.openide.nodes.Node;
import org.openide.nodes.Children;
import org.openide.nodes.Sheet;
@@ -63,6 +63,11 @@
*
* @author Alexander Simon
*/
+@MIMEResolver.Registration(
+ displayName="#NameExtResolver",
+ position=215,
+ resource="../resources/mime-resolver-name-ext.xml"
+)
public class CMakeDataObject extends MultiDataObject {
public CMakeDataObject(FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git a/cnd/src/org/netbeans/modules/cnd/loaders/CndDataNode.java
b/cnd/src/org/netbeans/modules/cnd/loaders/CndDataNode.java
--- a/cnd/src/org/netbeans/modules/cnd/loaders/CndDataNode.java
+++ b/cnd/src/org/netbeans/modules/cnd/loaders/CndDataNode.java
@@ -55,12 +55,18 @@
import org.openide.util.actions.SystemAction;
import org.openide.actions.OpenAction;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Lookup;
/**
* A base class for CND binary nodes. The functionality from
* this base class is the renaming of the PROP_name property to show an
extension.
*/
+@MIMEResolver.Registration(
+ displayName="#ExtBasedResolver",
+ position=138,
+ resource="../resources/mime-resolver-ext-based.xml"
+)
public class CndDataNode extends DataNode {
/** The name property */
diff --git a/cnd/src/org/netbeans/modules/cnd/loaders/ExeObject.java
b/cnd/src/org/netbeans/modules/cnd/loaders/ExeObject.java
--- a/cnd/src/org/netbeans/modules/cnd/loaders/ExeObject.java
+++ b/cnd/src/org/netbeans/modules/cnd/loaders/ExeObject.java
@@ -45,6 +45,7 @@
package org.netbeans.modules.cnd.loaders;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.Node;
@@ -57,6 +58,11 @@
/** Superclass for Elf objects in the Repository.
*
*/
+@MIMEResolver.Registration(
+ displayName="#HexBasedResolver",
+ position=500,
+ resource="../resources/mime-resolver-hex-based.xml"
+)
public class ExeObject extends MultiDataObject {
//private static final Logger LOG =
Logger.getLogger(ExeObject.class.getName());
diff --git a/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
b/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
--- a/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
+++ b/cnd/src/org/netbeans/modules/cnd/resources/mf-layer.xml
@@ -58,23 +58,6 @@
-->
<folder name="Services">
-
- <folder name="MIMEResolver">
-
- <file name="mime-resolver-name-ext.xml"
url="mime-resolver-name-ext.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
- <attr name="position" intvalue="138"/>
- </file>
- <file name="cnd-ext-based-mime-resolver2.xml"
url="mime-resolver-ext-based.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
- <attr name="position" intvalue="215"/>
- </file>
- <file name="cnd-hex-based-mime-resolver.xml"
url="mime-resolver-hex-based.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.cnd.resources.Bundle"/>
- <attr name="position" intvalue="500"/>
- </file>
- </folder>
-
<folder name="JavaHelp">
<file name="org-netbeans-modules-cnd-helpset.xml"
url="helpset-decl.xml">
<attr name="position" intvalue="850"/>
diff --git a/core.ide/src/org/netbeans/core/ide/ServiceTabProcessor.java
b/core.ide/src/org/netbeans/core/ide/ServiceTabProcessor.java
--- a/core.ide/src/org/netbeans/core/ide/ServiceTabProcessor.java
+++ b/core.ide/src/org/netbeans/core/ide/ServiceTabProcessor.java
@@ -51,16 +51,25 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import org.netbeans.api.core.ide.ServicesTabNodeRegistration;
+import org.openide.filesystems.MIMEResolver;
import org.openide.filesystems.annotations.LayerBuilder.File;
import org.openide.filesystems.annotations.LayerGeneratingProcessor;
import org.openide.filesystems.annotations.LayerGenerationException;
import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
import org.openide.util.lookup.ServiceProvider;
/**
* processor for {@link ServiceTabNodeRegistration} annotation.
* @author Jaroslav Tulach
*/
+@NbBundle.Messages("PlainResolver=Text Files")
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/plain",
+ position=140,
+ displayName="#PlainResolver",
+ extension={ "TXT", "txt" }
+)
@ServiceProvider(service=Processor.class)
@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class ServiceTabProcessor extends LayerGeneratingProcessor {
diff --git a/core.ide/src/org/netbeans/core/ide/resources/layer.xml
b/core.ide/src/org/netbeans/core/ide/resources/layer.xml
--- a/core.ide/src/org/netbeans/core/ide/resources/layer.xml
+++ b/core.ide/src/org/netbeans/core/ide/resources/layer.xml
@@ -49,13 +49,6 @@
<file name="org-openide-actions-SaveAsTemplateAction.instance"/>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="plain-text-resolver.xml"
url="plain-text-resolver.xml">
- <attr name="position" intvalue="140"/>
- </file>
- </folder>
- </folder>
<folder name="Menu">
<folder name="GoTo">
<file name="org-netbeans-core-actions-JumpNextAction.shadow">
diff --git
a/core.ide/src/org/netbeans/core/ide/resources/plain-text-resolver.xml
b/core.ide/src/org/netbeans/core/ide/resources/plain-text-resolver.xml
deleted file mode 100644
--- a/core.ide/src/org/netbeans/core/ide/resources/plain-text-resolver.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 2004-2007 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="txt"/>
- <ext name="TXT"/>
- <resolver mime="text/plain"/>
- </file>
-</MIME-resolver>
diff --git a/css.editor/nbproject/project.xml
b/css.editor/nbproject/project.xml
--- a/css.editor/nbproject/project.xml
+++ b/css.editor/nbproject/project.xml
@@ -194,7 +194,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.6</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/css.editor/src/org/netbeans/modules/css/editor/CssProjectSupport.java
b/css.editor/src/org/netbeans/modules/css/editor/CssProjectSupport.java
--- a/css.editor/src/org/netbeans/modules/css/editor/CssProjectSupport.java
+++ b/css.editor/src/org/netbeans/modules/css/editor/CssProjectSupport.java
@@ -50,12 +50,21 @@
import org.netbeans.modules.css.indexing.api.CssIndex;
import org.netbeans.modules.parsing.api.Source;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
/**
*
* @author
*/
+@NbBundle.Messages("CssResolver=CSS Files")
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/css",
+ position=169,
+ displayName="#CssResolver",
+ extension={ "css" }
+)
public class CssProjectSupport {
private static final WeakHashMap<Project, CssProjectSupport> INSTANCIES
= new WeakHashMap<Project, CssProjectSupport>();
diff --git
a/css.editor/src/org/netbeans/modules/css/resources/cssResolver.xml
b/css.editor/src/org/netbeans/modules/css/resources/cssResolver.xml
deleted file mode 100644
--- a/css.editor/src/org/netbeans/modules/css/resources/cssResolver.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="css"/>
- <resolver mime="text/x-css"/>
- </file>
-</MIME-resolver>
diff --git a/css.editor/src/org/netbeans/modules/css/resources/layer.xml
b/css.editor/src/org/netbeans/modules/css/resources/layer.xml
--- a/css.editor/src/org/netbeans/modules/css/resources/layer.xml
+++ b/css.editor/src/org/netbeans/modules/css/resources/layer.xml
@@ -153,15 +153,6 @@
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="cssResolver.xml" url="cssResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.css.resources.Bundle"/>
- <attr name="position" intvalue="169"/>
- </file>
- </folder>
- </folder>
-
<folder name="OptionsDialog">
<folder name="PreviewExamples">
<folder name="text">
diff --git a/db.core/nbproject/project.xml b/db.core/nbproject/project.xml
--- a/db.core/nbproject/project.xml
+++ b/db.core/nbproject/project.xml
@@ -140,7 +140,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/db.core/src/org/netbeans/modules/db/core/Bundle.properties
b/db.core/src/org/netbeans/modules/db/core/Bundle.properties
--- a/db.core/src/org/netbeans/modules/db/core/Bundle.properties
+++ b/db.core/src/org/netbeans/modules/db/core/Bundle.properties
@@ -50,7 +50,6 @@
#SQLOptions
LBL_SQLOptions=SQL Editor
-Services/MIMEResolver/SQLResolver.xml=SQL Files
Templates/Other/SQLTemplate.sql=SQL file
UI_EDITOR_OPENED=SQL Editor Opened
# XXX the icon base should be sql.png and sql16.png renamed to sql.png
diff --git a/db.core/src/org/netbeans/modules/db/core/resources/layer.xml
b/db.core/src/org/netbeans/modules/db/core/resources/layer.xml
--- a/db.core/src/org/netbeans/modules/db/core/resources/layer.xml
+++ b/db.core/src/org/netbeans/modules/db/core/resources/layer.xml
@@ -120,14 +120,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="sql-resolver.xml" url="sql-resolver.xml">
- <attr name="position" intvalue="196"/>
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.db.core.Bundle"/>
- </file>
- </folder>
- </folder>
<folder name="Templates">
<folder name="Other">
<file name="SQLTemplate.sql" url="SQLTemplate.sql">
diff --git a/db.core/src/org/netbeans/modules/db/sql/loader/Bundle.properties
b/db.core/src/org/netbeans/modules/db/sql/loader/Bundle.properties
--- a/db.core/src/org/netbeans/modules/db/sql/loader/Bundle.properties
+++ b/db.core/src/org/netbeans/modules/db/sql/loader/Bundle.properties
@@ -84,3 +84,5 @@
CLOSE_OTHER_TABS_ACTION=Close Other
CLOSE_ALL_TABS_ACTION=Close All
CLOSE_PREVIOUS_TABS_ACTION=Close Tabs From Previous Executions
+
+SQLResolver=SQL Files
diff --git
a/db.core/src/org/netbeans/modules/db/sql/loader/SQLDataObject.java
b/db.core/src/org/netbeans/modules/db/sql/loader/SQLDataObject.java
--- a/db.core/src/org/netbeans/modules/db/sql/loader/SQLDataObject.java
+++ b/db.core/src/org/netbeans/modules/db/sql/loader/SQLDataObject.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
@@ -58,6 +59,12 @@
*
* @author Andrei Badea, John Baker
*/
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-sql",
+ position=196,
+ displayName="#SQLResolver",
+ extension={ "sql" }
+)
public class SQLDataObject extends MultiDataObject {
public SQLDataObject(FileObject primaryFile, MultiFileLoader loader)
throws DataObjectExistsException {
diff --git a/dbschema/nbproject/project.xml b/dbschema/nbproject/project.xml
--- a/dbschema/nbproject/project.xml
+++ b/dbschema/nbproject/project.xml
@@ -122,7 +122,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
---
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
+++
b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
@@ -59,8 +59,15 @@
import org.netbeans.modules.dbschema.SchemaElement;
import org.netbeans.modules.dbschema.SchemaElementUtil;
import org.netbeans.modules.dbschema.nodes.SchemaRootChildren;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Lookup;
+@MIMEResolver.ExtensionRegistration(
+
displayName="org.netbeans.modules.dbschema.resources.Bundle#DBSchemaResolver",
+ extension="dbschema",
+ mimeType="text/x-dbschema+xml",
+ position=1010
+)
public class DBschemaDataObject extends MultiDataObject {
transient protected SchemaElement schemaElement;
diff --git
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/dbschema-mime-resolver.xml
b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/dbschema-mime-resolver.xml
deleted file mode 100644
---
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/dbschema-mime-resolver.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Document : mime-resolver.xml
- Created on : June 11, 2008, 1:49 PM
- Author : David Van Couvering
- Description:
- Resolve dbschema XML files
--->
-
-<!DOCTYPE MIME-resolver PUBLIC '-//NetBeans//DTD MIME Resolver 1.0//EN'
'http://www.netbeans.org/dtds/mime-resolver-1_0.dtd'>
-<MIME-resolver>
- <file>
- <ext name="dbschema"/>
- <resolver mime="text/x-dbschema+xml"/>
- </file>
-</MIME-resolver>
diff --git
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/mf-layer.xml
b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/mf-layer.xml
---
a/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/mf-layer.xml
+++
b/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/mf-layer.xml
@@ -45,15 +45,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN"
"http://www.netbeans.org/dtds/filesystem-1_0.dtd";>
<filesystem>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="org-netbeans-modules-dbschema-mime-resolver.xml"
url="dbschema-mime-resolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.dbschema.resources.Bundle"/>
- <attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/netbeans/modules/dbschema/resources/database.gif"/>
- <attr name="position" intvalue="1010"/>
- </file>
- </folder>
- </folder>
<folder name="Loaders">
<folder name="text">
<folder name="x-dbschema+xml">
diff --git
a/dbschema/src/org/netbeans/modules/dbschema/resources/Bundle.properties
b/dbschema/src/org/netbeans/modules/dbschema/resources/Bundle.properties
--- a/dbschema/src/org/netbeans/modules/dbschema/resources/Bundle.properties
+++ b/dbschema/src/org/netbeans/modules/dbschema/resources/Bundle.properties
@@ -93,7 +93,6 @@
Actions/Help/org-netbeans-modules-dbschema-mainpage.xml=Database Schema
Module Help
#Mime Resolver
-Services/MIMEResolver/org-netbeans-modules-dbschema-mime-resolver.xml=Database
schema definition files
-
+DBSchemaResolver=Database schema definition files
Loaders/text/x-dbschema+xml/Factories/org-netbeans-modules-dbschema-jdbcimpl-DBschemaDataLoader.instance=Database
Schema Files
diff --git a/groovy.editor/nbproject/project.xml
b/groovy.editor/nbproject/project.xml
--- a/groovy.editor/nbproject/project.xml
+++ b/groovy.editor/nbproject/project.xml
@@ -238,7 +238,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.3</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
b/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
--- a/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
+++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/Bundle.properties
@@ -46,8 +46,6 @@
OpenIDE-Module-Long-Description=\
Support for editing Groovy files
-Services/MIMEResolver/GroovyMimeResolver.xml=Groovy Files
-
text/x-groovy=Groovy
text/x-groovy-string-double=Groovy Quoted Strings
text/x-groovy-string-single=Groovy Strings
diff --git
a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
---
a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
+++
b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/Bundle.properties
@@ -38,4 +38,6 @@
#
# Portions Copyrighted 2011 Sun Microsystems, Inc.
-CTL_SourceTabCaption=&Source
\ No newline at end of file
+CTL_SourceTabCaption=&Source
+GroovyResolver=Groovy Files
+
diff --git
a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
---
a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
+++
b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyLanguage.java
@@ -72,10 +72,10 @@
import org.netbeans.modules.groovy.editor.api.completion.CompletionHandler;
import org.netbeans.modules.groovy.editor.api.lexer.GroovyTokenId;
import
org.netbeans.modules.groovy.editor.hints.infrastructure.GroovyHintsProvider;
-import org.netbeans.modules.groovy.support.api.GroovySources;
import org.netbeans.modules.parsing.spi.Parser;
import org.netbeans.modules.parsing.spi.indexing.EmbeddingIndexerFactory;
import org.netbeans.modules.parsing.spi.indexing.PathRecognizerRegistration;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Lookup;
import org.openide.windows.TopComponent;
@@ -85,6 +85,12 @@
* @author Tor Norbye
* @author Martin Adamek
*/
+@MIMEResolver.ExtensionRegistration(
+ displayName="#GroovyResolver",
+ extension={ "groovy" },
+ mimeType="text/x-groovy",
+ position=281
+)
@LanguageRegistration(mimeType="text/x-groovy", useMultiview=true)
@PathRecognizerRegistration(mimeTypes="text/x-groovy",
sourcePathIds=ClassPath.SOURCE, libraryPathIds={}, binaryLibraryPathIds={})
//NOI18N
public class GroovyLanguage extends DefaultLanguageConfig {
diff --git
a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyMimeResolver.xml
b/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyMimeResolver.xml
deleted file mode 100644
---
a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/GroovyMimeResolver.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="groovy"/>
- <resolver mime="text/x-groovy"/>
- </file>
-</MIME-resolver>
diff --git
a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
b/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
--- a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
+++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/layer.xml
@@ -31,16 +31,6 @@
</folder>
</folder>
-
-
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="GroovyMimeResolver.xml" url="GroovyMimeResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.groovy.editor.Bundle"/>
- <attr name="position" intvalue="281"/>
- </file>
- </folder>
- </folder>
<folder name="Editors">
<folder name="text">
<folder name="x-groovy">
diff --git a/html/nbproject/project.xml b/html/nbproject/project.xml
--- a/html/nbproject/project.xml
+++ b/html/nbproject/project.xml
@@ -213,7 +213,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/html/src/org/netbeans/modules/html/Bundle.properties
b/html/src/org/netbeans/modules/html/Bundle.properties
--- a/html/src/org/netbeans/modules/html/Bundle.properties
+++ b/html/src/org/netbeans/modules/html/Bundle.properties
@@ -65,7 +65,7 @@
# Filenames
Templates/Other/html.html=HTML File
Templates/Other/xhtml.xhtml=XHTML File
-Services/MIMEResolver/html.xml=HTML and XHTML Files
+HTMLResolver=HTML and XHTML Files
# HtmlEditorSupport
# {0} document name
diff --git a/html/src/org/netbeans/modules/html/HtmlDataObject.java
b/html/src/org/netbeans/modules/html/HtmlDataObject.java
--- a/html/src/org/netbeans/modules/html/HtmlDataObject.java
+++ b/html/src/org/netbeans/modules/html/HtmlDataObject.java
@@ -78,6 +78,7 @@
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -88,7 +89,6 @@
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
-import org.openide.util.NbBundle.Messages;
import org.openide.util.UserCancelException;
import org.openide.windows.TopComponent;
import org.xml.sax.InputSource;
@@ -98,6 +98,11 @@
* @author Ian Formanek
* @author Marek Fukala
*/
+@MIMEResolver.Registration(
+ displayName="#HTMLResolver",
+ position=300,
+ resource="resolver.xml"
+)
public class HtmlDataObject extends MultiDataObject implements
CookieSet.Factory {
public static final String PROP_ENCODING = "Content-Encoding"; // NOI18N
public static final String DEFAULT_ENCODING = new
InputStreamReader(System.in).getEncoding();
diff --git a/html/src/org/netbeans/modules/html/mf-layer.xml
b/html/src/org/netbeans/modules/html/mf-layer.xml
--- a/html/src/org/netbeans/modules/html/mf-layer.xml
+++ b/html/src/org/netbeans/modules/html/mf-layer.xml
@@ -63,16 +63,6 @@
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="html.xml" url="resolver.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.html.Bundle#Services/MIMEResolver/html.xml"/>
- <attr name="iconBase"
stringvalue="org/netbeans/modules/html/htmlObject.png"/>
- <attr name="position" intvalue="300"/>
- </file>
- </folder>
- </folder>
-
<folder name="Loaders">
<folder name="text">
<folder name="html">
diff --git a/image/nbproject/project.xml b/image/nbproject/project.xml
--- a/image/nbproject/project.xml
+++ b/image/nbproject/project.xml
@@ -96,7 +96,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>6.2</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/image/src/org/netbeans/modules/image/Bundle.properties
b/image/src/org/netbeans/modules/image/Bundle.properties
--- a/image/src/org/netbeans/modules/image/Bundle.properties
+++ b/image/src/org/netbeans/modules/image/Bundle.properties
@@ -42,7 +42,10 @@
# ImageDataLoader
PROP_ImageLoader_Name=Image Objects
-Services/MIMEResolver/org-netbeans-modules-image-mime-resolver.xml=Image
Files
+ImageMimeResolverGIF=GIF Image Files
+ImageMimeResolverJPG=JPEG Image Files
+ImageMimeResolverBMP=BMP Image Files
+ImageMimeResolverPNG=PNG Image Files
Loaders/image/bmp/Factories/org-netbeans-modules-image-ImageDataLoader.instance=BMP
Image Files
Loaders/image/gif/Factories/org-netbeans-modules-image-ImageDataLoader.instance=GIF
Image Files
Loaders/image/jpeg/Factories/org-netbeans-modules-image-ImageDataLoader.instance=JPEG
Image Files
diff --git a/image/src/org/netbeans/modules/image/ImageDataObject.java
b/image/src/org/netbeans/modules/image/ImageDataObject.java
--- a/image/src/org/netbeans/modules/image/ImageDataObject.java
+++ b/image/src/org/netbeans/modules/image/ImageDataObject.java
@@ -65,6 +65,7 @@
import org.openide.loaders.*;
import org.openide.nodes.*;
import org.openide.ErrorManager;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Lookup;
import org.openide.util.actions.SystemAction;
import org.openide.util.HelpCtx;
@@ -78,14 +79,38 @@
*/
public class ImageDataObject extends MultiDataObject implements
CookieSet.Factory {
+ @MIMEResolver.ExtensionRegistration(
+ displayName="#ImageMimeResolverJPG",
+ mimeType="image/jpeg",
+ extension={"jpg", "JPG", "jpe", "JPE", "jpeg", "JPEG"},
+ position=110
+ )
/** Generated serialized version UID. */
static final long serialVersionUID = -6035788991669336965L;
+ @MIMEResolver.ExtensionRegistration(
+ displayName="#ImageMimeResolverGIF",
+ mimeType="image/gif",
+ extension={"gif", "GIF"},
+ position=111
+ )
/** Base for image resource. */
private static final String IMAGE_ICON_BASE =
"org/netbeans/modules/image/imageObject.png"; // NOI18N
+ @MIMEResolver.ExtensionRegistration(
+ displayName="#ImageMimeResolverPNG",
+ mimeType="image/png",
+ extension={"png", "PNG"},
+ position=112
+ )
/** Open support for this image data object. */
private transient ImageOpenSupport openSupport;
+ @MIMEResolver.ExtensionRegistration(
+ displayName="#ImageMimeResolverBMP",
+ mimeType="image/bmp",
+ extension={"bmp", "BMP"},
+ position=113
+ )
/** Print support for this image data object **/
private transient ImagePrintSupport printSupport;
diff --git a/image/src/org/netbeans/modules/image/Layer.xml
b/image/src/org/netbeans/modules/image/Layer.xml
--- a/image/src/org/netbeans/modules/image/Layer.xml
+++ b/image/src/org/netbeans/modules/image/Layer.xml
@@ -150,15 +150,4 @@
<file
name="org.netbeans.modules.image.CustomZoomAction.instance"/>
</folder>
</folder>
-
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="org-netbeans-modules-image-mime-resolver.xml"
url="image-mime-resolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.image.Bundle"/>
- <attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/netbeans/modules/image/imageObject.png"/>
- <attr name="position" intvalue="110"/>
- </file>
- </folder>
- </folder>
-
</filesystem>
diff --git a/image/src/org/netbeans/modules/image/image-mime-resolver.xml
b/image/src/org/netbeans/modules/image/image-mime-resolver.xml
deleted file mode 100644
--- a/image/src/org/netbeans/modules/image/image-mime-resolver.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 2004-2005 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="gif"/>
- <ext name="GIF"/>
- <resolver mime="image/gif"/>
- </file>
- <file>
- <ext name="jpg"/>
- <ext name="JPG"/>
- <ext name="jpe"/>
- <ext name="JPE"/>
- <ext name="jpeg"/>
- <ext name="JPEG"/>
- <resolver mime="image/jpeg"/>
- </file>
- <file>
- <ext name="png"/>
- <ext name="PNG"/>
- <resolver mime="image/png"/>
- </file>
- <file>
- <ext name="bmp"/>
- <ext name="BMP"/>
- <resolver mime="image/bmp"/>
- </file>
-</MIME-resolver>
diff --git a/j2ee.sun.appsrv/nbproject/project.xml
b/j2ee.sun.appsrv/nbproject/project.xml
--- a/j2ee.sun.appsrv/nbproject/project.xml
+++ b/j2ee.sun.appsrv/nbproject/project.xml
@@ -231,7 +231,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/XResolver.xml
b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/XResolver.xml
deleted file mode 100644
---
a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/XResolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="sun-resource"/>
- <resolver mime="text/x-sun-resource+xml"/>
- </file>
-</MIME-resolver>
diff --git
a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/layer.xml
b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/layer.xml
--- a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/layer.xml
+++ b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/appsrvapi/layer.xml
@@ -45,15 +45,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN"
"http://www.netbeans.org/dtds/filesystem-1_0.dtd";>
<filesystem>
-
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="XResolver.xml" url="XResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.j2ee.sun.appsrvapi.Bundle"/>
- <attr name="position" intvalue="890"/>
- </file>
- </folder>
- </folder>
<folder name="Templates">
<folder name="SunResources">
<attr name="templateWizardURL"
urlvalue="nbresloc:/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation.html"/>
diff --git
a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
---
a/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
+++
b/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
@@ -82,17 +82,20 @@
import
org.netbeans.modules.j2ee.sun.ide.sunresources.beans.PersistenceManagerBean;
import
org.netbeans.modules.j2ee.sun.ide.sunresources.beans.PersistenceManagerBeanDataNode;
-import org.openide.filesystems.FileAttributeEvent;
-import org.openide.filesystems.FileChangeListener;
-import org.openide.filesystems.FileEvent;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileRenameEvent;
+import org.openide.filesystems.*;
import org.openide.util.WeakListeners;
/** Represents a SunResource object in the Repository.
*
* @author nityad
*/
+@NbBundle.Messages("GlassfishRecognizer=GlassFish Resources Files")
+@MIMEResolver.ExtensionRegistration(
+ displayName="#GlassfishRecognizer",
+ extension="sun-resource",
+ position=890,
+ mimeType="text/x-sun-resource+xml"
+)
public class SunResourceDataObject extends XMLDataObject implements
FileChangeListener { // extends MultiDataObject{
private static final Logger LOG =
Logger.getLogger(SunResourceDataObject.class.getName());
diff --git a/java.hints.declarative/nbproject/project.xml
b/java.hints.declarative/nbproject/project.xml
--- a/java.hints.declarative/nbproject/project.xml
+++ b/java.hints.declarative/nbproject/project.xml
@@ -183,7 +183,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
-
<specification-version>7.21.0.1.1</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/HintDataObject.java
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/HintDataObject.java
---
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/HintDataObject.java
+++
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/HintDataObject.java
@@ -40,6 +40,7 @@
import java.io.IOException;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -50,6 +51,9 @@
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-javahints", displayName="", extension="hint",
position=2133
+)
public class HintDataObject extends MultiDataObject {
public HintDataObject(FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestResolver.xml
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestResolver.xml
deleted file mode 100644
---
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestResolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="test"/>
- <resolver mime="text/x-javahintstest"/>
- </file>
-</MIME-resolver>
diff --git
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintResolver.xml
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintResolver.xml
deleted file mode 100644
---
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintResolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="hint"/>
- <resolver mime="text/x-javahints"/>
- </file>
-</MIME-resolver>
diff --git
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/layer.xml
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/layer.xml
---
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/layer.xml
+++
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/layer.xml
@@ -203,18 +203,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="DeclarativeHintsTestResolver.xml"
url="DeclarativeHintsTestResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.java.hints.declarative.resources.Bundle"/>
- <attr name="position" intvalue="999200" />
- </file>
- <file name="HintResolver.xml" url="HintResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.java.hints.declarative.resources.Bundle"/>
- <attr name="position" intvalue="999100" />
- </file>
- </folder>
- </folder>
<!-- <folder name="Templates">
<folder name="Other">
<file name="DeclarativeHintsTestTemplate.test"
url="DeclarativeHintsTestTemplate.test">
diff --git
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/DeclarativeHintsTestDataObject.java
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/DeclarativeHintsTestDataObject.java
---
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/DeclarativeHintsTestDataObject.java
+++
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/DeclarativeHintsTestDataObject.java
@@ -41,6 +41,7 @@
import java.io.IOException;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -51,6 +52,9 @@
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-javahintstest", displayName="", extension="test",
position=999200
+)
public class DeclarativeHintsTestDataObject extends MultiDataObject {
public DeclarativeHintsTestDataObject(FileObject pf, MultiFileLoader
loader) throws DataObjectExistsException, IOException {
diff --git a/java.j2seplatform/nbproject/project.xml
b/java.j2seplatform/nbproject/project.xml
--- a/java.j2seplatform/nbproject/project.xml
+++ b/java.j2seplatform/nbproject/project.xml
@@ -182,7 +182,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.55</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/Bundle.properties
b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/Bundle.properties
deleted file mode 100644
---
a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/Bundle.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-# File names on system filesystem
-# Each key is resource path to a primary file
-# Value should give localized display name for data node
-# Only works together with filesystem attribute as set by API Support module.
-
-Services/MIMEResolver/org-netbeans-modules-jar-mime-resolver.xml=Java
Archive File
-
diff --git
a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
---
a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
+++
b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
@@ -136,12 +136,6 @@
</file>
</folder>
</folder>
- <folder name="MIMEResolver">
- <file name="org-netbeans-modules-jar-mime-resolver.xml"
url="platforms-mime-resolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.java.j2seplatform.resources.Bundle"/>
- <attr name="position" intvalue="480"/>
- </file>
- </folder>
</folder>
<folder name="xml">
diff --git
a/java.j2seplatform/src/org/netbeans/modules/java/jarloader/Bundle.properties
b/java.j2seplatform/src/org/netbeans/modules/java/jarloader/Bundle.properties
---
a/java.j2seplatform/src/org/netbeans/modules/java/jarloader/Bundle.properties
+++
b/java.j2seplatform/src/org/netbeans/modules/java/jarloader/Bundle.properties
@@ -41,3 +41,4 @@
# made subject to such option by the copyright holder.
LBL_loaderName=JAR Files
+JarResolver=Java Archive File
diff --git
a/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataObject.java
b/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataObject.java
---
a/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataObject.java
+++
b/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataObject.java
@@ -45,6 +45,7 @@
package org.netbeans.modules.java.jarloader;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.Node;
@@ -55,6 +56,7 @@
* Represents a JAR file.
* @author Jesse Glick
*/
+@MIMEResolver.Registration(resource="../j2seplatform/resources/platforms-mime-resolver.xml",
displayName="#JarResolver", position=480)
public final class JarDataObject extends MultiDataObject {
public JarDataObject(FileObject pf, JarDataLoader loader) throws
DataObjectExistsException {
diff --git a/javacard.apdufile/nbproject/project.xml
b/javacard.apdufile/nbproject/project.xml
--- a/javacard.apdufile/nbproject/project.xml
+++ b/javacard.apdufile/nbproject/project.xml
@@ -6,6 +6,15 @@
<code-name-base>org.netbeans.modules.javacard.apdufile</code-name-base>
<module-dependencies>
<dependency>
+
<code-name-base>org.apache.tools.ant.module</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>3.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.core.multiview</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -15,15 +24,6 @@
</run-dependency>
</dependency>
<dependency>
-
<code-name-base>org.apache.tools.ant.module</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>3.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.javacard.spi</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -80,7 +80,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.1</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduDataObject.java
b/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduDataObject.java
---
a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduDataObject.java
+++
b/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduDataObject.java
@@ -45,6 +45,7 @@
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
@@ -54,6 +55,7 @@
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
+@MIMEResolver.ExtensionRegistration(displayName="",extension="scr",
mimeType="text/x-apduscr", position=8738)
public class ApduDataObject extends MultiDataObject {
public static final String MIME_TYPE = "text/x-apduscr"; // NOI18N
diff --git
a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduResolver.xml
b/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduResolver.xml
deleted file mode 100644
---
a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/ApduResolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="scr"/>
- <resolver mime="text/x-apduscr"/>
- </file>
-</MIME-resolver>
diff --git
a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/layer.xml
b/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/layer.xml
--- a/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/layer.xml
+++ b/javacard.apdufile/src/org/netbeans/modules/javacard/apdufile/layer.xml
@@ -85,14 +85,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="ApduResolver.xml" url="ApduResolver.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.javacard.apdufile.Bundle#Services/MIMEResolver/ApduResolver.xml"/>
- <attr name="position" intvalue="8738"/>
- </file>
- </folder>
- </folder>
<folder name="Templates">
<folder name="Other">
<file name="ApduTemplate.scr" url="ApduTemplate.scr">
diff --git a/javacard.ri.platform/nbproject/project.xml
b/javacard.ri.platform/nbproject/project.xml
--- a/javacard.ri.platform/nbproject/project.xml
+++ b/javacard.ri.platform/nbproject/project.xml
@@ -142,7 +142,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>6.0</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/card/CardProperties.java
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/card/CardProperties.java
---
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/card/CardProperties.java
+++
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/card/CardProperties.java
@@ -66,6 +66,7 @@
import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.NbCollections;
/**
@@ -73,7 +74,15 @@
*
* @author Tim Boudreau
*/
+@MIMEResolver.ExtensionRegistration(
+ extension="jcplatform", displayName="",
+ mimeType="application/javacard", position=268
+)
final class CardProperties implements ICardCapability, CapabilitiesProvider {
+ @MIMEResolver.ExtensionRegistration(
+ extension="jcard", displayName="",
+ mimeType="application/x-javacardserver", position=269
+ )
public static final String DEBUG = "debug";
public static final String SUSPEND = "suspend";
private static final String DEFAULT_RAM_SIZE = "24K"; //NOI18N
diff --git
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/CardResolver.xml
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/CardResolver.xml
deleted file mode 100644
---
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/CardResolver.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
--->
-
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="jcard"/>
- <resolver mime="application/x-javacardserver"/>
- </file>
-</MIME-resolver>
diff --git
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/JavacardPlatformResolver.xml
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/JavacardPlatformResolver.xml
deleted file mode 100644
---
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/JavacardPlatformResolver.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
--->
-
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="jcplatform"/>
- <resolver mime="application/javacard"/>
- </file>
-</MIME-resolver>
diff --git
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/layer.xml
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/layer.xml
---
a/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/layer.xml
+++
b/javacard.ri.platform/src/org/netbeans/modules/javacard/ri/platform/layer.xml
@@ -57,18 +57,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="JavacardPlatformResolver.xml"
url="JavacardPlatformResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.javacard.Bundle"/>
- <attr name="position" intvalue="268"/>
- </file>
- <file name="JavaCardResolver.xml" url="CardResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.javacard.Bundle"/>
- <attr name="position" intvalue="269"/>
- </file>
- </folder>
- </folder>
<folder name="Loaders">
<folder name="application">
diff --git a/javafx2.editor/nbproject/project.xml
b/javafx2.editor/nbproject/project.xml
--- a/javafx2.editor/nbproject/project.xml
+++ b/javafx2.editor/nbproject/project.xml
@@ -113,7 +113,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.53</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/fxml/FXMLDataObject.java
b/javafx2.editor/src/org/netbeans/modules/javafx2/editor/fxml/FXMLDataObject.java
---
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/fxml/FXMLDataObject.java
+++
b/javafx2.editor/src/org/netbeans/modules/javafx2/editor/fxml/FXMLDataObject.java
@@ -44,6 +44,7 @@
import java.io.IOException;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -54,6 +55,7 @@
import org.openide.util.Lookup;
import org.openide.text.DataEditorSupport;
+@MIMEResolver.ExtensionRegistration(extension="fxml",
mimeType="text/x-fxml+xml", position=8739,
displayName="#LBL_FXML_loader_name")
public class FXMLDataObject extends MultiDataObject {
public FXMLDataObject(FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/fxml-mime-resolver.xml
b/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/fxml-mime-resolver.xml
deleted file mode 100644
---
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/fxml-mime-resolver.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="fxml"/>
- <resolver mime="text/x-fxml+xml"/>
- </file>
-</MIME-resolver>
diff --git
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/layer.xml
b/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/layer.xml
---
a/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/layer.xml
+++
b/javafx2.editor/src/org/netbeans/modules/javafx2/editor/resources/layer.xml
@@ -45,15 +45,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
<filesystem>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="fxml.xml" url="fxml-mime-resolver.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.javafx2.editor.Bundle#Services/MIMEResolver/fxml.xml"/>
- <attr name="iconBase"
stringvalue="org/netbeans/modules/javafx2/editor/resources/fxmlObject.gif"/>
- <attr name="position" intvalue="8739"/>
- </file>
- </folder>
- </folder>
<folder name="Loaders">
<folder name="text">
<folder name="x-fxml+xml">
diff --git
a/javascript.editing/src/org/netbeans/modules/javascript/editing/Bundle.properties
b/javascript.editing/src/org/netbeans/modules/javascript/editing/Bundle.properties
---
a/javascript.editing/src/org/netbeans/modules/javascript/editing/Bundle.properties
+++
b/javascript.editing/src/org/netbeans/modules/javascript/editing/Bundle.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
OpenIDE-Module-Display-Category=JavaScript
OpenIDE-Module-Name=JavaScript Editing
-Services/MIMEResolver/javascript.xml=JavaScript Files
+JavascriptResolver=JavaScript Files
text/javascript=JavaScript
text/x-json=JSON
text/x-javascript-string=JavaScript Strings
diff --git
a/javascript.editing/src/org/netbeans/modules/javascript/editing/JsUtils.java
b/javascript.editing/src/org/netbeans/modules/javascript/editing/JsUtils.java
---
a/javascript.editing/src/org/netbeans/modules/javascript/editing/JsUtils.java
+++
b/javascript.editing/src/org/netbeans/modules/javascript/editing/JsUtils.java
@@ -31,17 +31,18 @@
package org.netbeans.modules.javascript.editing;
import java.io.IOException;
-import java.io.Writer;
import javax.swing.text.Document;
import org.mozilla.nb.javascript.Node;
import org.netbeans.modules.javascript.editing.lexer.JsTokenId;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.NbBundle;
/**
*
* @author Tor Norbye
*/
+@MIMEResolver.Registration(displayName="#JavascriptResolver", position=190,
resource="jsresolver.xml")
public class JsUtils {
private JsUtils() {
diff --git
a/javascript.editing/src/org/netbeans/modules/javascript/editing/layer.xml
b/javascript.editing/src/org/netbeans/modules/javascript/editing/layer.xml
--- a/javascript.editing/src/org/netbeans/modules/javascript/editing/layer.xml
+++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/layer.xml
@@ -131,15 +131,6 @@
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="javascript.xml" url="jsresolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.javascript.editing.Bundle"/>
- <attr name="position" intvalue="190"/>
- </file>
- </folder>
- </folder>
-
<folder name="OptionsDialog">
<folder name="PreviewExamples">
<folder name="text">
diff --git a/javawebstart/nbproject/project.xml
b/javawebstart/nbproject/project.xml
--- a/javawebstart/nbproject/project.xml
+++ b/javawebstart/nbproject/project.xml
@@ -176,7 +176,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/javawebstart/src/org/netbeans/modules/javawebstart/Bundle.properties
b/javawebstart/src/org/netbeans/modules/javawebstart/Bundle.properties
--- a/javawebstart/src/org/netbeans/modules/javawebstart/Bundle.properties
+++ b/javawebstart/src/org/netbeans/modules/javawebstart/Bundle.properties
@@ -45,7 +45,7 @@
LBL_Jnlp_loader_name=JNLP Files
OpenIDE-Module-Short-Description=Support for Java Web Start
-Services/MIMEResolver/JnlpResolver.xml=JNLP Files
+JNLPResolver=JNLP Files
Loaders/text/x-jnlp+xml/Factories/org-netbeans-modules-javawebstart-JnlpDataLoader.instance=JNLP
Files
Projects/org-netbeans-modules-java-j2seproject/Customizer/DesktopAppCategory=Desktop
Application
diff --git
a/javawebstart/src/org/netbeans/modules/javawebstart/JnlpDataObject.java
b/javawebstart/src/org/netbeans/modules/javawebstart/JnlpDataObject.java
--- a/javawebstart/src/org/netbeans/modules/javawebstart/JnlpDataObject.java
+++ b/javawebstart/src/org/netbeans/modules/javawebstart/JnlpDataObject.java
@@ -53,6 +53,7 @@
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.CookieSet;
@@ -64,6 +65,12 @@
import org.openide.windows.TopComponent;
import org.xml.sax.InputSource;
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-jnlp+xml",
+ position=200,
+ displayName="#JNLPResolver",
+ extension={ "jnlp" }
+)
public class JnlpDataObject extends MultiDataObject {
public JnlpDataObject(FileObject pf, JnlpDataLoader loader) throws
DataObjectExistsException, IOException {
diff --git
a/javawebstart/src/org/netbeans/modules/javawebstart/JnlpResolver.xml
b/javawebstart/src/org/netbeans/modules/javawebstart/JnlpResolver.xml
deleted file mode 100644
--- a/javawebstart/src/org/netbeans/modules/javawebstart/JnlpResolver.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="jnlp"/>
- <resolver mime="text/x-jnlp+xml"/>
- </file>
-</MIME-resolver>
diff --git a/javawebstart/src/org/netbeans/modules/javawebstart/layer.xml
b/javawebstart/src/org/netbeans/modules/javawebstart/layer.xml
--- a/javawebstart/src/org/netbeans/modules/javawebstart/layer.xml
+++ b/javawebstart/src/org/netbeans/modules/javawebstart/layer.xml
@@ -114,14 +114,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="JnlpResolver.xml" url="JnlpResolver.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.javawebstart.Bundle#Services/MIMEResolver/JnlpResolver.xml"/>
- <attr name="position" intvalue="200"/>
- </file>
- </folder>
- </folder>
<folder name="Templates">
<folder name="JWS">
<attr name="position" intvalue="0"/>
diff --git a/languages.diff/nbproject/project.xml
b/languages.diff/nbproject/project.xml
--- a/languages.diff/nbproject/project.xml
+++ b/languages.diff/nbproject/project.xml
@@ -19,7 +19,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.20</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages.diff/src/org/netbeans/modules/languages/diff/Bundle.properties
b/languages.diff/src/org/netbeans/modules/languages/diff/Bundle.properties
--- a/languages.diff/src/org/netbeans/modules/languages/diff/Bundle.properties
+++ b/languages.diff/src/org/netbeans/modules/languages/diff/Bundle.properties
@@ -46,7 +46,7 @@
OpenIDE-Module-Long-Description=Support for editing .diff files.
text/x-diff=Diff File
-Services/MIMEResolver/Diff.xml=Diff Files
+DiffResolver=Diff Files
index=Index
header=Header
diff --git a/languages.diff/src/org/netbeans/modules/languages/diff/Diff.xml
b/languages.diff/src/org/netbeans/modules/languages/diff/Diff.xml
deleted file mode 100644
--- a/languages.diff/src/org/netbeans/modules/languages/diff/Diff.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="patch"/>
- <ext name="diff"/>
- <ext name="rej"/>
- <resolver mime="text/x-diff"/>
- </file>
-</MIME-resolver>
diff --git
a/languages.diff/src/org/netbeans/modules/languages/diff/DiffDataObject.java
b/languages.diff/src/org/netbeans/modules/languages/diff/DiffDataObject.java
---
a/languages.diff/src/org/netbeans/modules/languages/diff/DiffDataObject.java
+++
b/languages.diff/src/org/netbeans/modules/languages/diff/DiffDataObject.java
@@ -7,6 +7,7 @@
import java.io.IOException;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -18,6 +19,12 @@
import org.openide.text.DataEditorSupport;
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-diff",
+ position=180,
+ displayName="#DiffResolver",
+ extension={ "diff", "rej", "patch" }
+)
public class DiffDataObject extends MultiDataObject {
public DiffDataObject (FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git a/languages.diff/src/org/netbeans/modules/languages/diff/layer.xml
b/languages.diff/src/org/netbeans/modules/languages/diff/layer.xml
--- a/languages.diff/src/org/netbeans/modules/languages/diff/layer.xml
+++ b/languages.diff/src/org/netbeans/modules/languages/diff/layer.xml
@@ -19,14 +19,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
<filesystem>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="Diff.xml" url="Diff.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.languages.diff.Bundle"/>
- <attr name="position" intvalue="180"/>
- </file>
- </folder>
- </folder>
<folder name="Editors">
<folder name="text">
<folder name="x-diff">
diff --git a/languages.ini/nbproject/project.xml
b/languages.ini/nbproject/project.xml
--- a/languages.ini/nbproject/project.xml
+++ b/languages.ini/nbproject/project.xml
@@ -28,7 +28,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.36</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages.ini/src/org/netbeans/modules/languages/ini/IniDataObject.java
b/languages.ini/src/org/netbeans/modules/languages/ini/IniDataObject.java
--- a/languages.ini/src/org/netbeans/modules/languages/ini/IniDataObject.java
+++ b/languages.ini/src/org/netbeans/modules/languages/ini/IniDataObject.java
@@ -49,6 +49,7 @@
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -59,6 +60,13 @@
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
+@Messages("INIResolver=INI Files")
+@MIMEResolver.ExtensionRegistration(
+ displayName = "#INIResolver",
+ mimeType = "text/x-ini",
+ position = 133,
+ extension = {"ini", "INI"}
+)
public class IniDataObject extends MultiDataObject {
private static final long serialVersionUID = 46532134863231L;
diff --git
a/languages.ini/src/org/netbeans/modules/languages/ini/resources/Bundle.properties
b/languages.ini/src/org/netbeans/modules/languages/ini/resources/Bundle.properties
---
a/languages.ini/src/org/netbeans/modules/languages/ini/resources/Bundle.properties
+++
b/languages.ini/src/org/netbeans/modules/languages/ini/resources/Bundle.properties
@@ -47,7 +47,6 @@
OpenIDE-Module-Short-Description=Support for editing INI files.
text/x-ini=INI File
-Services/MIMEResolver/Ini.xml=INI Files
Templates/Other/EmptyINI.ini=INI File
Loaders/text/x-ini/Factories/IniDataLoader.instance=INI Files
diff --git
a/languages.ini/src/org/netbeans/modules/languages/ini/resources/Ini.xml
b/languages.ini/src/org/netbeans/modules/languages/ini/resources/Ini.xml
deleted file mode 100644
--- a/languages.ini/src/org/netbeans/modules/languages/ini/resources/Ini.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="ini"/>
- <ext name="INI"/>
- <resolver mime="text/x-ini"/>
- </file>
-</MIME-resolver>
diff --git
a/languages.ini/src/org/netbeans/modules/languages/ini/resources/layer.xml
b/languages.ini/src/org/netbeans/modules/languages/ini/resources/layer.xml
--- a/languages.ini/src/org/netbeans/modules/languages/ini/resources/layer.xml
+++ b/languages.ini/src/org/netbeans/modules/languages/ini/resources/layer.xml
@@ -19,14 +19,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
<filesystem>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="Ini.xml" url="Ini.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.languages.ini.resources.Bundle"/>
- <attr name="position" intvalue="133"/>
- </file>
- </folder>
- </folder>
<folder name="Editors">
<folder name="text">
<folder name="x-ini">
diff --git a/languages.manifest/nbproject/project.xml
b/languages.manifest/nbproject/project.xml
--- a/languages.manifest/nbproject/project.xml
+++ b/languages.manifest/nbproject/project.xml
@@ -28,7 +28,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.20</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages.manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties
b/languages.manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties
---
a/languages.manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties
+++
b/languages.manifest/src/org/netbeans/modules/languages/manifest/Bundle.properties
@@ -46,7 +46,7 @@
OpenIDE-Module-Long-Description=Support for editing .manifest files.
text/x-manifest=Manifest File
-Services/MIMEResolver/Manifest.xml=Manifest Files
+ManifestResolver=Manifest Files
comment=Line Comment
keyword=Key
diff --git
a/languages.manifest/src/org/netbeans/modules/languages/manifest/Manifest.xml
b/languages.manifest/src/org/netbeans/modules/languages/manifest/Manifest.xml
deleted file mode 100644
---
a/languages.manifest/src/org/netbeans/modules/languages/manifest/Manifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="mf"/>
- <ext name="MF"/>
- <resolver mime="text/x-manifest"/>
- </file>
-</MIME-resolver>
diff --git
a/languages.manifest/src/org/netbeans/modules/languages/manifest/MfDataObject.java
b/languages.manifest/src/org/netbeans/modules/languages/manifest/MfDataObject.java
---
a/languages.manifest/src/org/netbeans/modules/languages/manifest/MfDataObject.java
+++
b/languages.manifest/src/org/netbeans/modules/languages/manifest/MfDataObject.java
@@ -9,6 +9,7 @@
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -19,7 +20,12 @@
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
-
+@MIMEResolver.ExtensionRegistration(
+ displayName="#ManifestResolver",
+ position=130,
+ extension={ "mf", "MF" },
+ mimeType="text/x-manifest"
+)
public class MfDataObject extends MultiDataObject {
public MfDataObject (FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git
a/languages.manifest/src/org/netbeans/modules/languages/manifest/layer.xml
b/languages.manifest/src/org/netbeans/modules/languages/manifest/layer.xml
--- a/languages.manifest/src/org/netbeans/modules/languages/manifest/layer.xml
+++ b/languages.manifest/src/org/netbeans/modules/languages/manifest/layer.xml
@@ -91,14 +91,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="Manifest.xml" url="Manifest.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.languages.manifest.Bundle"/>
- <attr name="position" intvalue="130"/>
- </file>
- </folder>
- </folder>
<folder name="OptionsDialog">
<folder name="PreviewExamples">
<folder name="text">
diff --git a/languages.neon/nbproject/project.xml
b/languages.neon/nbproject/project.xml
--- a/languages.neon/nbproject/project.xml
+++ b/languages.neon/nbproject/project.xml
@@ -36,7 +36,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.47.1</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages.neon/src/org/netbeans/modules/languages/neon/NeonDataObject.java
b/languages.neon/src/org/netbeans/modules/languages/neon/NeonDataObject.java
---
a/languages.neon/src/org/netbeans/modules/languages/neon/NeonDataObject.java
+++
b/languages.neon/src/org/netbeans/modules/languages/neon/NeonDataObject.java
@@ -48,6 +48,7 @@
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -62,6 +63,13 @@
*
* @author Ondrej Brejla
< >
*/
+@Messages("NeonResolver=Neon Files")
+@MIMEResolver.ExtensionRegistration(
+ displayName="#NeonResolver",
+ position=135,
+ extension="neon",
+ mimeType="text/x-neon"
+)
public class NeonDataObject extends MultiDataObject {
public NeonDataObject(FileObject pf, MultiFileLoader loader) throws
DataObjectExistsException, IOException {
diff --git
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/Bundle.properties
b/languages.neon/src/org/netbeans/modules/languages/neon/resources/Bundle.properties
---
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/Bundle.properties
+++
b/languages.neon/src/org/netbeans/modules/languages/neon/resources/Bundle.properties
@@ -3,7 +3,6 @@
Support for editing NEON files.
OpenIDE-Module-Name=NEON File Editor Support
OpenIDE-Module-Short-Description=Support for editing NEON files.
-Services/MIMEResolver/NeonResolver.xml=Neon Files
Templates/Other/NeonTemplate.neon=Neon file
Loaders/text/x-neon/Factories/NeonDataLoader.instance=Neon Files
diff --git
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/NeonResolver.xml
b/languages.neon/src/org/netbeans/modules/languages/neon/resources/NeonResolver.xml
deleted file mode 100644
---
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/NeonResolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="neon"/>
- <resolver mime="text/x-neon"/>
- </file>
-</MIME-resolver>
diff --git
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml
b/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml
---
a/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml
+++
b/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml
@@ -74,14 +74,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="NeonResolver.xml" url="NeonResolver.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.modules.languages.neon.resources.Bundle#Services/MIMEResolver/NeonResolver.xml"/>
- <attr name="position" intvalue="135"/>
- </file>
- </folder>
- </folder>
<folder name="Templates">
<folder name="Other">
<file name="NeonTemplate.neon" url="NeonTemplate.neon">
diff --git a/languages.yaml/nbproject/project.xml
b/languages.yaml/nbproject/project.xml
--- a/languages.yaml/nbproject/project.xml
+++ b/languages.yaml/nbproject/project.xml
@@ -24,6 +24,15 @@
</run-dependency>
</dependency>
<dependency>
+
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>2.11</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -69,12 +78,12 @@
</run-dependency>
</dependency>
<dependency>
-
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
+
<code-name-base>org.netbeans.modules.lexer</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
- <specification-version>2.11</specification-version>
+ <specification-version>1.25</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -87,20 +96,11 @@
</run-dependency>
</dependency>
<dependency>
-
<code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.25</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.openide.filesystems</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.0</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties
b/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties
--- a/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties
+++ b/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties
@@ -45,7 +45,7 @@
OpenIDE-Module-Short-Description=Support for editing YAML files.
OpenIDE-Module-Long-Description=Support for editing YAML files.
-Services/MIMEResolver/YAML.xml=YAML Files
+YAMLResolver=YAML Files
Templates/Ruby/EmptyYAML.yml=YAML File
Templates/Other/EmptyYAML.yml=YAML File
text/x-yaml=Yaml
diff --git a/languages.yaml/src/org/netbeans/modules/languages/yaml/YAML.xml
b/languages.yaml/src/org/netbeans/modules/languages/yaml/YAML.xml
deleted file mode 100644
--- a/languages.yaml/src/org/netbeans/modules/languages/yaml/YAML.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="yml"/>
- <ext name="yaml"/>
- <resolver mime="text/x-yaml"/>
- </file>
-</MIME-resolver>
diff --git
a/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
b/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
--- a/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
+++ b/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
@@ -51,12 +51,19 @@
import org.netbeans.modules.csl.spi.DefaultLanguageConfig;
import org.netbeans.modules.csl.spi.LanguageRegistration;
import org.netbeans.modules.parsing.spi.Parser;
+import org.openide.filesystems.MIMEResolver;
/**
* GSF Configuration for YAML
*
* @author Tor Norbye
*/
+@MIMEResolver.ExtensionRegistration(
+ displayName="#YAMLResolver",
+ extension={ "yml", "yaml" },
+ mimeType="text/x-yaml",
+ position=280
+)
@LanguageRegistration(mimeType="text/x-yaml") //NOI18N
public class YamlLanguage extends DefaultLanguageConfig {
diff --git a/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
b/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
--- a/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
+++ b/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
@@ -45,14 +45,6 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN"
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
<filesystem>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="YAML.xml" url="YAML.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.languages.yaml.Bundle"/>
- <attr name="position" intvalue="280"/>
- </file>
- </folder>
- </folder>
<folder name="Editors">
<folder name="text">
<folder name="x-yaml">
diff --git a/languages/nbproject/project.xml b/languages/nbproject/project.xml
--- a/languages/nbproject/project.xml
+++ b/languages/nbproject/project.xml
@@ -145,7 +145,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>6.3</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/languages/src/org/netbeans/modules/languages/dataobject/Bundle.properties
b/languages/src/org/netbeans/modules/languages/dataobject/Bundle.properties
---
a/languages/src/org/netbeans/modules/languages/dataobject/Bundle.properties
+++
b/languages/src/org/netbeans/modules/languages/dataobject/Bundle.properties
@@ -50,3 +50,4 @@
HINT_codeFoldingEnable=Enable Code Folding
GLFFilesCustomEditor.jLabel1.text=Installed NBS Files:
GLFFilesCustomEditor.bEdit.text=Edit
+NBSResolver=NetBeans Syntax Definition Files
diff --git
a/languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java
b/languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java
---
a/languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java
+++
b/languages/src/org/netbeans/modules/languages/dataobject/LanguagesDataObject.java
@@ -61,10 +61,17 @@
import java.util.HashMap;
import java.util.Map;
import org.openide.filesystems.FileLock;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.util.Lookup;
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-nbs",
+ position=210,
+ displayName="#NBSResolver",
+ extension={ "nbs" }
+)
public class LanguagesDataObject extends MultiDataObject {
public LanguagesDataObject(FileObject pf, LanguagesDataLoader loader)
throws DataObjectExistsException, IOException {
diff --git
a/languages/src/org/netbeans/modules/languages/resources/Languagesresolver.xml
b/languages/src/org/netbeans/modules/languages/resources/Languagesresolver.xml
deleted file mode 100644
---
a/languages/src/org/netbeans/modules/languages/resources/Languagesresolver.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="nbs"/>
- <resolver mime="text/x-nbs"/>
- </file>
-</MIME-resolver>
diff --git a/languages/src/org/netbeans/modules/languages/resources/layer.xml
b/languages/src/org/netbeans/modules/languages/resources/layer.xml
--- a/languages/src/org/netbeans/modules/languages/resources/layer.xml
+++ b/languages/src/org/netbeans/modules/languages/resources/layer.xml
@@ -230,14 +230,6 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="Languagesresolver.xml" url="Languagesresolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.languages.Bundle"/>
- <attr name="position" intvalue="210"/>
- </file>
- </folder>
- </folder>
<folder name="Windows2">
<folder name="Components">
<file name="TokensBrowserTopComponent.settings"
url="TokensBrowserTopComponentSettings.xml"/>
diff --git a/maven.grammar/nbproject/project.xml
b/maven.grammar/nbproject/project.xml
--- a/maven.grammar/nbproject/project.xml
+++ b/maven.grammar/nbproject/project.xml
@@ -239,7 +239,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/maven.grammar/src/org/netbeans/modules/maven/grammar/Bundle.properties
b/maven.grammar/src/org/netbeans/modules/maven/grammar/Bundle.properties
--- a/maven.grammar/src/org/netbeans/modules/maven/grammar/Bundle.properties
+++ b/maven.grammar/src/org/netbeans/modules/maven/grammar/Bundle.properties
@@ -41,6 +41,6 @@
OpenIDE-Module-Display-Category=Maven
OpenIDE-Module-Name=Maven Editor
OpenIDE-Module-Long-Description=NetBeans Maven integration XML grammar
provider, offers code completion for Maven project files etc.
-Services/MIMEResolver/POMResolver.xml=Apache Maven POM Files
+POMResolver=Apache Maven POM Files
Editors/text/x-maven-pom+xml=Apache Maven POM Files
diff --git
a/maven.grammar/src/org/netbeans/modules/maven/grammar/POMDataObject.java
b/maven.grammar/src/org/netbeans/modules/maven/grammar/POMDataObject.java
--- a/maven.grammar/src/org/netbeans/modules/maven/grammar/POMDataObject.java
+++ b/maven.grammar/src/org/netbeans/modules/maven/grammar/POMDataObject.java
@@ -63,6 +63,7 @@
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
@@ -79,6 +80,11 @@
import org.xml.sax.SAXException;
@Messages("CTL_SourceTabCaption=&Source")
+@MIMEResolver.Registration(
+ displayName="#POMResolver",
+ position=309,
+ resource="POMResolver.xml"
+)
public class POMDataObject extends MultiDataObject {
public static final String SETTINGS_MIME_TYPE =
"text/x-maven-settings+xml";
diff --git a/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
b/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
--- a/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
+++ b/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
@@ -182,12 +182,4 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="POMResolver.xml" url="POMResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.maven.grammar.Bundle"/>
- <attr name="position" intvalue="309"/>
- </file>
- </folder>
- </folder>
</filesystem>
diff --git a/mobility.end2end/nbproject/project.xml
b/mobility.end2end/nbproject/project.xml
--- a/mobility.end2end/nbproject/project.xml
+++ b/mobility.end2end/nbproject/project.xml
@@ -329,7 +329,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/E2EDataObject.java
b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/E2EDataObject.java
---
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/E2EDataObject.java
+++
b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/E2EDataObject.java
@@ -103,6 +103,7 @@
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.modules.xml.multiview.XmlMultiViewElement;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
@@ -110,7 +111,16 @@
*
* @author Michal Skvor, Anton Chechel
*/
-@Messages("CTL_SourceTabCaption=Source") // NOI18N
+@Messages({
+ "CTL_SourceTabCaption=Source",
+ "WSClientResolver=Mobility End to End Files"
+}) // NOI18N
+@MIMEResolver.ExtensionRegistration(
+ displayName="#WSClientResolver",
+ extension="wsclient",
+ mimeType="text/x-wsclient",
+ position=1000
+)
public class E2EDataObject extends XmlMultiViewDataObject {
public static final String PROP_GENERATING = "generating"; // NOI18N
public static final String ICON_BASE =
"org/netbeans/modules/mobility/end2end/DDDataIcon.gif"; // NOI18N
diff --git
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/e2e-mime-resolver.xml
b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/e2e-mime-resolver.xml
deleted file mode 100644
---
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/e2e-mime-resolver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="wsclient"/>
- <resolver mime="text/x-wsclient"/>
- </file>
-</MIME-resolver>
diff --git
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/layer.xml
b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/layer.xml
---
a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/layer.xml
+++
b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/resources/layer.xml
@@ -168,11 +168,4 @@
</folder>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file
name="org-netbeans-modules-mobility-end2end-mime-resolver.xml"
url="e2e-mime-resolver.xml">
- <attr name="position" intvalue="1000"/>
- </file>
- </folder>
- </folder>
</filesystem>
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/Bundle.properties
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/Bundle.properties
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/Bundle.properties
+++
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/Bundle.properties
@@ -45,8 +45,7 @@
OpenIDE-Module-Name=Java ME SVG Core
Loaders/image/svg+xml/Factories/org-netbeans-modules-mobility-svgcore-SVGDataLoader.instance=SVG
Image Files
Loaders/text/x-svg-palette-item/Factories/org-netbeans-modules-mobility-svgcore-palette-SVGPaletteItemDataLoader.instance=SVG
Palette Item Files
-Services/MIMEResolver/SVGPaletteItemResolver.xml=SVGPaletteItem Files
-Services/MIMEResolver/SVGResolver.xml=SVG Files
+SVGResolver=SVG Files
Templates/Other/Image.svg=SVG File
LBL_MULVIEW_TITLE_VIEW=Preview
LBL_MULVIEW_TITLE_SOURCE=Source
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/SVGDataObject.java
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/SVGDataObject.java
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/SVGDataObject.java
+++
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/SVGDataObject.java
@@ -73,11 +73,7 @@
import org.netbeans.spi.xml.cookies.ValidateXMLSupport;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
-import org.openide.filesystems.FileChangeListener;
-import org.openide.filesystems.FileLock;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileStateInvalidException;
-import org.openide.filesystems.FileSystem;
+import org.openide.filesystems.*;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.SaveAsCapable;
import org.openide.nodes.Node;
@@ -92,6 +88,12 @@
*
* @author Pavel Benes
*/
+@MIMEResolver.ExtensionRegistration(
+ mimeType="image/svg+xml",
+ position=260,
+ displayName="#SVGResolver",
+ extension={ "svg", "SVG", "svgz", "SVGZ" }
+)
@SuppressWarnings({"unchecked"})
public final class SVGDataObject extends XmlMultiViewDataObject {
private static final long serialVersionUID = 123471457562776148L;
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties
+++
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/Bundle.properties
@@ -44,4 +44,5 @@
LBL_Select=Select
ERROR_NotDirectory={0} is not valid directory!
CTL_SVGPaletteManagerAction=SV&G Shapes
+SVGPaletteItemResolver=SVGPaletteItem Files
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java
+++
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/palette/SVGPaletteItemDataObject.java
@@ -56,6 +56,7 @@
import org.netbeans.modules.mobility.svgcore.SVGDataObject;
import org.netbeans.modules.mobility.svgcore.composer.SceneManager;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.nodes.Node;
@@ -68,6 +69,12 @@
*
* @author Pavel Benes
*/
+@MIMEResolver.ExtensionRegistration(
+ mimeType="text/x-svg-palette-item",
+ position=250,
+ displayName="#SVGPaletteItemResolver",
+ extension={ "svgPaletteItem" }
+)
public final class SVGPaletteItemDataObject extends MultiDataObject {
private final SVGPaletteItemData m_data;
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGPaletteItemResolver.xml
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGPaletteItemResolver.xml
deleted file mode 100644
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGPaletteItemResolver.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<MIME-resolver>
- <file>
- <ext name="svgPaletteItem"/>
- <resolver mime="text/x-svg-palette-item"/>
- </file>
-</MIME-resolver>
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGResolver.xml
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGResolver.xml
deleted file mode 100644
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/SVGResolver.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN"
"http://www.netbeans.org/dtds/mime-resolver-1_0.dtd";>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<MIME-resolver>
- <file>
- <ext name="svg"/>
- <ext name="SVG"/>
- <ext name="svgz"/>
- <ext name="SVGZ"/>
- <resolver mime="image/svg+xml"/>
- </file>
-</MIME-resolver>
diff --git
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/layer.xml
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/layer.xml
---
a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/layer.xml
+++
b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/resources/layer.xml
@@ -503,18 +503,6 @@
<file
name="org-netbeans-modules-mobility-svgcore-options-SvgcoreAdvancedOption.instance"/>
</folder>
</folder>
- <folder name="Services">
- <folder name="MIMEResolver">
- <file name="SVGPaletteItemResolver.xml"
url="SVGPaletteItemResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.mobility.svgcore.Bundle"/>
- <attr name="position" intvalue="250"/>
- </file>
- <file name="SVGResolver.xml" url="SVGResolver.xml">
- <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.mobility.svgcore.Bundle"/>
- <attr name="position" intvalue="260"/>
- </file>
- </folder>
- </folder>
<folder name="xml">
<folder name="entities">
<folder name="W3C">
diff --git a/o.apache.tools.ant.module/nbproject/project.xml
b/o.apache.tools.ant.module/nbproject/project.xml
--- a/o.apache.tools.ant.module/nbproject/project.xml
+++ b/o.apache.tools.ant.module/nbproject/project.xml
@@ -157,7 +157,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.55</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java
---
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java
+++
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/AntProjectDataObject.java
@@ -56,6 +56,7 @@
import org.netbeans.spi.xml.cookies.DataObjectAdapters;
import org.openide.cookies.SaveCookie;
import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
@@ -66,6 +67,11 @@
import org.openide.util.NbBundle.Messages;
import org.openide.windows.TopComponent;
+@MIMEResolver.Registration(
+ displayName="#AntResolver",
+ position=310,
+ resource="../resources/ant-mime-resolver.xml"
+)
public class AntProjectDataObject extends MultiDataObject implements
PropertyChangeListener {
public static final String MIME_TYPE = "text/x-ant+xml"; // NOI18N
diff --git
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/Bundle.properties
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/Bundle.properties
---
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/Bundle.properties
+++
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/loader/Bundle.properties
@@ -46,3 +46,5 @@
# {0} - regular file name (w/ or w/o ext) for editor tabs
# {1} - Ant project name
LBL_editor_tab={0} [{1}]
+AntResolver=Ant <project> XML files
+
diff --git
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
---
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
+++
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
@@ -79,14 +79,6 @@
<folder name="Services">
- <!-- Recognize text/x-ant+xml: -->
- <folder name="MIMEResolver">
- <file name="org-apache-tools-ant-module-mime-resolver.xml"
url="ant-mime-resolver.xml">
- <attr name="displayName"
bundlevalue="org.apache.tools.ant.module.resources.Bundle#Services/MIMEResolver/org-apache-tools-ant-module-mime-resolver.xml"/>
- <attr name="iconBase"
stringvalue="org/apache/tools/ant/module/resources/AntIcon.gif"/>
- <attr name="position" intvalue="310"/>
- </file>
- </folder>
<folder name="Hidden">
<file name="com-jcraft-jzlib-antlibrary.instance">
<attr name="instanceCreate"
methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
diff --git
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Bundle.properties
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Bundle.properties
---
a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Bundle.properties
+++
b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Bundle.properties
@@ -43,6 +43,5 @@
# File names:
Templates/Other/Project.xml=Ant Build Script
Templates/Other/CustomTask.java=Custom Ant Task
-Services/MIMEResolver/org-apache-tools-ant-module-mime-resolver.xml=Ant
<project> XML files
text/x-ant+xml=Ant Build Scripts
OptionsExport.displayName=Ant Shortcuts
diff --git a/php.editor/nbproject/project.xml
b/php.editor/nbproject/project.xml
--- a/php.editor/nbproject/project.xml
+++ b/php.editor/nbproject/project.xml
@@ -284,7 +284,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.19</specification-version>
+ <specification-version>7.58</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
b/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
--- a/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
+++ b/php.editor/src/org/netbeans/modules/php/editor/index/PHPIndexer.java
@@ -90,7 +90,9 @@
import org.netbeans.modules.php.project.api.PhpSourcePath;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
+import org.openide.filesystems.MIMEResolver;
import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
/**
* Index Ruby structure into the persistent store for retrieval by
@@ -111,9 +113,17 @@
public final class PHPIndexer extends EmbeddingIndexer {
private static final Logger LOG =
Logger.getLogger(PHPIndexer.class.getName());
static final boolean PREINDEXING = Boolean.getBoolean("gsf.preindexing");
+ @MIMEResolver.ExtensionRegistration(
+ extension={ "php", "php3", "php4", "php5", "phtml", "inc", "phpt" },
+ displayName="#PHPResolver",
+ mimeType="text/x-php5",
+ position=282
+ )
+ @NbBundle.Messages("PHPResolver=PHP Files")
// a workaround for issue #132388
private static final Collection<String>INDEXABLE_EXTENSIONS =
Arrays.asList(
- "php", "php3", "php4", "php5", "phtml", "inc"); //NOI18N
+ "php", "php3", "php4", "php5", "phtml", "inc", "phpt"
+ );
// I need to be able to search several things:
// (1) by function root name, e.g. quickly all functions that start
diff --git
a/php.editor/src/org/netbeans/modules/php/editor/resources/Bundle.properties
b/php.editor/src/org/netbeans/modules/php/editor/resources/Bundle.properties
---
a/php.editor/src/org/netbeans/modules/php/editor/resources/Bundle.properties
|
[hg] main-silver: Registering mime types with @MimeResolver.xyzR... |
Jaroslav Tulach | 02/02/2012 |
