From: <ez...@us...> - 2011-08-28 16:20:51
|
Revision: 19856 http://jedit.svn.sourceforge.net/jedit/?rev=19856&view=rev Author: ezust Date: 2011-08-28 16:20:45 +0000 (Sun, 28 Aug 2011) Log Message: ----------- Merge request # 3348881: Fix for browsing non browseable vfs Modified Paths: -------------- jEdit/branches/4.4.x/doc/CHANGES.txt jEdit/branches/4.4.x/org/gjt/sp/jedit/browser/VFSBrowser.java Property Changed: ---------------- jEdit/branches/4.4.x/ Property changes on: jEdit/branches/4.4.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/4.4.x-merge-request-for-r18847-r18954-r19206-r19210:19223 /jEdit/branches/4.4.x-merge-request-for-r19197:19216 /jEdit/branches/4.4.x-merge-request-for-r19201:19218,19229 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:18847,18954,18960-18961,19052,19084,19118,19121,19124,19138,19172,19185,19197,19199-19206,19208-19214,19246,19263,19289,19297-19299,19318,19325,19327,19346,19349-19350,19353,19377,19422,19489,19491,19501,19530,19547,19560-19561,19568-19571,19578,19588-19589,19592,19724 + /jEdit/branches/4.4.x-merge-request-for-r18847-r18954-r19206-r19210:19223 /jEdit/branches/4.4.x-merge-request-for-r19197:19216 /jEdit/branches/4.4.x-merge-request-for-r19201:19218,19229 /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:18847,18954,18960-18961,19052,19084,19118,19121,19124,19138,19172,19185,19197,19199-19206,19208-19214,19246,19263,19289,19297-19299,19318,19325,19327,19346,19349-19350,19353,19377,19422,19489,19491,19501,19530,19547,19560-19561,19568-19571,19578,19588-19589,19592,19645,19724 Modified: jEdit/branches/4.4.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.4.x/doc/CHANGES.txt 2011-08-28 15:04:04 UTC (rev 19855) +++ jEdit/branches/4.4.x/doc/CHANGES.txt 2011-08-28 16:20:45 UTC (rev 19856) @@ -4,9 +4,12 @@ {{{ Version 4.4.2 -Thanks to Björn "Vampire" Kautler for contributing to this release. +Thanks to Björn "Vampire" Kautler and Matthieu Casanova for contributing to this release. {{{ Bug Fixes +- If the current buffer is on a VFS that is not browseable (ex:http), trying + to open a new file was trying to browse the path of the current file giving + an error (Matthieu Casanova) }}} Modified: jEdit/branches/4.4.x/org/gjt/sp/jedit/browser/VFSBrowser.java =================================================================== --- jEdit/branches/4.4.x/org/gjt/sp/jedit/browser/VFSBrowser.java 2011-08-28 15:04:04 UTC (rev 19855) +++ jEdit/branches/4.4.x/org/gjt/sp/jedit/browser/VFSBrowser.java 2011-08-28 16:20:45 UTC (rev 19856) @@ -345,7 +345,7 @@ if(path == null) path = jEdit.getProperty("vfs.browser.path.tmp"); - if(path == null || path.length() == 0) + if(path == null || path.isEmpty()) { String userHome = System.getProperty("user.home"); String defaultPath = jEdit.getProperty("vfs.browser.defaultPath"); @@ -356,7 +356,9 @@ else if("buffer".equals(defaultPath)) { Buffer buffer = view.getBuffer(); - path = buffer.getDirectory(); + boolean browseable = (buffer.getVFS().getCapabilities() & VFS.BROWSE_CAP) != 0; + if (browseable) + path = buffer.getDirectory(); } else if("last".equals(defaultPath)) { @@ -368,7 +370,8 @@ } else if("favorites".equals(defaultPath)) path = "favorites:"; - else + + if (path == null || path.isEmpty()) { // unknown value??!!! path = userHome; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |