Attachment #131144 for bug #225808

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 225808
Collapse All | Expand All

Lines 93-99 Link Here

(-)a/editor.lib/src/org/netbeans/editor/ActionFactory.java (-1 / +1 lines)
93	import org.netbeans.lib.editor.util.swing.PositionRegion;	93	import org.netbeans.lib.editor.util.swing.PositionRegion;
94	import org.netbeans.modules.editor.indent.api.Indent;	94	import org.netbeans.modules.editor.indent.api.Indent;
95	import org.netbeans.modules.editor.indent.api.Reformat;	95	import org.netbeans.modules.editor.indent.api.Reformat;
96	import org.netbeans.modules.editor.lib.NavigationHistory;	96	import org.netbeans.api.editor.NavigationHistory;
97	import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;	97	import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;
98	import org.netbeans.modules.editor.lib2.view.DocumentView;	98	import org.netbeans.modules.editor.lib2.view.DocumentView;
99	import org.openide.util.ContextAwareAction;	99	import org.openide.util.ContextAwareAction;

Lines 102-108 Link Here

(-)a/editor.lib/src/org/netbeans/editor/BaseKit.java (-1 / +1 lines)
102	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;	102	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
103	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;	103	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
104	import org.netbeans.modules.editor.lib.KitsTracker;	104	import org.netbeans.modules.editor.lib.KitsTracker;
105	import org.netbeans.modules.editor.lib.NavigationHistory;	105	import org.netbeans.api.editor.NavigationHistory;
106	import org.netbeans.modules.editor.lib.SettingsConversions;	106	import org.netbeans.modules.editor.lib.SettingsConversions;
107	import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;	107	import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;
108	import org.netbeans.modules.editor.lib2.actions.KeyBindingsUpdater;	108	import org.netbeans.modules.editor.lib2.actions.KeyBindingsUpdater;

Lines 52-58 Link Here

(-)a/editor.lib/src/org/netbeans/editor/JumpList.java (-1 / +1 lines)
52	import java.util.logging.Logger;	52	import java.util.logging.Logger;
53	import javax.swing.text.JTextComponent;	53	import javax.swing.text.JTextComponent;
54	import javax.swing.text.BadLocationException;	54	import javax.swing.text.BadLocationException;
55	import org.netbeans.modules.editor.lib.NavigationHistory;	55	import org.netbeans.api.editor.NavigationHistory;
56	import org.openide.modules.PatchedPublic;	56	import org.openide.modules.PatchedPublic;
57	import org.openide.util.WeakListeners;	57	import org.openide.util.WeakListeners;
58		58

Lines 69-75 Link Here

(-)a/editor.lib/src/org/netbeans/editor/ext/ExtKit.java (-1 / +1 lines)
69	import org.netbeans.editor.SyntaxSupport;	69	import org.netbeans.editor.SyntaxSupport;
70	import org.netbeans.lib.editor.util.CharSequenceUtilities;	70	import org.netbeans.lib.editor.util.CharSequenceUtilities;
71	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	71	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
72	import org.netbeans.modules.editor.lib.NavigationHistory;	72	import org.netbeans.api.editor.NavigationHistory;
73	import org.netbeans.api.editor.EditorActionNames;	73	import org.netbeans.api.editor.EditorActionNames;
74	import org.openide.util.Lookup;	74	import org.openide.util.Lookup;
75	import org.openide.util.NbBundle;	75	import org.openide.util.NbBundle;




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="NavigationHistory class added">
            <summary></summary>
            <version major="1" minor="74"/>
            <date day="15" month="2" year="2013"/>
            <author login="mkristofic"/>
            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
            <description>
                <p>
                    Added NavigationHistory and NavigationHistory.Waypoint classes. It enables to add position to 
                    edit history. It also enables get edit history and look on last edits.
                </p>
            </description>
            <issue number="225808"/>
        </change>

        <change id="TypedTextInterceptor.getReplacedText">
            <summary>method getReplacedText added</summary>
            <version major="1" minor="73"/>
            <date day="30" month="1" year="2013"/>
            <author login="mkristofic"/>

Lines 43-49 Link Here

(-)a/editor.lib2/nbproject/project.properties (-1 / +1 lines)
43	is.autoload=true	43	is.autoload=true
44	javac.source=1.6	44	javac.source=1.6
45	javac.compilerargs=-Xlint:unchecked	45	javac.compilerargs=-Xlint:unchecked
46	spec.version.base=1.73.0	46	spec.version.base=1.74.0
47		47
48	javadoc.arch=${basedir}/arch.xml	48	javadoc.arch=${basedir}/arch.xml
49	javadoc.apichanges=${basedir}/apichanges.xml	49	javadoc.apichanges=${basedir}/apichanges.xml

