[ jEdit-commits ] SF.net SVN: jedit:[23817] jEdit/branches/5.2.x

[<ker...@us...>]

Revision: 23817
          http://sourceforge.net/p/jedit/svn/23817
Author:   kerik-sf
Date:     2015-01-03 14:09:34 +0000 (Sat, 03 Jan 2015)
Log Message:
-----------
Merged: #202 Help Search Index URL fix on Windows (fixes #3895, #3896, #3897)

Modified Paths:
--------------
    jEdit/branches/5.2.x/doc/CHANGES.txt
    jEdit/branches/5.2.x/org/gjt/sp/jedit/help/HelpIndex.java

Property Changed:
----------------
    jEdit/branches/5.2.x/

Index: jEdit/branches/5.2.x
===================================================================
--- jEdit/branches/5.2.x	2014-12-31 15:47:53 UTC (rev 23816)
+++ jEdit/branches/5.2.x	2015-01-03 14:09:34 UTC (rev 23817)

Property changes on: jEdit/branches/5.2.x
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 /jEdit/branches/docking_framework:13128-13258
-/jEdit/trunk:23550-23567,23569,23625-23626,23636,23651,23654,23664,23677,23683,23700,23708,23720-23721,23748
+/jEdit/trunk:23550-23567,23569,23625-23626,23636,23651,23654,23664,23677,23683,23700,23708,23720-23721,23748,23751
\ No newline at end of property
Modified: jEdit/branches/5.2.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/5.2.x/doc/CHANGES.txt	2014-12-31 15:47:53 UTC (rev 23816)
+++ jEdit/branches/5.2.x/doc/CHANGES.txt	2015-01-03 14:09:34 UTC (rev 23817)
@@ -30,6 +30,9 @@
 - Fix for bug #3893 where PluginResURLConnection.openStream returning null for
   non existing resources made jEdit hang on Java 8, Mac OS 10.10. (Eric Le Lay)
 
+- Fix for Bugs #3895, #3897: Invalid HelpIndex URLs on windows.
+  (Alan Ezust,  Eric Le Lay)
+
 }}}
 {{{ Miscellaneous
 - MiscUtilities.openInDesktop() works with URIs on Windows now. (Alan Ezust)
@@ -82,6 +85,8 @@
 - Fix java installer bug: Installing from jedit5.1.0install.jar failure
   (bug #3837 - Eric Le Lay)
 
+- HelpIndex includes .txt files again. (Bug #3896 - Alan Ezust)
+
 }}}
 {{{ API Changes
 

Modified: jEdit/branches/5.2.x/org/gjt/sp/jedit/help/HelpIndex.java
===================================================================
--- jEdit/branches/5.2.x/org/gjt/sp/jedit/help/HelpIndex.java	2014-12-31 15:47:53 UTC (rev 23816)
+++ jEdit/branches/5.2.x/org/gjt/sp/jedit/help/HelpIndex.java	2015-01-03 14:09:34 UTC (rev 23817)
@@ -144,7 +144,7 @@
 			ZipEntry entry = (ZipEntry)e.nextElement();
 			String name = entry.getName();
 			String lname = name.toLowerCase();
-			if(lname.endsWith(".html")/*  || lname.endsWith(".txt") */)
+			if(lname.endsWith(".html") || lname.endsWith(".txt") )
 			{
 				// only works for jEdit plugins
 				String url = "jeditresource:/" +
@@ -162,20 +162,19 @@
 	 * index.
 	 * @param url The HTML file's URL
 	 */
-	public void indexURL(String url) throws Exception
+	public void indexURL(String path) throws Exception
 	{
-		InputStream _in;
-
-		if(MiscUtilities.isURL(url))
-			_in =  new URL(url).openStream();
-		else
+		URL url;		
+		if (MiscUtilities.isURL(path))
+			url = new URL(path);
+		else 
 		{
-			_in = new FileInputStream(url);
-			// hack since HelpViewer needs a URL...
-			url = "file:" + url;
+			File f = new File(path);
+			url = f.toURI().toURL();
 		}
-
-		indexStream(_in,url);
+		InputStream _in;
+		_in =  url.openStream();
+		indexStream(_in, url.toString());
 	} //}}}
 
 	//{{{ lookupWord() method

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