[ jEdit-CVS ] SF.net SVN: jedit: [1024] plugins/XML/trunk

[<ez...@us...>]

Revision: 1024
Author:   ezust
Date:     2006-07-20 20:34:25 -0700 (Thu, 20 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/jedit/?rev=1024&view=rev

Log Message:
-----------
Sf.net bug# 1525479 fixed.

Modified Paths:
--------------
    plugins/XML/trunk/XML.props
    plugins/XML/trunk/docs/users-guide.xml
    plugins/XML/trunk/xml/CatalogManager.java
    plugins/XML/trunk/xml/XmlPlugin.java
    plugins/XML/trunk/xml/parser/SAXParserImpl.java
Modified: plugins/XML/trunk/XML.props
===================================================================
--- plugins/XML/trunk/XML.props	2006-07-20 08:26:50 UTC (rev 1023)
+++ plugins/XML/trunk/XML.props	2006-07-21 03:34:25 UTC (rev 1024)
@@ -2,7 +2,7 @@
 plugin.xml.XmlPlugin.activate=defer
 plugin.xml.XmlPlugin.name=XML
 plugin.xml.XmlPlugin.author=Slava Pestov, Alan Ezust, Dale Anson, Jakub Roztocil, Martin Raspe
-plugin.xml.XmlPlugin.version=2.0.2
+plugin.xml.XmlPlugin.version=2.0.3
 plugin.xml.XmlPlugin.docs=index.html
 
 plugin.xml.XmlPlugin.depend.0=jedit 04.03.05.00

Modified: plugins/XML/trunk/docs/users-guide.xml
===================================================================
--- plugins/XML/trunk/docs/users-guide.xml	2006-07-20 08:26:50 UTC (rev 1023)
+++ plugins/XML/trunk/docs/users-guide.xml	2006-07-21 03:34:25 UTC (rev 1024)
@@ -1,8 +1,4 @@
-<!-- jEdit buffer-local properties: -->
-<!-- :indentSize=1:noTabs=true:folding=sidekick: -->
-<!-- (C) 2001, 2003 Slava Pestov -->
-<!-- (C) 2005, 2006 Alan Ezust -->
-<!-- Look ma, no DTD! -->
+<?xml version="1.0"?>
 <book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation='http://www.docbook.org/xsd/4.4/docbook.xsd' >
   <title>XML plugin user's guide</title>
@@ -548,6 +544,13 @@
 </appendix>
 <appendix id="changes">
 <title>Change log</title> <itemizedlist>
+ <listitem><para>
+ <emphasis role="bold">Version 2.0.3</emphasis>
+ Requires jEdit 4.3pre5, Java 1.5, ErrorList  1.4, SideKick 0.6.3 and XercesPlugin 2.8.0.
+ <itemizedlist>
+ <listitem><para> Fixed bug with error messages from files in samba shares. </para></listitem>
+ </itemizedlist>
+ </para></listitem>
  
  <listitem><para><emphasis role="bold">Version 2.0</emphasis> Requires jEdit 4.3pre5, Java 1.5, ErrorList  1.4, SideKick 0.6.3 and XercesPlugin 2.8.0. 
  <itemizedlist>
@@ -736,3 +739,4 @@
 </appendix>
 
 </book>
+

Modified: plugins/XML/trunk/xml/CatalogManager.java
===================================================================
--- plugins/XML/trunk/xml/CatalogManager.java	2006-07-20 08:26:50 UTC (rev 1023)
+++ plugins/XML/trunk/xml/CatalogManager.java	2006-07-21 03:34:25 UTC (rev 1024)
@@ -451,7 +451,7 @@
 	} //}}}
 
 	//{{{ resolveSystem() method
-	static String resolveSystem(String id) throws Exception
+	public static String resolveSystem(String id) throws Exception
 	{
 		Entry e = new Entry(Entry.SYSTEM,id,null);
 		String uri = (String)resourceCache.get(e);

Modified: plugins/XML/trunk/xml/XmlPlugin.java
===================================================================
--- plugins/XML/trunk/xml/XmlPlugin.java	2006-07-20 08:26:50 UTC (rev 1023)
+++ plugins/XML/trunk/xml/XmlPlugin.java	2006-07-21 03:34:25 UTC (rev 1024)
@@ -136,6 +136,12 @@
 	} //}}}
 
 	//{{{ uriToFile() method
+    /**
+     * This method is hacky and should be rewritten to use
+     * java.net.URI. In particular, it does not work if
+     * the file:// URI points to a samba share.
+     * 
+     */
 	public static String uriToFile(String uri)
 	{
 		if (uri.startsWith("http:/")) try {
@@ -145,6 +151,8 @@
 		catch (Exception e) {
 			Log.log(Log.ERROR, XmlPlugin.class, e.getMessage());
 		}
+
+        
 		if(uri.startsWith("file:/"))
 		{
 			int start;
@@ -171,7 +179,7 @@
 					buf.append(ch);
 			}
 			uri = buf.toString();
-		}
+		} 
 		return uri;
 	} //}}}
 

Modified: plugins/XML/trunk/xml/parser/SAXParserImpl.java
===================================================================
--- plugins/XML/trunk/xml/parser/SAXParserImpl.java	2006-07-20 08:26:50 UTC (rev 1023)
+++ plugins/XML/trunk/xml/parser/SAXParserImpl.java	2006-07-21 03:34:25 UTC (rev 1024)
@@ -66,6 +66,7 @@
 import sidekick.SideKickParsedData;
 
 import xml.CatalogManager;
+import xml.Resolver;
 import xml.XmlParsedData;
 import xml.XmlPlugin;
 import xml.completion.CompletionInfo;
@@ -75,7 +76,8 @@
 import xml.completion.XsdElementDecl;
 //}}}
 /**
- * @deprecated - use XercesParserImpl instead
+ * Eventually this will be replaced by XercesParserImpl.
+ * 
  */
 public class SAXParserImpl extends XmlParser
 {
@@ -307,8 +309,11 @@
 		//{{{ addError() method
 		private void addError(int type, String uri, int line, String message)
 		{
-			errorSource.addError(type,XmlPlugin.uriToFile(uri),line,
-				0,0,message);
+		    try {
+                uri = CatalogManager.resolveSystem(uri);
+            }
+            catch (Exception e) {}
+			errorSource.addError(type, uri, line, 0, 0, message);
 		} //}}}
 
 		//{{{ getGrammarForNamespace() method


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