diff --git a/codetemplatetools/nbproject/project.xml b/codetemplatetools/nbproject/project.xml
--- a/codetemplatetools/nbproject/project.xml
+++ b/codetemplatetools/nbproject/project.xml
@@ -56,6 +56,15 @@
+ org.netbeans.modules.editor.deprecated.pre61settings
+
+
+
+ 0-1
+ 1.0
+
+
+
org.netbeans.modules.editor.lib
@@ -65,6 +74,15 @@
+ org.netbeans.modules.editor.lib2
+
+
+
+ 1
+ 1.19
+
+
+
org.netbeans.modules.editor.mimelookup
@@ -119,15 +137,6 @@
6.4.1
-
- org.netbeans.modules.editor.deprecated.pre61settings
-
-
-
- 0-1
- 1.0
-
-
diff --git a/codetemplatetools/src/org/netbeans/modules/codetemplatetools/actions/SurroundWithAction.java b/codetemplatetools/src/org/netbeans/modules/codetemplatetools/actions/SurroundWithAction.java
--- a/codetemplatetools/src/org/netbeans/modules/codetemplatetools/actions/SurroundWithAction.java
+++ b/codetemplatetools/src/org/netbeans/modules/codetemplatetools/actions/SurroundWithAction.java
@@ -59,6 +59,7 @@
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import javax.swing.text.Position;
+import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.modules.codetemplatetools.SelectionCodeTemplateProcessor;
import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListCellRenderer;
import org.openide.cookies.EditorCookie;
@@ -67,7 +68,6 @@
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
import org.openide.util.actions.CookieAction;
-import org.netbeans.editor.Registry;
import org.netbeans.lib.editor.codetemplates.api.CodeTemplate;
import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager;
import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListModel;
@@ -86,7 +86,7 @@
@Override
protected void performAction(Node[] activatedNodes) {
- final JTextComponent textComponent = Registry.getMostActiveComponent();
+ final JTextComponent textComponent = EditorRegistry.focusedComponent();
if (textComponent != null) {
Document document = textComponent.getDocument();
CodeTemplateManager codeTemplateManager = CodeTemplateManager.get(document);
diff --git a/editor.hints.i18n/src/org/netbeans/modules/editor/hints/i18n/AddToBundleFix.java b/editor.hints.i18n/src/org/netbeans/modules/editor/hints/i18n/AddToBundleFix.java
--- a/editor.hints.i18n/src/org/netbeans/modules/editor/hints/i18n/AddToBundleFix.java
+++ b/editor.hints.i18n/src/org/netbeans/modules/editor/hints/i18n/AddToBundleFix.java
@@ -65,6 +65,7 @@
import javax.swing.text.Position;
import javax.swing.text.Position.Bias;
import javax.swing.text.StyleConstants;
+import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.editor.settings.AttributesUtilities;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.source.CancellableTask;
@@ -73,7 +74,6 @@
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.WorkingCopy;
-import org.netbeans.editor.Registry;
import org.netbeans.modules.i18n.ResourceHolder;
import org.netbeans.modules.i18n.java.JavaI18nSupport;
import org.netbeans.spi.editor.highlighting.HighlightsLayer;
@@ -132,7 +132,7 @@
}
public ChangeInfo implement() throws IOException {
- final JTextComponent comp = Registry.getMostActiveComponent();
+ final JTextComponent comp = EditorRegistry.focusedComponent();
if (!TESTS && !od.equals(comp.getDocument().getProperty(Document.StreamDescriptionProperty)))
return null;
diff --git a/editor.nexterror/nbproject/project.xml b/editor.nexterror/nbproject/project.xml
--- a/editor.nexterror/nbproject/project.xml
+++ b/editor.nexterror/nbproject/project.xml
@@ -47,12 +47,30 @@
org.netbeans.modules.editor.nexterror
+ org.netbeans.modules.editor.deprecated.pre61settings
+
+
+
+ 0-1
+ 1.0
+
+
+
org.netbeans.modules.editor.lib
2
- 2.1
+ 2.1
+
+
+
+ org.netbeans.modules.editor.lib2
+
+
+
+ 1
+ 1.19
@@ -63,15 +81,6 @@
6.2
-
- org.netbeans.modules.editor.deprecated.pre61settings
-
-
-
- 0-1
- 1.0
-
-
diff --git a/editor.nexterror/src/org/netbeans/modules/editor/nexterror/ScanAnnotationsAction.java b/editor.nexterror/src/org/netbeans/modules/editor/nexterror/ScanAnnotationsAction.java
--- a/editor.nexterror/src/org/netbeans/modules/editor/nexterror/ScanAnnotationsAction.java
+++ b/editor.nexterror/src/org/netbeans/modules/editor/nexterror/ScanAnnotationsAction.java
@@ -47,10 +47,10 @@
import javax.swing.AbstractAction;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
+import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.editor.AnnotationDesc;
import org.netbeans.editor.Annotations;
import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.Registry;
import org.netbeans.editor.Utilities;
import org.openide.ErrorManager;
@@ -72,7 +72,7 @@
}
public void actionPerformed(ActionEvent e) {
- JTextComponent comp = Registry.getMostActiveComponent();
+ JTextComponent comp = EditorRegistry.focusedComponent();
if (comp == null) {
lastComponent = null;
diff --git a/scala.debugger.projects/src/org/netbeans/modules/scala/debugger/projects/EditorContextImpl.java b/scala.debugger.projects/src/org/netbeans/modules/scala/debugger/projects/EditorContextImpl.java
--- a/scala.debugger.projects/src/org/netbeans/modules/scala/debugger/projects/EditorContextImpl.java
+++ b/scala.debugger.projects/src/org/netbeans/modules/scala/debugger/projects/EditorContextImpl.java
@@ -813,7 +813,6 @@
return null;
}
final int currentOffset = (ep == null) ? 0 : ep.getCaretPosition();
- //final int currentOffset = org.netbeans.editor.Registry.getMostActiveComponent().getCaretPosition();
final String[] currentMethodPtr = new String[]{null, null, null};
final Future scanFinished;
// try {
@@ -1621,7 +1620,6 @@
currentOffset = 0;
}
- //final int currentOffset = org.netbeans.editor.Registry.getMostActiveComponent().getCaretPosition();
final String[] currentElementPtr = new String[]{null};
final Future scanFinished;
// try {
diff --git a/spellchecker/src/org/netbeans/modules/spellchecker/Installer.java b/spellchecker/src/org/netbeans/modules/spellchecker/Installer.java
--- a/spellchecker/src/org/netbeans/modules/spellchecker/Installer.java
+++ b/spellchecker/src/org/netbeans/modules/spellchecker/Installer.java
@@ -44,11 +44,11 @@
import java.awt.Toolkit;
import java.awt.event.AWTEventListener;
import java.awt.event.FocusEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import javax.swing.JTextArea;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.text.JTextComponent;
-import org.netbeans.editor.Registry;
+import org.netbeans.api.editor.EditorRegistry;
import org.openide.modules.ModuleInstall;
/**
@@ -57,9 +57,9 @@
*/
public class Installer extends ModuleInstall {
- private static ChangeListener l = new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
- JTextComponent c = Registry.getMostActiveComponent();
+ private static PropertyChangeListener l = new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ JTextComponent c = EditorRegistry.focusedComponent();
if (c != null) {
ComponentPeer.assureInstalled(c);
@@ -67,8 +67,8 @@
}
};
- public void restored() {
- Registry.addChangeListener(l);
+ public @Override void restored() {
+ EditorRegistry.addPropertyChangeListener(l);
Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
public void eventDispatched(AWTEvent event) {
if (event instanceof FocusEvent) {