diff --git a/editor.bracesmatching/src/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.java b/editor.bracesmatching/src/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.java --- a/editor.bracesmatching/src/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.java +++ b/editor.bracesmatching/src/org/netbeans/spi/editor/bracesmatching/BracesMatcherFactory.java @@ -43,6 +43,9 @@ */ package org.netbeans.spi.editor.bracesmatching; +import org.netbeans.modules.editor.bracesmatching.BMFClass2LayerFolder; +import org.netbeans.spi.editor.mimelookup.MimeLocation; + /** * The factory for creating {@link BracesMatcher}s. Instances of this class * are supposed to be registered in MIME lookup under the mime type of documents @@ -50,6 +53,7 @@ * * @author Vita Stejskal */ +@MimeLocation(subfolderName=BMFClass2LayerFolder.FOLDER) public interface BracesMatcherFactory { /** diff --git a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateFilter.java b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateFilter.java --- a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateFilter.java +++ b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateFilter.java @@ -46,6 +46,7 @@ import javax.swing.text.JTextComponent; import org.netbeans.lib.editor.codetemplates.api.CodeTemplate; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * Filter accepting code templates being displayed in a code completion popup. @@ -68,6 +69,7 @@ *
* It should be registered in the MimeLookup for a given mime-type. */ + @MimeLocation(subfolderName="CodeTemplateFilterFactories") public interface Factory { /** diff --git a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateProcessorFactory.java b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateProcessorFactory.java --- a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateProcessorFactory.java +++ b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/spi/CodeTemplateProcessorFactory.java @@ -44,6 +44,8 @@ package org.netbeans.lib.editor.codetemplates.spi; +import org.netbeans.spi.editor.mimelookup.MimeLocation; + /** * Factory constructs code template processor for a given insert request. *
@@ -54,6 +56,7 @@ * * @author Miloslav Metelka */ +@MimeLocation(subfolderName="CodeTemplateProcessorFactories") public interface CodeTemplateProcessorFactory { /** diff --git a/editor.completion/nbproject/project.properties b/editor.completion/nbproject/project.properties --- a/editor.completion/nbproject/project.properties +++ b/editor.completion/nbproject/project.properties @@ -44,4 +44,4 @@ javac.source=1.6 javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -spec.version.base=1.22.0 +spec.version.base=1.23.0 diff --git a/editor.completion/src/org/netbeans/spi/editor/completion/CompletionProvider.java b/editor.completion/src/org/netbeans/spi/editor/completion/CompletionProvider.java --- a/editor.completion/src/org/netbeans/spi/editor/completion/CompletionProvider.java +++ b/editor.completion/src/org/netbeans/spi/editor/completion/CompletionProvider.java @@ -45,6 +45,7 @@ package org.netbeans.spi.editor.completion; import javax.swing.text.JTextComponent; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * The basic interface for providing code completion items. You should implement this interface @@ -60,7 +61,7 @@ * @author Miloslav Metelka, Dusan Balek * @version 1.01 */ - +@MimeLocation(subfolderName="CompletionProviders") public interface CompletionProvider { /** diff --git a/editor.errorstripe.api/nbproject/project.properties b/editor.errorstripe.api/nbproject/project.properties --- a/editor.errorstripe.api/nbproject/project.properties +++ b/editor.errorstripe.api/nbproject/project.properties @@ -40,6 +40,8 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. +javac.compilerargs=-Xlint -Xlint:-serial +javac.source=1.5 spec.version.base=2.13.0 is.autoload=true diff --git a/editor.errorstripe.api/nbproject/project.xml b/editor.errorstripe.api/nbproject/project.xml --- a/editor.errorstripe.api/nbproject/project.xml +++ b/editor.errorstripe.api/nbproject/project.xml @@ -48,7 +48,17 @@ org.netbeans.modules.editor.errorstripe.api - + + + org.netbeans.modules.editor.mimelookup + + + + 1 + 1.19 + + + org.netbeans.spi.editor.errorstripe diff --git a/editor.errorstripe.api/src/org/netbeans/spi/editor/errorstripe/UpToDateStatusProviderFactory.java b/editor.errorstripe.api/src/org/netbeans/spi/editor/errorstripe/UpToDateStatusProviderFactory.java --- a/editor.errorstripe.api/src/org/netbeans/spi/editor/errorstripe/UpToDateStatusProviderFactory.java +++ b/editor.errorstripe.api/src/org/netbeans/spi/editor/errorstripe/UpToDateStatusProviderFactory.java @@ -45,12 +45,14 @@ package org.netbeans.spi.editor.errorstripe; import javax.swing.text.Document; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /**A creator for MarkProviders. Should register an instance under Editors/text/base/UpToDateStatusProvider * or Editors/<MIME-Type>/UpToDateStatusProvider. * * @author Jan Lahoda */ +@MimeLocation(subfolderName="UpToDateStatusProvider") public interface UpToDateStatusProviderFactory { /**Create an instance of {@link UpToDateStatusProvider} for a given {@link Document}. diff --git a/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/privatespi/MarkProviderCreator.java b/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/privatespi/MarkProviderCreator.java --- a/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/privatespi/MarkProviderCreator.java +++ b/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/privatespi/MarkProviderCreator.java @@ -44,6 +44,7 @@ package org.netbeans.modules.editor.errorstripe.privatespi; import javax.swing.text.JTextComponent; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * A factory for MarkProviders. Implementations of this interface should @@ -52,6 +53,7 @@ * * @author Jan Lahoda */ +@MimeLocation(subfolderName="UpToDateStatusProvider") public interface MarkProviderCreator { /** diff --git a/editor.fold/src/org/netbeans/spi/editor/fold/FoldManagerFactory.java b/editor.fold/src/org/netbeans/spi/editor/fold/FoldManagerFactory.java --- a/editor.fold/src/org/netbeans/spi/editor/fold/FoldManagerFactory.java +++ b/editor.fold/src/org/netbeans/spi/editor/fold/FoldManagerFactory.java @@ -44,6 +44,8 @@ package org.netbeans.spi.editor.fold; +import org.netbeans.spi.editor.mimelookup.MimeLocation; + /** * This factory interface allows to produce {@link FoldManager} * instance for the given fold. @@ -73,6 +75,7 @@ * @version 1.00 */ +@MimeLocation(subfolderName="FoldManager") public interface FoldManagerFactory { /** diff --git a/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.java b/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.java --- a/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.java +++ b/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProvider.java @@ -45,6 +45,7 @@ package org.netbeans.lib.editor.hyperlink.spi; import javax.swing.text.Document; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * This interface should be implemented by anyone who whats to provide hyperlinking @@ -80,6 +81,7 @@ * @author Jan Lahoda * @since 1.0 */ +@MimeLocation(subfolderName="HyperlinkProviders") public interface HyperlinkProvider { /** diff --git a/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.java b/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.java --- a/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.java +++ b/editor.lib/src/org/netbeans/lib/editor/hyperlink/spi/HyperlinkProviderExt.java @@ -46,6 +46,7 @@ import java.util.Set; import javax.swing.text.Document; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * This interface should be implemented by anyone who whats to provide hyperlinking @@ -76,6 +77,7 @@ * @author Jan Lahoda * @since 1.18 */ +@MimeLocation(subfolderName="HyperlinkProviders") public interface HyperlinkProviderExt { /**Returns all hyperlink types that are supported by this HyperlinkProvider. diff --git a/editor.lib2/nbproject/project.properties b/editor.lib2/nbproject/project.properties --- a/editor.lib2/nbproject/project.properties +++ b/editor.lib2/nbproject/project.properties @@ -43,7 +43,7 @@ is.autoload=true javac.source=1.6 javac.compilerargs=-Xlint:unchecked -spec.version.base=1.32.0 +spec.version.base=1.33.0 javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml diff --git a/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGenerator.java b/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGenerator.java --- a/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGenerator.java +++ b/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGenerator.java @@ -45,6 +45,7 @@ package org.netbeans.spi.editor.codegen; import java.util.List; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.util.Lookup; /** @@ -78,6 +79,7 @@ * Editors/<mime-type>/CodeGenerators directory. * @since 1.8 */ + @MimeLocation(subfolderName="CodeGenerators") public interface Factory { /** diff --git a/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGeneratorContextProvider.java b/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGeneratorContextProvider.java --- a/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGeneratorContextProvider.java +++ b/editor.lib2/src/org/netbeans/spi/editor/codegen/CodeGeneratorContextProvider.java @@ -42,6 +42,7 @@ package org.netbeans.spi.editor.codegen; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.util.Lookup; /** @@ -55,6 +56,7 @@ * @author Dusan Balek * @since 1.8 */ +@MimeLocation(subfolderName="CodeGeneratorContextProviders") public interface CodeGeneratorContextProvider { /** diff --git a/editor.structure/src/org/netbeans/modules/editor/structure/DocumentModelProviderFactory.java b/editor.structure/src/org/netbeans/modules/editor/structure/DocumentModelProviderFactory.java --- a/editor.structure/src/org/netbeans/modules/editor/structure/DocumentModelProviderFactory.java +++ b/editor.structure/src/org/netbeans/modules/editor/structure/DocumentModelProviderFactory.java @@ -65,7 +65,7 @@ */ public class DocumentModelProviderFactory { - static final String FOLDER_NAME = "DocumentModel"; //NOI18N + public static final String FOLDER_NAME = "DocumentModel"; //NOI18N private Map mime2provider; diff --git a/editor.structure/src/org/netbeans/modules/editor/structure/spi/DocumentModelProvider.java b/editor.structure/src/org/netbeans/modules/editor/structure/spi/DocumentModelProvider.java --- a/editor.structure/src/org/netbeans/modules/editor/structure/spi/DocumentModelProvider.java +++ b/editor.structure/src/org/netbeans/modules/editor/structure/spi/DocumentModelProvider.java @@ -44,11 +44,13 @@ package org.netbeans.modules.editor.structure.spi; +import org.netbeans.modules.editor.structure.DocumentModelProviderFactory; import org.netbeans.modules.editor.structure.api.DocumentModel; import org.netbeans.modules.editor.structure.api.DocumentModel.DocumentChange; import org.netbeans.modules.editor.structure.api.DocumentModel.DocumentModelModificationTransaction; import org.netbeans.modules.editor.structure.api.DocumentModel.DocumentModelTransactionCancelledException; import org.netbeans.modules.editor.structure.api.DocumentModelException; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * The DocumentModelProvider is responsible for parsing the text document @@ -87,6 +89,7 @@ * @see org.netbeans.modules.editor.structure.api.DocumentModel * */ +@MimeLocation(subfolderName=DocumentModelProviderFactory.FOLDER_NAME) public interface DocumentModelProvider { /** Method called by the DocumentModel when the model content needs to be updated. diff --git a/editor/src/org/netbeans/modules/editor/impl/EditorActionsProvider.java b/editor/src/org/netbeans/modules/editor/impl/EditorActionsProvider.java --- a/editor/src/org/netbeans/modules/editor/impl/EditorActionsProvider.java +++ b/editor/src/org/netbeans/modules/editor/impl/EditorActionsProvider.java @@ -51,6 +51,7 @@ import org.netbeans.api.editor.mimelookup.MimePath; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.filesystems.FileObject; /** @@ -59,9 +60,10 @@ * @since 1.39 */ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) +@MimeLocation(subfolderName=EditorActionsProvider.EDITOR_ACTIONS_FOLDER_NAME) public final class EditorActionsProvider extends ActionsList implements Class2LayerFolder, InstanceProvider { - private static final String EDITOR_ACTIONS_FOLDER_NAME = "Actions"; //NOI18N + static final String EDITOR_ACTIONS_FOLDER_NAME = "Actions"; //NOI18N public static List getEditorActions(String mimeType) { MimePath mimePath = MimePath.parse(mimeType); diff --git a/editor/src/org/netbeans/modules/editor/impl/GlyphGutterActionsProvider.java b/editor/src/org/netbeans/modules/editor/impl/GlyphGutterActionsProvider.java --- a/editor/src/org/netbeans/modules/editor/impl/GlyphGutterActionsProvider.java +++ b/editor/src/org/netbeans/modules/editor/impl/GlyphGutterActionsProvider.java @@ -50,6 +50,7 @@ import org.netbeans.api.editor.mimelookup.MimePath; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.filesystems.FileObject; /** @@ -57,6 +58,7 @@ * @author Vita Stejskal */ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) +@MimeLocation(subfolderName=GlyphGutterActionsProvider.GLYPH_GUTTER_ACTIONS_FOLDER_NAME) public final class GlyphGutterActionsProvider extends ActionsList implements Class2LayerFolder, InstanceProvider { public static final String GLYPH_GUTTER_ACTIONS_FOLDER_NAME = "GlyphGutterActions"; //NOI18N diff --git a/editor/src/org/netbeans/modules/editor/impl/PopupMenuActionsProvider.java b/editor/src/org/netbeans/modules/editor/impl/PopupMenuActionsProvider.java --- a/editor/src/org/netbeans/modules/editor/impl/PopupMenuActionsProvider.java +++ b/editor/src/org/netbeans/modules/editor/impl/PopupMenuActionsProvider.java @@ -50,6 +50,7 @@ import org.netbeans.api.editor.mimelookup.MimePath; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.filesystems.FileObject; /** @@ -57,9 +58,10 @@ * @author Vita Stejskal */ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) +@MimeLocation(subfolderName=PopupMenuActionsProvider.POPUP_MENU_ACTIONS_FOLDER_NAME) public final class PopupMenuActionsProvider extends ActionsList implements Class2LayerFolder, InstanceProvider { - private static final String POPUP_MENU_ACTIONS_FOLDER_NAME = "Popup"; //NOI18N + static final String POPUP_MENU_ACTIONS_FOLDER_NAME = "Popup"; //NOI18N public static List getPopupMenuItems(String mimeType) { MimePath mimePath = MimePath.parse(mimeType); diff --git a/editor/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider.java b/editor/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider.java --- a/editor/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider.java +++ b/editor/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider.java @@ -56,6 +56,7 @@ import org.netbeans.modules.editor.impl.CustomizableSideBar.SideBarPosition; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.cookies.InstanceCookie; import org.openide.filesystems.FileObject; import org.openide.loaders.DataObject; @@ -65,6 +66,7 @@ * @author Martin Roskanin */ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) +@MimeLocation(subfolderName=SideBarFactoriesProvider.SIDEBAR_COMPONENTS_FOLDER_NAME) public final class SideBarFactoriesProvider implements Class2LayerFolder, InstanceProvider { private static final Logger LOG = Logger.getLogger(SideBarFactoriesProvider.class.getName()); diff --git a/editor/src/org/netbeans/modules/editor/impl/ToolbarActionsProvider.java b/editor/src/org/netbeans/modules/editor/impl/ToolbarActionsProvider.java --- a/editor/src/org/netbeans/modules/editor/impl/ToolbarActionsProvider.java +++ b/editor/src/org/netbeans/modules/editor/impl/ToolbarActionsProvider.java @@ -53,6 +53,7 @@ import org.netbeans.api.editor.mimelookup.MimePath; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.filesystems.FileObject; import org.openide.loaders.DataObject; @@ -61,11 +62,12 @@ * @author Vita Stejskal */ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) +@MimeLocation(subfolderName=ToolbarActionsProvider.TOOLBAR_ACTIONS_FOLDER_NAME) public final class ToolbarActionsProvider extends ActionsList implements Class2LayerFolder, InstanceProvider { private static final Logger LOG = Logger.getLogger(ToolbarActionsProvider.class.getName()); - private static final String TOOLBAR_ACTIONS_FOLDER_NAME = "Toolbars/Default"; //NOI18N + static final String TOOLBAR_ACTIONS_FOLDER_NAME = "Toolbars/Default"; //NOI18N private static final String TEXT_BASE_PATH = "Editors/text/base/"; //NOI18N public static List getToolbarItems(String mimeType) { diff --git a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/LanguagesEmbeddingMap.java b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/LanguagesEmbeddingMap.java --- a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/LanguagesEmbeddingMap.java +++ b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/LanguagesEmbeddingMap.java @@ -45,12 +45,14 @@ package org.netbeans.modules.lexer.nbbridge; import java.util.Map; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.netbeans.spi.lexer.LanguageEmbedding; /** * * @author vita */ +@MimeLocation(subfolderName="languagesEmbeddingMap") public final class LanguagesEmbeddingMap { private Map> map; diff --git a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupFolderInfo.java b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupFolderInfo.java --- a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupFolderInfo.java +++ b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupFolderInfo.java @@ -57,6 +57,7 @@ import org.netbeans.lib.lexer.LanguageManager; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.netbeans.spi.lexer.LanguageEmbedding; import org.openide.filesystems.FileObject; diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringContextActionsProvider.java b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringContextActionsProvider.java --- a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringContextActionsProvider.java +++ b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringContextActionsProvider.java @@ -55,6 +55,7 @@ import javax.swing.JSeparator; import org.netbeans.spi.editor.mimelookup.Class2LayerFolder; import org.netbeans.spi.editor.mimelookup.InstanceProvider; +import org.netbeans.spi.editor.mimelookup.MimeLocation; import org.openide.awt.Actions; import org.openide.cookies.InstanceCookie; import org.openide.filesystems.FileObject; @@ -73,6 +74,7 @@ * @author Jan Pokorsky */ @ServiceProvider(service=Class2LayerFolder.class) +@MimeLocation(subfolderName="RefactoringActions") public final class RefactoringContextActionsProvider implements Class2LayerFolder, InstanceProvider { diff --git a/spellchecker.apimodule/nbproject/project.xml b/spellchecker.apimodule/nbproject/project.xml --- a/spellchecker.apimodule/nbproject/project.xml +++ b/spellchecker.apimodule/nbproject/project.xml @@ -6,6 +6,15 @@ org.netbeans.modules.spellchecker.apimodule + org.netbeans.modules.editor.mimelookup + + + + 1 + 1.19 + + + org.openide.filesystems diff --git a/spellchecker.apimodule/src/org/netbeans/modules/spellchecker/spi/language/TokenListProvider.java b/spellchecker.apimodule/src/org/netbeans/modules/spellchecker/spi/language/TokenListProvider.java --- a/spellchecker.apimodule/src/org/netbeans/modules/spellchecker/spi/language/TokenListProvider.java +++ b/spellchecker.apimodule/src/org/netbeans/modules/spellchecker/spi/language/TokenListProvider.java @@ -44,11 +44,13 @@ package org.netbeans.modules.spellchecker.spi.language; import javax.swing.text.Document; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * * @author Jan Lahoda */ +@MimeLocation(subfolderName="TokenListProvider") public interface TokenListProvider { public TokenList findTokenList(Document doc); diff --git a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/AutoTagImporterProviderClass2Layer.java b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/AutoTagImporterProviderClass2Layer.java --- a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/AutoTagImporterProviderClass2Layer.java +++ b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/AutoTagImporterProviderClass2Layer.java @@ -55,7 +55,7 @@ @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.editor.mimelookup.Class2LayerFolder.class) public class AutoTagImporterProviderClass2Layer implements Class2LayerFolder { - private static final String FOLDER_NAME = "AutoTagImportProviders"; + public static final String FOLDER_NAME = "AutoTagImportProviders"; public AutoTagImporterProviderClass2Layer() { } diff --git a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/spi/AutoTagImporterProvider.java b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/spi/AutoTagImporterProvider.java --- a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/spi/AutoTagImporterProvider.java +++ b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/spi/AutoTagImporterProvider.java @@ -45,6 +45,8 @@ package org.netbeans.modules.web.core.syntax.spi; import javax.swing.text.Document; +import org.netbeans.modules.web.core.syntax.AutoTagImporterProviderClass2Layer; +import org.netbeans.spi.editor.mimelookup.MimeLocation; /** * @@ -64,6 +66,7 @@ * filesystem (in layer file) in the folder * Editors/${mime-types}/AutoTagImportProviders */ +@MimeLocation(subfolderName=AutoTagImporterProviderClass2Layer.FOLDER_NAME) public interface AutoTagImporterProvider { /** The method is called, when user select a tag in