Skip to content

Commit

Permalink
Merge pull request #123 from stengerh/registration-annotations
Browse files Browse the repository at this point in the history 
Use annotation-based registrations
  • Loading branch information
@madflow
madflow authored Apr 13, 2017
2 parents ee16f5b + 237cfa1 commit 397f1d8
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 103 deletions.
69 changes: 69 additions & 0 deletions src/flow/netbeans/markdown/MarkdownDataObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
import java.io.IOException;
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.MIMEResolver;
import org.openide.loaders.DataNode;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectExistsException;
import org.openide.loaders.MultiDataObject;
import org.openide.loaders.MultiFileLoader;
Expand All @@ -18,6 +23,70 @@
import org.openide.util.lookup.ProxyLookup;
import org.openide.windows.TopComponent;

@NbBundle.Messages("Markdown=Markdown")
@MIMEResolver.ExtensionRegistration(
displayName = "flow.netbeans.markdown.resources.Bundle#Services/MIMEResolver/MarkdownResolver.xml",
mimeType = MarkdownLanguageConfig.MIME_TYPE,
extension = {"md", "MD", "markdown", "MARKDOWN", "mkd", "MKD"},
position = 7314
)
@DataObject.Registration(
displayName = "#Markdown",
iconBase = "flow/netbeans/markdown/resources/markdown-mark-16x16.png",
mimeType = MarkdownLanguageConfig.MIME_TYPE
)
@ActionReferences({
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.OpenAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 100,
separatorAfter = 200
),
@ActionReference(
id = @ActionID(category = "Edit", id = "org.openide.actions.CutAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 300
),
@ActionReference(
id = @ActionID(category = "Edit", id = "org.openide.actions.CopyAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 400,
separatorAfter = 500
),
@ActionReference(
id = @ActionID(category = "Edit", id = "org.openide.actions.DeleteAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 600
),
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.RenameAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 700,
separatorAfter = 800
),
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.SaveAsTemplateAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 900,
separatorAfter = 1000
),
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.FileSystemAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 1100,
separatorAfter = 1200
),
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.ToolsAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 1300
),
@ActionReference(
id = @ActionID(category = "System", id = "org.openide.actions.PropertiesAction"),
path = "Loaders/" + MarkdownLanguageConfig.MIME_TYPE + "/Actions",
position = 1400
)
})
public class MarkdownDataObject extends MultiDataObject {
private static final long serialVersionUID = 1L;

Expand Down
8 changes: 8 additions & 0 deletions src/flow/netbeans/markdown/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@org.netbeans.api.templates.TemplateRegistration(
content = "resources/MarkdownTemplate.md",
displayName = "flow.netbeans.markdown.resources.Bundle#Templates/Other/MarkdownTemplate.md",
description = "resources/MarkdownTemplateDescription.html",
folder = "Other",
requireProject = false
)
package flow.netbeans.markdown;
13 changes: 0 additions & 13 deletions src/flow/netbeans/markdown/resources/MarkdownResolver.xml
View file

This file was deleted.

91 changes: 1 addition & 90 deletions src/flow/netbeans/markdown/resources/layer.xml
View file
Original file line number Diff line number Diff line change
@@ -1,78 +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="Loaders">
<folder name="text">
<folder name="x-markdown">
<folder name="Actions">
<file name="org-openide-actions-CopyAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
<attr name="position" intvalue="400"/>
</file>
<file name="org-openide-actions-CutAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
<attr name="position" intvalue="300"/>
</file>
<file name="org-openide-actions-DeleteAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-DeleteAction.instance"/>
<attr name="position" intvalue="600"/>
</file>
<file name="org-openide-actions-FileSystemAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
<attr name="position" intvalue="1100"/>
</file>
<file name="org-openide-actions-OpenAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-OpenAction.instance"/>
<attr name="position" intvalue="100"/>
</file>
<file name="org-openide-actions-PropertiesAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-PropertiesAction.instance"/>
<attr name="position" intvalue="1400"/>
</file>
<file name="org-openide-actions-RenameAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-RenameAction.instance"/>
<attr name="position" intvalue="700"/>
</file>
<file name="org-openide-actions-SaveAsTemplateAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
<attr name="position" intvalue="900"/>
</file>
<file name="org-openide-actions-ToolsAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
<attr name="position" intvalue="1300"/>
</file>
<file name="sep-1.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="200"/>
</file>
<file name="sep-2.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="500"/>
</file>
<file name="sep-3.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="800"/>
</file>
<file name="sep-4.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="1000"/>
</file>
<file name="sep-5.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="1200"/>
</file>
</folder>
<folder name="Factories">
<file name="MarkdownDataLoader.instance">
<attr name="dataObjectClass" stringvalue="flow.netbeans.markdown.MarkdownDataObject"/>
<attr name="iconBase" stringvalue="flow/netbeans/markdown/resources/markdown-mark-16x16.png"/>
<attr name="instanceCreate" methodvalue="org.openide.loaders.DataLoaderPool.factory"/>
<attr name="mimeType" stringvalue="text/x-markdown"/>
</file>
</folder>
</folder>
</folder>
</folder>
<folder name="Editors">
<folder name="text">
<folder name="x-markdown">
Expand Down Expand Up @@ -102,7 +30,7 @@
-->
<folder name="Hints">
<file name="org-netbeans-modules-spellchecker-hints-DictionaryBasedHintsProvider.instance">
<attr name="instanceCreate" methodvalue="org.netbeans.modules.spellchecker.hints.DictionaryBasedHintsProvider.create" />
<attr name="instanceCreate" methodvalue="org.netbeans.modules.spellchecker.hints.DictionaryBasedHintsProvider.create"/>
</file>
</folder>
<folder name="CompletionProviders">
Expand All @@ -118,23 +46,6 @@
</folder>
</folder>
</folder>
<folder name="Templates">
<folder name="Other">
<file name="MarkdownTemplate.md" url="MarkdownTemplate.md">
<attr name="displayName" bundlevalue="flow.netbeans.markdown.resources.Bundle#Templates/Other/MarkdownTemplate.md"/>
<attr name="templateWizardURL" urlvalue="nbresloc:/flow/netbeans/markdown/resources/MarkdownTemplateDescription.html"/>
<attr name="template" boolvalue="true"/>
<attr name="requireProject" boolvalue="false"/>
</file>
</folder>
</folder>
<folder name="Services">
<folder name="MIMEResolver">
<file name="MarkdownResolver.xml" url="MarkdownResolver.xml">
<attr name="displayName" bundlevalue="flow.netbeans.markdown.resources.Bundle#Services/MIMEResolver/MarkdownResolver.xml"/>
</file>
</folder>
</folder>
<folder name="Spellcheckers">
<file name="Markdown">
<attr name="displayName" bundlevalue="flow.netbeans.markdown.resources.Bundle#text/x-markdown"/>
Expand Down

0 comments on commit 397f1d8

Please sign in to comment.