diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldingEditorSupport.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldingEditorSupport.java index b5578dff2868..407ad29af675 100644 --- a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldingEditorSupport.java +++ b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/FoldingEditorSupport.java @@ -327,7 +327,7 @@ public void run() { return (cnt[0] == null || cnt[0].trim().isEmpty()); } - @MimeRegistration(mimeType = "", service = FoldHierarchyMonitor.class) + @MimeRegistration(mimeType = "", service = FoldHierarchyMonitor.class, position = 670) public static class F implements FoldHierarchyMonitor { @Override public void foldsAttached(FoldHierarchy h) { diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/DocumentFactoryImpl.java b/ide/editor/src/org/netbeans/modules/editor/impl/DocumentFactoryImpl.java index a0023cabba61..e0b3a7278fa8 100644 --- a/ide/editor/src/org/netbeans/modules/editor/impl/DocumentFactoryImpl.java +++ b/ide/editor/src/org/netbeans/modules/editor/impl/DocumentFactoryImpl.java @@ -34,7 +34,7 @@ * * @author sdedic */ -@MimeRegistration(service = DocumentFactory.class, mimeType = "") +@MimeRegistration(service = DocumentFactory.class, mimeType = "", position = 710) public class DocumentFactoryImpl implements DocumentFactory { @Override diff --git a/ide/editor/src/org/netbeans/modules/editor/url/HighlightURLs.java b/ide/editor/src/org/netbeans/modules/editor/url/HighlightURLs.java index 7618859cc526..c4ae1c9b8677 100644 --- a/ide/editor/src/org/netbeans/modules/editor/url/HighlightURLs.java +++ b/ide/editor/src/org/netbeans/modules/editor/url/HighlightURLs.java @@ -254,7 +254,7 @@ private static OffsetsBag getBag(Document doc) { return bag; } - @MimeRegistration(mimeType="", service=HighlightsLayerFactory.class) + @MimeRegistration(mimeType = "", service = HighlightsLayerFactory.class, position = 790) public static final class FactoryImpl implements HighlightsLayerFactory { @Override diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java index 337582e8c953..231a09d85445 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java @@ -135,7 +135,7 @@ private void store(FileObject indexFolder, URL url, String resourceName, List + + + - - - - - + + + + + + + + + + + + + @@ -146,6 +157,7 @@ + diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/whitelist/WhiteListCheckTask.java b/java/java.editor/src/org/netbeans/modules/java/editor/whitelist/WhiteListCheckTask.java index 2ef35ae696a7..1245fdd8f0fe 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/whitelist/WhiteListCheckTask.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/whitelist/WhiteListCheckTask.java @@ -149,7 +149,7 @@ private static String formatViolationDescription(WhiteListQuery.Result result) { } } - @MimeRegistration(mimeType="text/x-java", service=TaskFactory.class) + @MimeRegistration(mimeType = "text/x-java", service = TaskFactory.class, position = 900) public static class Factory extends TaskFactory { @Override public Collection create(Snapshot snapshot) { diff --git a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java index 97d21432a617..563617bcbd7d 100644 --- a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java +++ b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java @@ -295,7 +295,7 @@ public Class getSchedulerClass() { @MimeRegistrations({ @MimeRegistration(mimeType=TestTokenId.MIME_TYPE, service=TaskFactory.class), - @MimeRegistration(mimeType="text/x-java", service=TaskFactory.class) + @MimeRegistration(mimeType = "text/x-java", service = TaskFactory.class, position = 920) }) public static final class FactoryImpl extends TaskFactory { @Override diff --git a/java/java.hints/nbproject/project.properties b/java/java.hints/nbproject/project.properties index 576fd1b40d31..bd4185082559 100644 --- a/java/java.hints/nbproject/project.properties +++ b/java/java.hints/nbproject/project.properties @@ -81,6 +81,8 @@ test.config.unreliable.includes=\ **/ConvertInvalidVarToExplicitArrayTypeTest.class test.config.unreliable.excludes= +metabuild.jms-flags.jvm = --enable-native-access=ALL-UNNAMED + test.jms.flags=\ --add-opens=java.base/java.net=ALL-UNNAMED \ --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED \ diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/EmbeddedHintsCollector.java b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/EmbeddedHintsCollector.java index 5aa6044b259e..949d2beb3844 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/EmbeddedHintsCollector.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/EmbeddedHintsCollector.java @@ -134,7 +134,7 @@ public void cancel() { } - @MimeRegistration(service = TaskFactory.class, mimeType = "") + @MimeRegistration(service = TaskFactory.class, mimeType = "", position = 930) public static class Factory extends TaskFactory { @Override diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/ErrorPositionRefresherHelper.java b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/ErrorPositionRefresherHelper.java index 95609da57c50..9b53d9baa0ff 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/ErrorPositionRefresherHelper.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/ErrorPositionRefresherHelper.java @@ -33,7 +33,7 @@ * * @author lahvac */ -@MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) +@MimeRegistration(mimeType = "text/x-java", service = PositionRefresherHelper.class, position = 950) public class ErrorPositionRefresherHelper extends PositionRefresherHelper { public ErrorPositionRefresherHelper() { super(ErrorHintsProvider.class.getName()); diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java index dc8feb768079..1a1feaac9938 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java @@ -86,7 +86,7 @@ * * @author lahvac */ -@MimeRegistration(mimeType="text/x-java", service=ErrorProvider.class) +@MimeRegistration(mimeType = "text/x-java", service = ErrorProvider.class, position = 970) public class JavaErrorProvider implements ErrorProvider { public static final String HINTS_TOOL_ID = "hints"; diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/introduce/PositionRefresherHelperImpl.java b/java/java.hints/src/org/netbeans/modules/java/hints/introduce/PositionRefresherHelperImpl.java index 90890aff29b8..a16f565c8465 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/introduce/PositionRefresherHelperImpl.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/introduce/PositionRefresherHelperImpl.java @@ -39,7 +39,7 @@ * * @author lahvac */ -@MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) +@MimeRegistration(mimeType = "text/x-java", service = PositionRefresherHelper.class, position = 990) public class PositionRefresherHelperImpl extends PositionRefresherHelper { public PositionRefresherHelperImpl() { super(IntroduceHint.class.getName()); diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml b/java/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml index 033ee7da014f..7a364be141fd 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml +++ b/java/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml @@ -126,9 +126,15 @@ - - - + + + + + + + + + diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaBinaryIndexer.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaBinaryIndexer.java index aab155a457ea..82b8dd064081 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaBinaryIndexer.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaBinaryIndexer.java @@ -307,7 +307,7 @@ private boolean isEmpty(File dir) { return content == null || content.length == 0; } - @MimeRegistration(mimeType="", service=BinaryIndexerFactory.class) + @MimeRegistration(mimeType = "", service = BinaryIndexerFactory.class, position = 1060) public static Factory register() { return NoJavacHelper.hasWorkingJavac() ? new Factory() : null; } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java index ead1583ea58b..faccf970d037 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java @@ -1269,7 +1269,7 @@ public int hashCode() { return getIndexerName().hashCode(); } - @MimeRegistration(mimeType="text/x-java", service=CustomIndexerFactory.class) + @MimeRegistration(mimeType = "text/x-java", service = CustomIndexerFactory.class, position = 1070) public static Factory register() { return NoJavacHelper.hasWorkingJavac() ? new Factory() : null; } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParserFactory.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParserFactory.java index 68e21e25af9c..5288845a1df5 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParserFactory.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParserFactory.java @@ -37,7 +37,7 @@ * * @author Tomas Zezula */ -@MimeRegistration(mimeType = "text/x-java", service = ParserFactory.class) +@MimeRegistration(mimeType = "text/x-java", service = ParserFactory.class, position = 1080) public class JavacParserFactory extends ParserFactory { private static final Logger LOG = Logger.getLogger(JavacParserFactory.class.getName()); diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java index 9b43eed15d80..fc897068da1c 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java @@ -538,7 +538,7 @@ private static String normalizeCapture(String s) { return MIRROR_PATTERN.matcher(s).replaceAll("capture"); } - @MimeRegistration(service=TaskFactory.class, mimeType="text/x-java") + @MimeRegistration(service = TaskFactory.class, mimeType = "text/x-java", position = 1090) public static final class FactoryImpl extends TaskFactory { @Override diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/LspCallHierarchyProvider.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/LspCallHierarchyProvider.java index 6892de58039c..8eb823a0a2fd 100644 --- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/LspCallHierarchyProvider.java +++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/LspCallHierarchyProvider.java @@ -69,7 +69,7 @@ * Implementation of LSP call hierarchy for the java Mime type. * @author sdedic */ -@MimeRegistration(mimeType = "text/x-java", service = CallHierarchyProvider.class) +@MimeRegistration(mimeType = "text/x-java", service = CallHierarchyProvider.class, position = 1230) public class LspCallHierarchyProvider implements CallHierarchyProvider { private static final Logger LOG = Logger.getLogger(LspCallHierarchyProvider.class.getName()); diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java index 89fc852ef6a5..2c3cfc0364ff 100644 --- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java +++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java @@ -795,7 +795,7 @@ public CancelInstantRenameUndoableEdit(InstantRefactoringPerformer performer) { } } - @MimeRegistration(mimeType = "text/x-java", service = UndoableEditWrapper.class) + @MimeRegistration(mimeType = "text/x-java", service = UndoableEditWrapper.class, position = 1250) public static class UndoableWrapper implements UndoableEditWrapper { private AtomicBoolean active = new AtomicBoolean(false); @@ -1036,7 +1036,7 @@ public void cancelled(DeletedTextInterceptor.Context context) { } @MimeRegistrations({ - @MimeRegistration(mimeType = "text/x-java", service = DeletedTextInterceptor.Factory.class) + @MimeRegistration(mimeType = "text/x-java", service = DeletedTextInterceptor.Factory.class,position = 1240) }) public static class Factory implements DeletedTextInterceptor.Factory { diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java index 0f2d3004af1b..a0ee3365f8a0 100644 --- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java +++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java @@ -49,7 +49,7 @@ * Refreshes all Java Hints on current line upon Alt-Enter or mouseclick * @author Max Sauer */ -@MimeRegistration(mimeType="text/x-java", service=PositionRefresher.class) +@MimeRegistration(mimeType = "text/x-java", service = PositionRefresher.class, position = 1000) public class JavaHintsPositionRefresher implements PositionRefresher { private static final Logger LOG = Logger.getLogger(JavaHintsPositionRefresher.class.getName()); diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java index 34859472aea5..c5a25247b107 100644 --- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java +++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java @@ -183,7 +183,7 @@ public void stateChanged(ChangeEvent e) { } - @MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) + @MimeRegistration(mimeType = "text/x-java", service = PositionRefresherHelper.class, position = 1010) public static final class HintPositionRefresherHelper extends PositionRefresherHelper { public HintPositionRefresherHelper() { @@ -213,7 +213,7 @@ private static void setVersion(Document doc) { } - @MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) + @MimeRegistration(mimeType = "text/x-java", service = PositionRefresherHelper.class, position = 1020) public static final class SuggestionsPositionRefresherHelper extends PositionRefresherHelper { public SuggestionsPositionRefresherHelper() { diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java index ed4ee45e873a..40f2d197c048 100644 --- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java +++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java @@ -126,7 +126,7 @@ public static HintsSettings getGlobalSettings() { NbPreferences.root().node(PREFERENCES_LOCATION).node(DEFAULT_PROFILE), true, null ); - @MimeRegistration(mimeType="text/x-java", service=GlobalHintPreferencesProvider.class) + @MimeRegistration(mimeType = "text/x-java", service = GlobalHintPreferencesProvider.class, position = 1030) public static class GlobalSettingsProvider implements GlobalHintPreferencesProvider { @Override diff --git a/java/whitelist/src/org/netbeans/modules/whitelist/index/WhiteListIndexerPlugin.java b/java/whitelist/src/org/netbeans/modules/whitelist/index/WhiteListIndexerPlugin.java index d9f794f76c33..1d4cd2982513 100644 --- a/java/whitelist/src/org/netbeans/modules/whitelist/index/WhiteListIndexerPlugin.java +++ b/java/whitelist/src/org/netbeans/modules/whitelist/index/WhiteListIndexerPlugin.java @@ -199,7 +199,7 @@ public Void run() throws IOException, InterruptedException { return result; } - @MimeRegistration(mimeType="text/x-java",service=JavaIndexerPlugin.Factory.class) + @MimeRegistration(mimeType = "text/x-java", service = JavaIndexerPlugin.Factory.class, position = 1350) public static class Factory implements JavaIndexerPlugin.Factory { @Override public JavaIndexerPlugin create(final URL root, final FileObject cacheFolder) {