[ jEdit-commits ] SF.net SVN: jedit: [9472] jEdit/trunk

[<ez...@us...>]

Revision: 9472
          http://svn.sourceforge.net/jedit/?rev=9472&view=rev
Author:   ezust
Date:     2007-04-29 11:51:29 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
[ 1592085 ] Unable to abort collection of files for search in directory

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/doc/users-guide/history.xml
    jEdit/trunk/org/gjt/sp/jedit/io/VFS.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2007-04-28 06:23:08 UTC (rev 9471)
+++ jEdit/trunk/doc/CHANGES.txt	2007-04-29 18:51:29 UTC (rev 9472)
@@ -10,6 +10,9 @@
 
 {{{ Bug Fixes
 
+- 1592085 - Now able to abort collection of files for search in directory
+  (Alan Ezust)
+
 - A minor bug of cursor changing when dragging dockable panels
   using non continuous layout (Matthieu Casanova)
 

Modified: jEdit/trunk/doc/users-guide/history.xml
===================================================================
--- jEdit/trunk/doc/users-guide/history.xml	2007-04-28 06:23:08 UTC (rev 9471)
+++ jEdit/trunk/doc/users-guide/history.xml	2007-04-29 18:51:29 UTC (rev 9472)
@@ -5,14 +5,13 @@
 <appendix id="history"><title>History Text Fields</title>
  <para>
   The text fields in many jEdit components, such as the file system browser,
-  remember the last 20 entered strings by
+  incremental search bar, and action bar, all remember the last 20 entered strings by
   default. The number of strings to remember can be changed in the
   <guibutton>Appearance</guibutton> pane of the
   <guimenu>Utilities</guimenu>&gt;<guimenuitem>Global Options</guimenuitem>
   dialog box; see <xref linkend="appearance-pane" />.
  </para>
   
-  
  <para>
   Pressing <keycap>UP</keycap> recalls previous strings.
   Pressing <keycap>DOWN</keycap> after recalling previous strings
@@ -36,8 +35,7 @@
   <title> Search and Replace fields </title>
   <para> In jEdit 4.3, the search/replace history fields are multi-line textareas, so 
   they no longer use the same single-line history textfield described above. The multiline history textarea behaves a little differently: <keycap>UP</keycap> and
-  <keycap>DOWN</keycap> arrows go up and down a line in the textarea, instead of through the history. <keycap>PageUp</keycap> and <keycap>PageDown</keycap> are used instead to
-  select history values, and there is no arrow button, although right-click will still show you the history as a context menu. </para> 
+  <keycap>DOWN</keycap> arrows go up and down a line in the textarea, instead of through the previously entered strings. <keycap>PageUp</keycap> and <keycap>PageDown</keycap> are used instead to select history strings, and there is no arrow combo button, although right-click will still show you the history as a context menu. </para> 
   </note>
 
  

Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2007-04-28 06:23:08 UTC (rev 9471)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFS.java	2007-04-29 18:51:29 UTC (rev 9472)
@@ -42,6 +42,7 @@
 import org.gjt.sp.util.IOUtilities;
 import org.gjt.sp.util.StandardUtilities;
 //}}}
+import org.gjt.sp.util.WorkThread;
 
 /**
  * A virtual filesystem implementation.<p>
@@ -1075,6 +1076,13 @@
 
 		stack.add(directory);
 
+		Thread ct = Thread.currentThread();
+		WorkThread wt = null;
+		if (ct instanceof WorkThread) {
+			wt = (WorkThread) ct;
+		}
+		
+		
 		VFSFile[] _files = _listFiles(session,directory,
 			comp);
 		if(_files == null || _files.length == 0)
@@ -1082,6 +1090,7 @@
 
 		for(int i = 0; i < _files.length; i++)
 		{
+			if (wt != null && wt.isAborted()) break;
 			VFSFile file = _files[i];
 			if (skipHidden && (file.isHidden() || MiscUtilities.isBackup(file.getName())))
 				continue;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.