Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*
* @author sdedic
*/
@MimeRegistration(service = DocumentFactory.class, mimeType = "")
@MimeRegistration(service = DocumentFactory.class, mimeType = "", position = 710)
public class DocumentFactoryImpl implements DocumentFactory {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private void store(FileObject indexFolder, URL url, String resourceName, List<Te
}
}

@MimeRegistration(mimeType="", service=EmbeddingIndexerFactory.class) //NOI18N
@MimeRegistration(mimeType = "", service = EmbeddingIndexerFactory.class, position = 810) //NOI18N
public static class Factory extends EmbeddingIndexerFactory {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
*
* @author Jan Becicka
*/
@MimeRegistration(mimeType="", service=UndoableEditWrapper.class)
@MimeRegistration(mimeType = "", service = UndoableEditWrapper.class, position = 1270)
public class UndoableWrapper implements UndoableEditWrapper {

private AtomicBoolean active = new AtomicBoolean();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*
* @author sdedic
*/
@MimeRegistration(mimeType = "", service = ErrorProvider.class)
@MimeRegistration(mimeType = "", service = ErrorProvider.class, position = 690)
public class HintsDiagnosticsProvider implements ErrorProvider {
public HintsDiagnosticsProvider() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,11 @@ public void cancelled(MutableContext context) {
}

@MimeRegistrations({
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = CamelCaseInterceptor.Factory.class),
@MimeRegistration(mimeType = "text/x-javadoc", service = CamelCaseInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = CamelCaseInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = CamelCaseInterceptor.Factory.class) //NOI18N
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = CamelCaseInterceptor.Factory.class, position = 730),
@MimeRegistration(mimeType = "text/x-javadoc", service = CamelCaseInterceptor.Factory.class, position = 730), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = CamelCaseInterceptor.Factory.class, position = 730), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = CamelCaseInterceptor.Factory.class, position = 730) //NOI18N
})
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = CamelCaseInterceptor.Factory.class)
public static class JavaFactory implements CamelCaseInterceptor.Factory {

@Override
Expand Down
25 changes: 12 additions & 13 deletions java/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,11 @@ private void blockCommentComplete(Document doc, int dotPos, MutableContext conte
}

@MimeRegistrations({
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = TypedBreakInterceptor.Factory.class),
@MimeRegistration(mimeType = "text/x-javadoc", service = TypedBreakInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = TypedBreakInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = TypedBreakInterceptor.Factory.class) //NOI18N
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = TypedBreakInterceptor.Factory.class, position = 750),
@MimeRegistration(mimeType = "text/x-javadoc", service = TypedBreakInterceptor.Factory.class, position = 750), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = TypedBreakInterceptor.Factory.class, position = 750), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = TypedBreakInterceptor.Factory.class, position = 750) //NOI18N
})
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = TypedBreakInterceptor.Factory.class)
public static class JavaFactory implements TypedBreakInterceptor.Factory {

@Override
Expand Down Expand Up @@ -535,10 +534,10 @@ public void cancelled(Context context) {
}

@MimeRegistrations({
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = DeletedTextInterceptor.Factory.class),
@MimeRegistration(mimeType = "text/x-javadoc", service = DeletedTextInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = DeletedTextInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = DeletedTextInterceptor.Factory.class) //NOI18N
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = DeletedTextInterceptor.Factory.class, position = 740),
@MimeRegistration(mimeType = "text/x-javadoc", service = DeletedTextInterceptor.Factory.class, position = 740), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = DeletedTextInterceptor.Factory.class, position = 740), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = DeletedTextInterceptor.Factory.class, position = 740) //NOI18N
})
public static class Factory implements DeletedTextInterceptor.Factory {

Expand Down Expand Up @@ -598,10 +597,10 @@ public void cancelled(Context context) {
}

@MimeRegistrations({
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = TypedTextInterceptor.Factory.class),
@MimeRegistration(mimeType = "text/x-javadoc", service = TypedTextInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = TypedTextInterceptor.Factory.class), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = TypedTextInterceptor.Factory.class) //NOI18N
@MimeRegistration(mimeType = JAVA_MIME_TYPE, service = TypedTextInterceptor.Factory.class, position = 760),
@MimeRegistration(mimeType = "text/x-javadoc", service = TypedTextInterceptor.Factory.class, position = 760), //NOI18N
@MimeRegistration(mimeType = "text/x-java-string", service = TypedTextInterceptor.Factory.class, position = 760), //NOI18N
@MimeRegistration(mimeType = "text/x-java-character", service = TypedTextInterceptor.Factory.class, position = 760) //NOI18N
})
public static class Factory implements TypedTextInterceptor.Factory {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private static OffsetsBag getBag(Document doc) {
return bag;
}

@MimeRegistration(mimeType = "text/x-java", service = HighlightsLayerFactory.class)
@MimeRegistration(mimeType = "text/x-java", service = HighlightsLayerFactory.class, position = 830)
public static class UnwrapCodeHighlightsLayerFactory implements HighlightsLayerFactory {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* @author sdedic
*/
@MimeRegistrations({
@MimeRegistration(mimeType = "text/x-java", service = TaskFactory.class),
@MimeRegistration(mimeType = "text/x-java", service = TaskFactory.class, position = 840),
@MimeRegistration(mimeType = "text/x-java", service = FoldManagerFactory.class, position = 1400),
})
public class ResourceStringFoldProvider extends ParsingFoldSupport{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ public void cancelled(Context context) {
}

@MimeRegistrations({
@MimeRegistration(mimeType = JavaKit.JAVA_MIME_TYPE, service = DeletedTextInterceptor.Factory.class)
@MimeRegistration(mimeType = JavaKit.JAVA_MIME_TYPE, service = DeletedTextInterceptor.Factory.class, position = 860)
})
public static class Factory implements DeletedTextInterceptor.Factory {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,28 @@
<folder name="text">
<folder name="x-jsp">
<file name="org-netbeans-modules-java-editor-semantic-HighlightsLayerFactoryImpl.instance" />
<attr name="position" intvalue="680"/>
</folder>
<folder name="x-tag">
<file name="org-netbeans-modules-java-editor-semantic-HighlightsLayerFactoryImpl.instance" />
<attr name="position" intvalue="680"/>
</folder>
<folder name="x-java">
<attr name="position" intvalue="680"/>
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.editor.resources.Bundle"/>

<file name="org-netbeans-modules-java-editor-semantic-HighlightsLayerFactoryImpl.instance" />
<file name="org-netbeans-modules-java-editor-semantic-SemanticHighlighterFactory.instance" />
<file name="org-netbeans-modules-java-editor-semantic-MarkOccurrencesHighlighterFactory.instance" />
<file name="org-netbeans-modules-java-editor-overridden-ComputeAnnotations$FactoryImpl.instance" />

<file name="org-netbeans-modules-java-editor-semantic-HighlightsLayerFactoryImpl.instance">
<attr name="position" intvalue="681"/>
</file>
<file name="org-netbeans-modules-java-editor-semantic-SemanticHighlighterFactory.instance">
<attr name="position" intvalue="682"/>
</file>
<file name="org-netbeans-modules-java-editor-semantic-MarkOccurrencesHighlighterFactory.instance">
<attr name="position" intvalue="683"/>
</file>
<file name="org-netbeans-modules-java-editor-overridden-ComputeAnnotations$FactoryImpl.instance">
<attr name="position" intvalue="684"/>
</file>

<folder name="Preferences">
<folder name="Defaults">
Expand Down Expand Up @@ -146,6 +157,7 @@

<file name="EditorKit.instance">
<attr name="instanceClass" stringvalue="org.netbeans.modules.editor.java.JavaKit"/>
<attr name="position" intvalue="100"/>
</file>

<folder name="BracesMatchers">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<? extends SchedulerTask> create(Snapshot snapshot) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public Class<? extends Scheduler> 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
Expand Down
2 changes: 2 additions & 0 deletions java/java.hints/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DocumentVersionImpl> {
public ErrorPositionRefresherHelper() {
super(ErrorHintsProvider.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DocumentVersionImpl> {
public PositionRefresherHelperImpl() {
super(IntroduceHint.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,15 @@
<folder name="UpToDateStatusProvider">
<file name="org-netbeans-modules-java-hints-infrastructure-JavaUpToDateStateProviderFactory.instance"/>
</folder>
<file name="org-netbeans-modules-java-hints-infrastructure-ErrorHintsFactory.instance"/>
<file name="org-netbeans-modules-java-hints-introduce-IntroduceHint$HLFImpl.instance"/>
<file name="org-netbeans-modules-java-hints-infrastructure-EmbeddedLazyHintComputation$FactoryImpl.instance"/>
<file name="org-netbeans-modules-java-hints-infrastructure-ErrorHintsFactory.instance">
<attr name="position" intvalue="950"/>
</file>
<file name="org-netbeans-modules-java-hints-introduce-IntroduceHint$HLFImpl.instance">
<attr name="position" intvalue="980"/>
</file>
<file name="org-netbeans-modules-java-hints-infrastructure-EmbeddedLazyHintComputation$FactoryImpl.instance">
<attr name="position" intvalue="940"/>
</file>
<folder name="AnnotationProcessors">
<file name="org-netbeans-modules-java-hints-infrastructure-SuppressWarningsCompletion.instance"/>
</folder>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DocumentVersion> {

public HintPositionRefresherHelper() {
Expand Down Expand Up @@ -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<SuggestionsDocumentVersion> {

public SuggestionsPositionRefresherHelper() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading