[ jEdit-commits ] SF.net SVN: jedit:[17465] plugins/XSLT/trunk

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

Revision: 17465
          http://jedit.svn.sourceforge.net/jedit/?rev=17465&view=rev
Author:   kerik-sf
Date:     2010-03-13 15:42:16 +0000 (Sat, 13 Mar 2010)

Log Message:
-----------
- use the new xml.PathUtilities in XMLPlugin 2.6.1
  paths in ErrorList are now correct on Windows when the source or stylesheet is in documents and settings

Modified Paths:
--------------
    plugins/XSLT/trunk/XSLT.props
    plugins/XSLT/trunk/docs/users-guide.xml
    plugins/XSLT/trunk/xslt/ErrorListenerToErrorList.java
    plugins/XSLT/trunk/xslt/XSLTProcessor.java

Modified: plugins/XSLT/trunk/XSLT.props
===================================================================
--- plugins/XSLT/trunk/XSLT.props	2010-03-13 15:39:59 UTC (rev 17464)
+++ plugins/XSLT/trunk/XSLT.props	2010-03-13 15:42:16 UTC (rev 17465)
@@ -6,7 +6,7 @@
 plugin.xslt.XSLTPlugin.jars=xalan.jar serializer.jar
 plugin.xslt.XSLTPlugin.depend.0=jdk 1.3
 plugin.xslt.XSLTPlugin.depend.1=jedit 04.03.99.01
-plugin.xslt.XSLTPlugin.depend.2=plugin xml.XmlPlugin 2.5
+plugin.xslt.XSLTPlugin.depend.2=plugin xml.XmlPlugin 2.6.1
 plugin.xslt.XSLTPlugin.depend.3=plugin errorlist.ErrorListPlugin 1.8
 plugin.xslt.XSLTPlugin.depend.4=optional plugin saxon.SaxonPLugin 9.2.0.6
 

Modified: plugins/XSLT/trunk/docs/users-guide.xml
===================================================================
--- plugins/XSLT/trunk/docs/users-guide.xml	2010-03-13 15:39:59 UTC (rev 17464)
+++ plugins/XSLT/trunk/docs/users-guide.xml	2010-03-13 15:42:16 UTC (rev 17465)
@@ -456,7 +456,7 @@
     <para>
       <emphasis role="bold">Changes from 0.6.0 to 0.7.0</emphasis>
       <itemizedlist>
-        <listitem><para>0.7 requires >=jEdit 4.3, >=XML plugin 2.5, >=ErrorList 1.8</para></listitem>
+        <listitem><para>0.7 requires >=jEdit 4.3, >=XML plugin 2.6.1, >=ErrorList 1.8</para></listitem>
         <listitem><para>compatible with the XML Plugin version 2.5
         (see plugin bug #2852413 :  "XSLT plugin : XPath depends xml.CatalogManager").</para></listitem>
         <listitem><para>Updated to Xalan 2.7.1.</para></listitem>

Modified: plugins/XSLT/trunk/xslt/ErrorListenerToErrorList.java
===================================================================
--- plugins/XSLT/trunk/xslt/ErrorListenerToErrorList.java	2010-03-13 15:39:59 UTC (rev 17464)
+++ plugins/XSLT/trunk/xslt/ErrorListenerToErrorList.java	2010-03-13 15:42:16 UTC (rev 17465)
@@ -23,6 +23,8 @@
 import java.io.File;
 import org.gjt.sp.util.Log;
 
+import xml.PathUtilities;
+
 import errorlist.ErrorSource;
 import errorlist.DefaultErrorSource;
 
@@ -86,19 +88,14 @@
 		if(col < 0) col=0;
 		// TODO: Handle VFS URLs
 		String systemId=exception.getSystemId();
-		String path=systemId;
-		if(path == null){
+		String path;
+		if(systemId == null){
 			Log.log(Log.DEBUG,this,"NULL systemId");
-			path = stylesheetPath;
+			path = PathUtilities.urlToPath(stylesheetPath);
 		}else{
-			try {
-				URL url=new URL(systemId);
-				File file=new File(url.getFile());
-				path=file.getAbsolutePath();
-			} catch (java.net.MalformedURLException e) {
-				Log.log(Log.ERROR,this,e);
-			}
+			path = PathUtilities.urlToPath(systemId);
 		}
+		path = PathUtilities.urlToPath(stylesheetPath);
 		XSLTPlugin.getErrorSource().addError(new DefaultErrorSource.DefaultError(XSLTPlugin.getErrorSource(),
 		ErrorSource.ERROR,path,line,0,col,
 		"(SAX error) "+exception.getMessage()));
@@ -106,6 +103,7 @@
 
 	private void sendError(TransformerException exception, int level) {
 		SourceLocator locator=exception.getLocator();
+		String path;
 		if(locator != null) {
 			int line=locator.getLineNumber()-1;
 			int col=locator.getColumnNumber()-1;
@@ -113,25 +111,19 @@
 			if(col < 0) col=0;
 			// TODO: Handle VFS URLs
 			String systemId=locator.getSystemId();
-			String path=systemId;
-			if(path == null){
+			if(systemId == null){
 				Log.log(Log.DEBUG,this,"NULL systemId");
-				path = stylesheetPath;
+				path = PathUtilities.urlToPath(stylesheetPath);
 			}else{
-				try {
-					URL url=new URL(systemId);
-					File file=new File(url.getFile());
-					path=file.getAbsolutePath();
-				} catch (java.net.MalformedURLException e) {
-					Log.log(Log.ERROR,this,e);
-				}
+				path = PathUtilities.urlToPath(systemId);
 			}
 			XSLTPlugin.getErrorSource().addError(new DefaultErrorSource.DefaultError(XSLTPlugin.getErrorSource(),
 			level,path,line,0,col,
 			"(XSLT error) "+exception.getMessage()));
 		} else {
+			path = PathUtilities.urlToPath(stylesheetPath);
 			XSLTPlugin.getErrorSource().addError(new DefaultErrorSource.DefaultError(XSLTPlugin.getErrorSource(),
-			level,stylesheetPath,1,0,0,
+			level,path,1,0,0,
 			"(XSLT error) "+exception.getMessage()));
 		}
 	}

Modified: plugins/XSLT/trunk/xslt/XSLTProcessor.java
===================================================================
--- plugins/XSLT/trunk/xslt/XSLTProcessor.java	2010-03-13 15:39:59 UTC (rev 17464)
+++ plugins/XSLT/trunk/xslt/XSLTProcessor.java	2010-03-13 15:42:16 UTC (rev 17465)
@@ -420,7 +420,7 @@
 				outputToBuffer = true;
 				outputWriter = new StringWriter();
 				result = new StreamResult(outputWriter);
-				result.setSystemId(xml.SchemaMappingManager.pathToURL(outputBuffer.getPath()));
+				result.setSystemId(xml.PathUtilities.pathToURL(outputBuffer.getPath()));
 				resultFile = null;
 
 			} else {
@@ -440,7 +440,7 @@
 					outputBuffer = jEdit.newFile(view);
 					outputWriter = new StringWriter();
 					result = new StreamResult(outputWriter);
-					result.setSystemId(xml.SchemaMappingManager.pathToURL(outputBuffer.getPath()));
+					result.setSystemId(xml.PathUtilities.pathToURL(outputBuffer.getPath()));
 				} else {
 					resultFile = new File(resultPanel.getSourceFile());
 					outputBuffer = jEdit.getBuffer(resultFile.getAbsolutePath());

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