Attachment #93172 for bug #179368

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 179368
Collapse All | Expand All

Lines 56-61 Link Here

(-)a/codetemplatetools/nbproject/project.xml (-9 / +18 lines)
56	</run-dependency>	56	</run-dependency>
57	</dependency>	57	</dependency>
58	<dependency>	58	<dependency>
		59	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
		60	<build-prerequisite/>
		61	<compile-dependency/>
		62	<run-dependency>
		63	<release-version>0-1</release-version>
		64	<specification-version>1.0</specification-version>
		65	</run-dependency>
		66	</dependency>
		67	<dependency>
59	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>	68	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
60	<build-prerequisite/>	69	<build-prerequisite/>
61	<compile-dependency/>	70	<compile-dependency/>
Lines 65-70 Link Here
65	</run-dependency>	74	</run-dependency>
66	</dependency>	75	</dependency>
67	<dependency>	76	<dependency>
		77	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
		78	<build-prerequisite/>
		79	<compile-dependency/>
		80	<run-dependency>
		81	<release-version>1</release-version>
		82	<specification-version>1.19</specification-version>
		83	</run-dependency>
		84	</dependency>
		85	<dependency>
68	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>	86	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
69	<build-prerequisite/>	87	<build-prerequisite/>
70	<compile-dependency/>	88	<compile-dependency/>
Lines 119-133 Link Here
119	<specification-version>6.4.1</specification-version>	137	<specification-version>6.4.1</specification-version>
120	</run-dependency>	138	</run-dependency>
121	</dependency>	139	</dependency>
122	<dependency>
123	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
124	<build-prerequisite/>
125	<compile-dependency/>
126	<run-dependency>
127	<release-version>0-1</release-version>
128	<specification-version>1.0</specification-version>
129	</run-dependency>
130	</dependency>
131	</module-dependencies>	140	</module-dependencies>
132	<public-packages/>	141	<public-packages/>
133	</data>	142	</data>




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;

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;


    @Override
    protected void performAction(Node[] activatedNodes) {
        final JTextComponent textComponent = EditorRegistry.focusedComponent();
        if (textComponent != null) {
            Document document = textComponent.getDocument();
            CodeTemplateManager codeTemplateManager = CodeTemplateManager.get(document);




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;

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;

    }
    
    public ChangeInfo implement() throws IOException {
        final JTextComponent comp = EditorRegistry.focusedComponent();
        
        if (!TESTS && !od.equals(comp.getDocument().getProperty(Document.StreamDescriptionProperty)))
            return null;




            <code-name-base>org.netbeans.modules.editor.nexterror</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>2.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
            <dependency>
                    <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <public-packages/>
        </data>




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;

    }

    public void actionPerformed(ActionEvent e) {
        JTextComponent comp = EditorRegistry.focusedComponent();
        
        if (comp == null) {
            lastComponent = null;

Lines 813-819 Link Here

(-)a/scala.debugger.projects/src/org/netbeans/modules/scala/debugger/projects/EditorContextImpl.java (-2 lines)
813	return null;	813	return null;
814	}	814	}
815	final int currentOffset = (ep == null) ? 0 : ep.getCaretPosition();	815	final int currentOffset = (ep == null) ? 0 : ep.getCaretPosition();
816	//final int currentOffset = org.netbeans.editor.Registry.getMostActiveComponent().getCaretPosition();
817	final String[] currentMethodPtr = new String[]{null, null, null};	816	final String[] currentMethodPtr = new String[]{null, null, null};
818	final Future<Void> scanFinished;	817	final Future<Void> scanFinished;
819	// try {	818	// try {
Lines 1621-1627 Link Here
1621	currentOffset = 0;	1620	currentOffset = 0;
1622	}	1621	}
1623		1622
1624	//final int currentOffset = org.netbeans.editor.Registry.getMostActiveComponent().getCaretPosition();
1625	final String[] currentElementPtr = new String[]{null};	1623	final String[] currentElementPtr = new String[]{null};
1626	final Future<Void> scanFinished;	1624	final Future<Void> scanFinished;
1627	// try {	1625	// try {

Lines 44-54 Link Here

(-)a/spellchecker/src/org/netbeans/modules/spellchecker/Installer.java (-8 / +8 lines)
44	import java.awt.Toolkit;	44	import java.awt.Toolkit;
45	import java.awt.event.AWTEventListener;	45	import java.awt.event.AWTEventListener;
46	import java.awt.event.FocusEvent;	46	import java.awt.event.FocusEvent;
		47	import java.beans.PropertyChangeEvent;
		48	import java.beans.PropertyChangeListener;