Lines 42-48 Link Here

(-)a/editor.lib/src/org/netbeans/modules/editor/lib/NavigationHistory.java (-4 / +9 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.editor.lib;	45	package org.netbeans.api.editor;
46		46
47	import java.beans.PropertyChangeListener;	47	import java.beans.PropertyChangeListener;
48	import java.beans.PropertyChangeSupport;	48	import java.beans.PropertyChangeSupport;
Lines 60-65 Link Here
60	import javax.swing.text.BadLocationException;	60	import javax.swing.text.BadLocationException;
61	import javax.swing.text.JTextComponent;	61	import javax.swing.text.JTextComponent;
62	import javax.swing.text.Position;	62	import javax.swing.text.Position;
		63	import org.netbeans.modules.editor.lib2.URLMapper;
		64	import org.netbeans.modules.editor.lib2.WeakPositions;
63		65
64	/**	66	/**
65	* 0 1 2 3 4 waypoints.size()	67	* 0 1 2 3 4 waypoints.size()
Lines 74-80 Link Here
74	* navigateBack() == W3, moves pointer one position left	76	* navigateBack() == W3, moves pointer one position left
75	* navigateForward() == W4, moves pointer one position right	77	* navigateForward() == W4, moves pointer one position right
76	*	78	*
77	*	79	* @since 1.74
78	* @author Vita Stejskal	80	* @author Vita Stejskal
79	*/	81	*/
80	public final class NavigationHistory {	82	public final class NavigationHistory {
Lines 290-299 Link Here
290		292
291	return waypoint;	293	return waypoint;
292	}	294	}
293		295
		296	/*
		297	* @since 1.74
		298	*/
294	public static final class Waypoint {	299	public static final class Waypoint {
295		300
296	private NavigationHistory navigationHistory;	301	private final NavigationHistory navigationHistory;
297	private Reference<JTextComponent> compRef;	302	private Reference<JTextComponent> compRef;
298	private Position pos;	303	private Position pos;
299	private URL url;	304	private URL url;

Lines 42-48 Link Here

(-)a/editor.lib/src/org/netbeans/modules/editor/lib/URLMapper.java (-1 / +1 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.editor.lib;	45	package org.netbeans.modules.editor.lib2;
46		46
47	import java.net.URL;	47	import java.net.URL;
48	import java.util.Collection;	48	import java.util.Collection;




 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.editor.lib2;

import java.util.Map;
import java.util.WeakHashMap;


    private static final DocumentListener documentsTracker = new DocumentListener() {

        @Override
        public void insertUpdate(DocumentEvent e) {
            synchronized (OGLS) {
                OffsetGapList<WeakPositions.WeakP> ogl = getOgl(e);

            }
        }

        @Override
        public void removeUpdate(DocumentEvent e) {
            synchronized (OGLS) {
                OffsetGapList<WeakPositions.WeakP> ogl = getOgl(e);

            }
        }

        @Override
        public void changedUpdate(DocumentEvent e) {
            // attribute's changed, ignore
        }

Lines 69-75 Link Here

(-)a/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java (-1 / +1 lines)
69	import org.netbeans.api.editor.mimelookup.MimePath;	69	import org.netbeans.api.editor.mimelookup.MimePath;
70	import org.netbeans.api.editor.settings.FontColorNames;	70	import org.netbeans.api.editor.settings.FontColorNames;
71	import org.netbeans.api.editor.settings.SimpleValueNames;	71	import org.netbeans.api.editor.settings.SimpleValueNames;
72	import org.netbeans.modules.editor.lib.NavigationHistory;	72	import org.netbeans.api.editor.NavigationHistory;
73	import org.netbeans.modules.editor.lib2.ComponentUtils;	73	import org.netbeans.modules.editor.lib2.ComponentUtils;
74	import org.netbeans.modules.editor.lib2.DocUtils;	74	import org.netbeans.modules.editor.lib2.DocUtils;
75	import org.netbeans.modules.editor.lib2.highlighting.BlockHighlighting;	75	import org.netbeans.modules.editor.lib2.highlighting.BlockHighlighting;

Lines 50-56 Link Here

(-)a/editor/src/org/netbeans/modules/editor/impl/NbURLMapper.java (-2 / +2 lines)
50	import java.util.logging.Logger;	50	import java.util.logging.Logger;
51	import javax.swing.JEditorPane;	51	import javax.swing.JEditorPane;
52	import javax.swing.text.JTextComponent;	52	import javax.swing.text.JTextComponent;
53	import org.netbeans.modules.editor.lib.URLMapper;	53	import org.netbeans.modules.editor.lib2.URLMapper;
54	import org.openide.cookies.EditorCookie;	54	import org.openide.cookies.EditorCookie;
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
56	import org.openide.filesystems.FileStateInvalidException;	56	import org.openide.filesystems.FileStateInvalidException;
Lines 62-68 Link Here
62	*	62	*
63	* @author Vita Stejskal	63	* @author Vita Stejskal
64	*/	64	*/
65	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.editor.lib.URLMapper.class)	65	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.editor.lib2.URLMapper.class)
66	public final class NbURLMapper extends URLMapper {	66	public final class NbURLMapper extends URLMapper {
67		67
68	private static final Logger LOG = Logger.getLogger(NbURLMapper.class.getName());	68	private static final Logger LOG = Logger.getLogger(NbURLMapper.class.getName());

Lines 65-71 Link Here

(-)a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryBackAction.java (-1 / +1 lines)
65	import javax.swing.text.TextAction;	65	import javax.swing.text.TextAction;
66	import org.netbeans.editor.BaseDocument;	66	import org.netbeans.editor.BaseDocument;
67	import org.netbeans.editor.BaseKit;	67	import org.netbeans.editor.BaseKit;
68	import org.netbeans.modules.editor.lib.NavigationHistory;	68	import org.netbeans.api.editor.NavigationHistory;
69	import org.openide.awt.DropDownButtonFactory;	69	import org.openide.awt.DropDownButtonFactory;
70	import org.openide.cookies.EditorCookie;	70	import org.openide.cookies.EditorCookie;
71	import org.openide.cookies.LineCookie;	71	import org.openide.cookies.LineCookie;

Lines 57-63 Link Here

(-)a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryForwardAction.java (-1 / +1 lines)
57	import javax.swing.text.JTextComponent;	57	import javax.swing.text.JTextComponent;
58	import javax.swing.text.TextAction;	58	import javax.swing.text.TextAction;
59	import org.netbeans.editor.BaseKit;	59	import org.netbeans.editor.BaseKit;
60	import org.netbeans.modules.editor.lib.NavigationHistory;	60	import org.netbeans.api.editor.NavigationHistory;
61	import org.openide.awt.DropDownButtonFactory;	61	import org.openide.awt.DropDownButtonFactory;
62	import org.openide.util.ContextAwareAction;	62	import org.openide.util.ContextAwareAction;
63	import org.openide.util.ImageUtilities;	63	import org.openide.util.ImageUtilities;

Lines 52-58 Link Here

(-)a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryLastEditAction.java (-1 / +1 lines)
52	import org.netbeans.api.editor.EditorActionRegistration;	52	import org.netbeans.api.editor.EditorActionRegistration;
53	import org.netbeans.editor.BaseAction;	53	import org.netbeans.editor.BaseAction;
54	import org.netbeans.modules.editor.MainMenuAction;	54	import org.netbeans.modules.editor.MainMenuAction;
55	import org.netbeans.modules.editor.lib.NavigationHistory;	55	import org.netbeans.api.editor.NavigationHistory;
56	import org.openide.util.NbBundle;	56	import org.openide.util.NbBundle;
57	import org.openide.util.WeakListeners;	57	import org.openide.util.WeakListeners;
58		58

Return to bug 225808

Lines 107-114 Link Here

(-)a/editor.lib2/apichanges.xml (-1 / +16 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
		110	<change id="NavigationHistory class added">
		111	<summary></summary>
		112	<version major="1" minor="74"/>
		113	<date day="15" month="2" year="2013"/>
		114	<author login="mkristofic"/>
		115	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		116	<description>
		117	<p>
		118	Added NavigationHistory and NavigationHistory.Waypoint classes. It enables to add position to
		119	edit history. It also enables get edit history and look on last edits.
		120	</p>
		121	</description>
		122	<issue number="225808"/>
		123	</change>
		124
110	<change id="TypedTextInterceptor.getReplacedText">	125	<change id="TypedTextInterceptor.getReplacedText">
111	<summary>OnSaveTask interface added</summary>	126	<summary>method getReplacedText added</summary>
112	<version major="1" minor="73"/>	127	<version major="1" minor="73"/>
113	<date day="30" month="1" year="2013"/>	128	<date day="30" month="1" year="2013"/>
114	<author login="mkristofic"/>	129	<author login="mkristofic"/>