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

[<k_s...@us...>]

Revision: 13284
          http://jedit.svn.sourceforge.net/jedit/?rev=13284&view=rev
Author:   k_satoda
Date:     2008-08-12 18:41:18 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Eliminated needless references to Buffer from HyperSearchFileNode, which
sometimes held closed buffers in memory.

jProfiler helped.

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchFileNode.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2008-08-12 18:31:39 UTC (rev 13283)
+++ jEdit/trunk/doc/CHANGES.txt	2008-08-12 18:41:18 UTC (rev 13284)
@@ -13,9 +13,15 @@
 
 
 }}}
+{{{ API Changes
 
+- A public field buffer in HyperSearchFileNode was removed. Use
+  getBuffer() instead. (Kazutoshi Satoda)
+
 }}}
 
+}}}
+
 {{{ Version 4.3pre15
 
 Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin, Matthieu Casanova,

Modified: jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchFileNode.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchFileNode.java	2008-08-12 18:31:39 UTC (rev 13283)
+++ jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchFileNode.java	2008-08-12 18:41:18 UTC (rev 13284)
@@ -36,7 +36,6 @@
 public class HyperSearchFileNode implements HyperSearchNode
 {
 	public String path;
-	public Buffer buffer;
 	public boolean showFullPath = true;
 
 	private static String fileSep = System.getProperty("file.separator");
@@ -55,9 +54,7 @@
 	//{{{ getBuffer() method
 	public Buffer getBuffer(View view)
 	{
-		if(buffer == null)
-			buffer = jEdit.openFile(view,path);
-		return buffer;
+		return jEdit.openFile(view,path);
 	} //}}}
 
 	//{{{ goTo() method
@@ -86,8 +83,7 @@
 			return false;
 		HyperSearchFileNode otherResult = (HyperSearchFileNode)compareObj;
 		
-		return path.equals(MiscUtilities.resolveSymlinks(otherResult.path))
-			&& buffer.equals(otherResult.buffer);		
+		return path.equals(MiscUtilities.resolveSymlinks(otherResult.path));
 	}//}}}
 
 	/**


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