diff --git a/ide/editor/src/org/netbeans/modules/editor/EditorModule.java b/ide/editor/src/org/netbeans/modules/editor/EditorModule.java index 12f5fb052ca8..eb8f3f0848ca 100644 --- a/ide/editor/src/org/netbeans/modules/editor/EditorModule.java +++ b/ide/editor/src/org/netbeans/modules/editor/EditorModule.java @@ -250,6 +250,8 @@ public void run() { if (topComponentRegistryListener != null) { TopComponent.getRegistry().removePropertyChangeListener(topComponentRegistryListener); } + + // TODO AppContext and kitRegistryKey don't exist anymore in JDK 27+ // unregister our registry try { diff --git a/platform/api.search/src/org/netbeans/modules/search/ContextView.java b/platform/api.search/src/org/netbeans/modules/search/ContextView.java index 86486ea5b4ff..a464f0c85d38 100644 --- a/platform/api.search/src/org/netbeans/modules/search/ContextView.java +++ b/platform/api.search/src/org/netbeans/modules/search/ContextView.java @@ -25,7 +25,6 @@ import java.awt.EventQueue; import java.awt.Rectangle; import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import static java.lang.Thread.NORM_PRIORITY; import java.util.Map; import java.util.WeakHashMap; @@ -53,6 +52,7 @@ import org.openide.explorer.ExplorerManager; import org.openide.filesystems.FileObject; import org.openide.nodes.Node; +import org.openide.text.CloneableEditorSupport; import org.openide.text.NbDocument; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -450,8 +450,8 @@ public void setText(final String text, * (in this case, MIME-type only) must be set _before_ the text * is set. */ - if ((editorMimeType == null) || !editorMimeType.equals(mimeType)) { - editorPane.setContentType(mimeType); + if (editorMimeType == null || !editorMimeType.equals(mimeType)) { + editorPane.setEditorKit(CloneableEditorSupport.getEditorKit(mimeType)); editorMimeType = mimeType; } editorPane.setText(text); @@ -488,12 +488,8 @@ public void run() { if (location != null) { final Document document = editorPane.getDocument(); - if (document instanceof StyledDocument) { - StyledDocument styledDocument - = (StyledDocument) document; - int cursorOffset = getCursorOffset( - (StyledDocument) document, - location.getLine() - 1); + if (document instanceof StyledDocument sd) { + int cursorOffset = getCursorOffset(sd, location.getLine() - 1); int startOff = cursorOffset + location.getColumn() - 1; int endOff = startOff + location.getMarkLength(); editorPane.setSelectionStart(startOff);