47	import javax.swing.JTextArea;	49	import javax.swing.JTextArea;
48	import javax.swing.event.ChangeEvent;
49	import javax.swing.event.ChangeListener;
50	import javax.swing.text.JTextComponent;	50	import javax.swing.text.JTextComponent;
51	import org.netbeans.editor.Registry;	51	import org.netbeans.api.editor.EditorRegistry;
52	import org.openide.modules.ModuleInstall;	52	import org.openide.modules.ModuleInstall;
53		53
54	/**	54	/**
Lines 57-65 Link Here
57	*/	57	*/
58	public class Installer extends ModuleInstall {	58	public class Installer extends ModuleInstall {
59		59
60	private static ChangeListener l = new ChangeListener() {	60	private static PropertyChangeListener l = new PropertyChangeListener() {
61	public void stateChanged(ChangeEvent e) {	61	public void propertyChange(PropertyChangeEvent evt) {
62	JTextComponent c = Registry.getMostActiveComponent();	62	JTextComponent c = EditorRegistry.focusedComponent();
63		63
64	if (c != null) {	64	if (c != null) {
65	ComponentPeer.assureInstalled(c);	65	ComponentPeer.assureInstalled(c);
Lines 67-74 Link Here
67	}	67	}
68	};	68	};
69		69
70	public void restored() {	70	public @Override void restored() {
71	Registry.addChangeListener(l);	71	EditorRegistry.addPropertyChangeListener(l);
72	Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {	72	Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
73	public void eventDispatched(AWTEvent event) {	73	public void eventDispatched(AWTEvent event) {
74	if (event instanceof FocusEvent) {	74	if (event instanceof FocusEvent) {

Return to bug 179368

Lines 59-64 Link Here

(-)a/codetemplatetools/src/org/netbeans/modules/codetemplatetools/actions/SurroundWithAction.java (-2 / +2 lines)
59	import javax.swing.text.Document;	59	import javax.swing.text.Document;
60	import javax.swing.text.JTextComponent;	60	import javax.swing.text.JTextComponent;
61	import javax.swing.text.Position;	61	import javax.swing.text.Position;
		62	import org.netbeans.api.editor.EditorRegistry;
62	import org.netbeans.modules.codetemplatetools.SelectionCodeTemplateProcessor;	63	import org.netbeans.modules.codetemplatetools.SelectionCodeTemplateProcessor;
63	import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListCellRenderer;	64	import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListCellRenderer;
64	import org.openide.cookies.EditorCookie;	65	import org.openide.cookies.EditorCookie;
Lines 67-73 Link Here
67	import org.openide.util.NbBundle;	68	import org.openide.util.NbBundle;
68	import org.openide.util.Utilities;	69	import org.openide.util.Utilities;
69	import org.openide.util.actions.CookieAction;	70	import org.openide.util.actions.CookieAction;
70	import org.netbeans.editor.Registry;
71	import org.netbeans.lib.editor.codetemplates.api.CodeTemplate;	71	import org.netbeans.lib.editor.codetemplates.api.CodeTemplate;
72	import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager;	72	import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager;
73	import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListModel;	73	import org.netbeans.modules.codetemplatetools.ui.view.CodeTemplateListModel;
Lines 86-92 Link Here
86		86
87	@Override	87	@Override
88	protected void performAction(Node[] activatedNodes) {	88	protected void performAction(Node[] activatedNodes) {
89	final JTextComponent textComponent = Registry.getMostActiveComponent();	89	final JTextComponent textComponent = EditorRegistry.focusedComponent();
90	if (textComponent != null) {	90	if (textComponent != null) {
91	Document document = textComponent.getDocument();	91	Document document = textComponent.getDocument();
92	CodeTemplateManager codeTemplateManager = CodeTemplateManager.get(document);	92	CodeTemplateManager codeTemplateManager = CodeTemplateManager.get(document);

Lines 65-70 Link Here

(-)a/editor.hints.i18n/src/org/netbeans/modules/editor/hints/i18n/AddToBundleFix.java (-2 / +2 lines)
65	import javax.swing.text.Position;	65	import javax.swing.text.Position;
66	import javax.swing.text.Position.Bias;	66	import javax.swing.text.Position.Bias;
67	import javax.swing.text.StyleConstants;	67	import javax.swing.text.StyleConstants;
		68	import org.netbeans.api.editor.EditorRegistry;
68	import org.netbeans.api.editor.settings.AttributesUtilities;	69	import org.netbeans.api.editor.settings.AttributesUtilities;
69	import org.netbeans.api.java.classpath.ClassPath;	70	import org.netbeans.api.java.classpath.ClassPath;
70	import org.netbeans.api.java.source.CancellableTask;	71	import org.netbeans.api.java.source.CancellableTask;
Lines 73-79 Link Here
73	import org.netbeans.api.java.source.JavaSource.Phase;	74	import org.netbeans.api.java.source.JavaSource.Phase;
74	import org.netbeans.api.java.source.TreePathHandle;	75	import org.netbeans.api.java.source.TreePathHandle;
75	import org.netbeans.api.java.source.WorkingCopy;	76	import org.netbeans.api.java.source.WorkingCopy;
76	import org.netbeans.editor.Registry;
77	import org.netbeans.modules.i18n.ResourceHolder;	77	import org.netbeans.modules.i18n.ResourceHolder;
78	import org.netbeans.modules.i18n.java.JavaI18nSupport;	78	import org.netbeans.modules.i18n.java.JavaI18nSupport;
79	import org.netbeans.spi.editor.highlighting.HighlightsLayer;	79	import org.netbeans.spi.editor.highlighting.HighlightsLayer;
Lines 132-138 Link Here
132	}	132	}
133		133
134	public ChangeInfo implement() throws IOException {	134	public ChangeInfo implement() throws IOException {
135	final JTextComponent comp = Registry.getMostActiveComponent();	135	final JTextComponent comp = EditorRegistry.focusedComponent();
136		136
137	if (!TESTS && !od.equals(comp.getDocument().getProperty(Document.StreamDescriptionProperty)))	137	if (!TESTS && !od.equals(comp.getDocument().getProperty(Document.StreamDescriptionProperty)))
138	return null;	138	return null;

Lines 47-58 Link Here

(-)a/editor.nexterror/nbproject/project.xml (-10 / +19 lines)
47	<code-name-base>org.netbeans.modules.editor.nexterror</code-name-base>	47	<code-name-base>org.netbeans.modules.editor.nexterror</code-name-base>
48	<module-dependencies>	48	<module-dependencies>
49	<dependency>	49	<dependency>
		50	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
		51	<build-prerequisite/>
		52	<compile-dependency/>
		53	<run-dependency>
		54	<release-version>0-1</release-version>
		55	<specification-version>1.0</specification-version>
		56	</run-dependency>
		57	</dependency>
		58	<dependency>
50	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>	59	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
51	<build-prerequisite/>	60	<build-prerequisite/>
52	<compile-dependency/>	61	<compile-dependency/>
53	<run-dependency>	62	<run-dependency>
54	<release-version>2</release-version>	63	<release-version>2</release-version>
55	<specification-version>2.1</specification-version>	64	<specification-version>2.1</specification-version>
		65	</run-dependency>
		66	</dependency>
		67	<dependency>
		68	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
		69	<build-prerequisite/>
		70	<compile-dependency/>
		71	<run-dependency>
		72	<release-version>1</release-version>
		73	<specification-version>1.19</specification-version>
56	</run-dependency>	74	</run-dependency>
57	</dependency>	75	</dependency>
58	<dependency>	76	<dependency>
Lines 63-77 Link Here
63	<specification-version>6.2</specification-version>	81	<specification-version>6.2</specification-version>
64	</run-dependency>	82	</run-dependency>
65	</dependency>	83	</dependency>
66	<dependency>
67	<code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
68	<build-prerequisite/>
69	<compile-dependency/>
70	<run-dependency>
71	<release-version>0-1</release-version>
72	<specification-version>1.0</specification-version>
73	</run-dependency>
74	</dependency>
75	</module-dependencies>	84	</module-dependencies>
76	<public-packages/>	85	<public-packages/>
77	</data>	86	</data>

Lines 47-56 Link Here

(-)a/editor.nexterror/src/org/netbeans/modules/editor/nexterror/ScanAnnotationsAction.java (-2 / +2 lines)
47	import javax.swing.AbstractAction;	47	import javax.swing.AbstractAction;
48	import javax.swing.text.BadLocationException;	48	import javax.swing.text.BadLocationException;
49	import javax.swing.text.JTextComponent;	49	import javax.swing.text.JTextComponent;
		50	import org.netbeans.api.editor.EditorRegistry;
50	import org.netbeans.editor.AnnotationDesc;	51	import org.netbeans.editor.AnnotationDesc;
51	import org.netbeans.editor.Annotations;	52	import org.netbeans.editor.Annotations;
52	import org.netbeans.editor.BaseDocument;	53	import org.netbeans.editor.BaseDocument;
53	import org.netbeans.editor.Registry;
54	import org.netbeans.editor.Utilities;	54	import org.netbeans.editor.Utilities;
55		55
56	import org.openide.ErrorManager;	56	import org.openide.ErrorManager;
Lines 72-78 Link Here
72	}	72	}
73		73
74	public void actionPerformed(ActionEvent e) {	74	public void actionPerformed(ActionEvent e) {
75	JTextComponent comp = Registry.getMostActiveComponent();	75	JTextComponent comp = EditorRegistry.focusedComponent();
76		76
77	if (comp == null) {	77	if (comp == null) {
78	lastComponent = null;	78	lastComponent = null;