Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core
In directory sc8-pr-cvs1:/tmp/cvs-serv20137/src/com/babeldoc/core
Modified Files:
ResourceLoader.java
Log Message:
Now the getUrl uses the modules list to search for names...
Index: ResourceLoader.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/ResourceLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ResourceLoader.java 27 Jun 2003 02:19:57 -0000 1.6
--- ResourceLoader.java 8 Jul 2003 02:46:50 -0000 1.7
***************
*** 66,69 ****
--- 66,72 ----
package com.babeldoc.core;
+ import com.babeldoc.core.module.BabeldocModule;
+ import com.babeldoc.core.module.BabeldocModuleList;
+
import java.io.*;
***************
*** 212,215 ****
--- 215,219 ----
throws IOException {
//LogService.getInstance().logDebug("[getResourceStream] for name: "+name);
+ //System.out.println("Getting resource stream for: "+name);
return getResourceStream(getUrl(name));
}
***************
*** 285,288 ****
--- 289,293 ----
}
+ // Try and load from the search path
if (url == null) {
url = getFirstMatchingUrlInSearchPath(name,
***************
*** 291,294 ****
--- 296,300 ----
//LogService.getInstance().logDebug("[getUrl] url: "+url+" for name: "+name);
+ //System.out.println("url: "+url);
return url;
}
***************
*** 383,386 ****
--- 389,405 ----
}
}
+ }
+ }
+
+ // Now get the name from the modules
+ BabeldocModule[] modules = BabeldocModuleList.getInstance()
+ .getSortedModules();
+
+ for (int i = modules.length - 1; i >= 0; --i) {
+ String moduleConfig = modules[i].getName() + "/" + name;
+
+ URL url = Thread.currentThread().getContextClassLoader().getResource(moduleConfig);
+ if(url!=null) {
+ list.add(url);
}
}
|
