[ jEdit-commits ] SF.net SVN: jedit:[14609] jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java

[<kp...@us...>]

Revision: 14609
          http://jedit.svn.sourceforge.net/jedit/?rev=14609&view=rev
Author:   kpouer
Date:     2009-02-08 01:09:54 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
The JarClassLoader now allows to open resources from another jar

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java

Modified: jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java	2009-02-08 01:01:49 UTC (rev 14608)
+++ jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java	2009-02-08 01:09:54 UTC (rev 14609)
@@ -1016,7 +1016,7 @@
 	void init()
 	{
 		PluginCacheEntry cache = getPluginCache(this);
-		if(cache != null && cache.resources != null)
+		if(cache != null)
 		{
 			loadCache(cache);
 			classLoader.activate();
@@ -1123,6 +1123,7 @@
 	private void loadCache(PluginCacheEntry cache)
 	{
 		classes = cache.classes;
+		resources = cache.resources;
 
 		/* this should be before dockables are initialized */
 		if(cache.cachedProperties != null)
@@ -1278,7 +1279,7 @@
 			new String[classes.size()]);
 		this.resources = cache.resources =
 			resources.toArray(
-			new String[classes.size()]);
+			new String[resources.size()]);
 
 		String label = null;
 
@@ -1465,7 +1466,7 @@
 	 */
 	public static class PluginCacheEntry
 	{
-		public static final int MAGIC = 0xB7A2E421;
+		public static final int MAGIC = 0xB7A2E422;
 
 		//{{{ Instance variables
 		public PluginJAR plugin;
@@ -1543,6 +1544,7 @@
 			}
 
 			classes = readStringArray(din);
+			resources = readStringArray(din);
 
 			cachedProperties = readMap(din);
 
@@ -1586,6 +1588,7 @@
 			}
 
 			writeStringArray(dout,classes);
+			writeStringArray(dout,resources);
 
 			writeMap(dout,cachedProperties);
 


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