[ jEdit-commits ] SF.net SVN: jedit:[15337] plugins/XML/branches/relax-ng/xml

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

Revision: 15337
          http://jedit.svn.sourceforge.net/jedit/?rev=15337&view=rev
Author:   kerik-sf
Date:     2009-05-25 20:59:35 +0000 (Mon, 25 May 2009)

Log Message:
-----------
fix Resolver.clearCache() : now unsets all properties for the cache

Modified Paths:
--------------
    plugins/XML/branches/relax-ng/xml/Resolver.java
    plugins/XML/branches/relax-ng/xml/parser/XercesParserImpl.java

Modified: plugins/XML/branches/relax-ng/xml/Resolver.java
===================================================================
--- plugins/XML/branches/relax-ng/xml/Resolver.java	2009-05-25 20:54:23 UTC (rev 15336)
+++ plugins/XML/branches/relax-ng/xml/Resolver.java	2009-05-25 20:59:35 UTC (rev 15337)
@@ -492,6 +492,27 @@
 				new File(file).delete();
 			}
 		}
+		
+		//clear the properties ! 
+		int i=0;
+		String prop;
+		while(jEdit.getProperty(prop = "xml.cache"
+			+ ".public-id." + i++) != null)
+		{
+			System.out.println("unset "+prop);
+			jEdit.unsetProperty(prop);
+			jEdit.unsetProperty(prop+".uri");
+		}
+
+		i = 0;
+		while(jEdit.getProperty(prop = "xml.cache"
+			+ ".system-id." + i++) != null)
+		{
+			System.out.println("unset "+prop);
+			jEdit.unsetProperty(prop);
+			jEdit.unsetProperty(prop+".uri");
+		}
+		
 		resourceCache.clear();
 	} //}}}
 
@@ -540,6 +561,7 @@
 	} //}}}
 
 	//{{{ resolvePublic() method
+	// TODO : remove systemId as it's not used and merge the 2 methods
 	private String resolvePublic(String systemId, String publicId) throws IOException
 		
 	{
@@ -625,6 +647,13 @@
 		{
 			return id.hashCode();
 		}
+		public String toString(){
+			return "Resolver.Entry{"
+				+(type==SYSTEM?"SYSTEM":"PUBLIC")
+				+",id="+id
+				+",uri="+uri
+				+"}";
+		}
 	} //}}}
 	//{{{ VFSUpdateHandler class
 	/**

Modified: plugins/XML/branches/relax-ng/xml/parser/XercesParserImpl.java
===================================================================
--- plugins/XML/branches/relax-ng/xml/parser/XercesParserImpl.java	2009-05-25 20:54:23 UTC (rev 15336)
+++ plugins/XML/branches/relax-ng/xml/parser/XercesParserImpl.java	2009-05-25 20:59:35 UTC (rev 15337)
@@ -230,6 +230,8 @@
 					if (parent != null) parent.content.add(decl.getName());
 				}
 			}
+			System.out.println("abstract : "+name);
+			// TODO: elementDecl will be null
 		}
 		else {
 			elementDecl = new ElementDecl(info, name, null);


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