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

[<kp...@us...>]

Revision: 16550
          http://jedit.svn.sourceforge.net/jedit/?rev=16550&view=rev
Author:   kpouer
Date:     2009-11-24 14:10:40 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
When creating a new file from the VFS Browser, if a clean untitled buffer 
  already exists but with another path it is now replaced by a new untitled 
  buffer using the selected path

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

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2009-11-23 18:38:40 UTC (rev 16549)
+++ jEdit/trunk/doc/CHANGES.txt	2009-11-24 14:10:40 UTC (rev 16550)
@@ -2,8 +2,8 @@
 
 {{{ Version 4.3pre19
 
-Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin and Eric Le Lay for
-contributing to this release.
+Thanks to Bj\xF6rn "Vampire" Kautler, Marcelo Vanzin, Matthieu Casanova and 
+Eric Le Lay for contributing to this release.
 
 {{{ Bug Fixes
 
@@ -13,8 +13,9 @@
 
 }}}
 {{{ Miscellaneous
-
-
+- When creating a new file from the VFS Browser, if a clean untitled buffer 
+  already exists but with another path it is now replaced by a new untitled 
+  buffer using the selected path (Matthieu Casanova)
 }}}
 {{{ API Changes
 

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2009-11-23 18:38:40 UTC (rev 16549)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2009-11-24 14:10:40 UTC (rev 16550)
@@ -1765,6 +1765,16 @@
 			{
 				if (buf.isUntitled() && !buf.isDirty())
 				{
+
+                    if (!MiscUtilities.getParentOfPath(buf.getPath()).equals(dir))
+                    {
+                        // Find the highest Untitled-n file
+                        int untitledCount = getNextUntitledBufferId();
+
+                        Buffer newBuffer = openFile(editPane,dir,"Untitled-" + untitledCount,true,null);
+                        jEdit.closeBuffer(editPane, buf);
+                        return newBuffer;
+                    }
 					/*  if  "never mark untitled buffers dirty"
 					 *  is selected, we might have contents in non-dirty
 					 *  untitled buffers. We must clear those contents


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