src/Tools/jEdit/patches/vfs_marker
author wenzelm
Wed, 10 Jun 2020 19:59:12 +0200
changeset 71932 65fd0f032a75
parent 69838 4419d4d675c3
child 72247 c06260b7152c
permissions -rw-r--r--
updated to jedit-5.6pre1 (repository version 25349);
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     1
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/jedit/browser/VFSBrowser.java 5.6pre1/jEdit-patched/org/gjt/sp/jedit/browser/VFSBrowser.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     2
--- 5.6pre1/jEdit-orig/org/gjt/sp/jedit/browser/VFSBrowser.java	2020-05-20 11:10:12.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     3
+++ 5.6pre1/jEdit-patched/org/gjt/sp/jedit/browser/VFSBrowser.java	2020-06-10 15:37:37.310005209 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
     4
@@ -1194,6 +1194,7 @@
69765
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
     5
 		VFSFile[] selectedFiles = browserView.getSelectedFiles();
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
     6
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
     7
 		Buffer buffer = null;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
     8
+		String bufferMarker = null;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
     9
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    10
 check_selected:
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    11
 		for (VFSFile file : selectedFiles)
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    12
@@ -1243,7 +1244,10 @@
69765
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    13
 				}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    14
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    15
 				if (_buffer != null)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    16
+				{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    17
 					buffer = _buffer;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    18
+					bufferMarker = file.getPathMarker();
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    19
+				}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    20
 			}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    21
 			// otherwise if a file is selected in OPEN_DIALOG or
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    22
 			// SAVE_DIALOG mode, just let the listener(s)
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    23
@@ -1252,21 +1256,30 @@
69765
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    24
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    25
 		if(buffer != null)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    26
 		{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    27
+			View gotoView = null;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    28
+
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    29
 			switch(mode)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    30
 			{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    31
 			case M_OPEN:
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    32
 				view.setBuffer(buffer);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    33
+				gotoView = view;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    34
 				break;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    35
 			case M_OPEN_NEW_VIEW:
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    36
-				jEdit.newView(view,buffer,false);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    37
+				gotoView = jEdit.newView(view,buffer,false);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    38
 				break;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    39
 			case M_OPEN_NEW_PLAIN_VIEW:
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    40
-				jEdit.newView(view,buffer,true);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    41
+				gotoView = jEdit.newView(view,buffer,true);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    42
 				break;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    43
 			case M_OPEN_NEW_SPLIT:
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    44
 				view.splitHorizontally().setBuffer(buffer);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    45
+				gotoView = view;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    46
 				break;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    47
 			}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    48
+
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    49
+			if (gotoView != null && bufferMarker != null)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    50
+			{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    51
+				jEdit.gotoMarker(gotoView, buffer, bufferMarker);
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    52
+			}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    53
 		}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    54
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    55
 		Object[] listeners = listenerList.getListenerList();
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    56
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/jedit/io/VFSFile.java 5.6pre1/jEdit-patched/org/gjt/sp/jedit/io/VFSFile.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    57
--- 5.6pre1/jEdit-orig/org/gjt/sp/jedit/io/VFSFile.java	2020-05-20 11:10:11.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    58
+++ 5.6pre1/jEdit-patched/org/gjt/sp/jedit/io/VFSFile.java	2020-06-10 15:37:37.314005109 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    59
@@ -302,6 +302,12 @@
69765
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    60
 		}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    61
 	} //}}}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    62
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    63
+	//{{{ getPathMarker() method (for jEdit.gotoMarker)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    64
+	public String getPathMarker()
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    65
+	{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    66
+		return null;
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    67
+	} //}}}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    68
+
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    69
 	//{{{ getPath() method
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    70
 	public String getPath()
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    71
 	{
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    72
diff -ru 5.6pre1/jEdit-orig/org/gjt/sp/jedit/jEdit.java 5.6pre1/jEdit-patched/org/gjt/sp/jedit/jEdit.java
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    73
--- 5.6pre1/jEdit-orig/org/gjt/sp/jedit/jEdit.java	2020-05-26 16:55:37.000000000 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    74
+++ 5.6pre1/jEdit-patched/org/gjt/sp/jedit/jEdit.java	2020-06-10 15:37:37.314005109 +0200
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset
    75
@@ -4242,7 +4242,7 @@
69765
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    76
 	} //}}}
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    77
 
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    78
 	//{{{ gotoMarker() method
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    79
-	private static void gotoMarker(final View view, final Buffer buffer,
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    80
+	public static void gotoMarker(final View view, final Buffer buffer,
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    81
 		final String marker)
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    82
 	{
c5778547ed03 more accurate file position;
wenzelm
parents:
diff changeset
    83
 		AwtRunnableQueue.INSTANCE.runAfterIoTasks(new Runnable()