From: Niki Roo <niki@nikiroo.be>
Date: Thu, 16 Jan 2020 13:03:48 +0000 (+0100)
Subject: Merge commit '087a6e8e7f1b0e63633831948e99ae110b92ae45'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=8c227da67c11370980154c61861bcfb9c73881c5;hp=-c

Merge commit '087a6e8e7f1b0e63633831948e99ae110b92ae45'
---

8c227da67c11370980154c61861bcfb9c73881c5
diff --combined src/be/nikiroo/utils/IOUtils.java
index e3837e1,3d252ea..3d252ea
--- a/src/be/nikiroo/utils/IOUtils.java
+++ b/src/be/nikiroo/utils/IOUtils.java
@@@ -370,13 -370,30 +370,30 @@@ public class IOUtils 
  		return errorAcc;
  	}
  
+ 	/**
+ 	 * Open the resource next to the given {@link Class}.
+ 	 * 
+ 	 * @param location
+ 	 *            the location where to look for the resource
+ 	 * @param name
+ 	 *            the resource name (only the filename, no path)
+ 	 * 
+ 	 * @return the opened resource if found, NULL if not
+ 	 */
+ 	public static InputStream openResource(
+ 			@SuppressWarnings("rawtypes") Class location, String name) {
+ 		String loc = location.getName().replace(".", "/")
+ 				.replaceAll("/[^/]*$", "/");
+ 		return openResource(loc + name);
+ 	}
+ 
  	/**
  	 * Open the given /-separated resource (from the binary root).
  	 * 
  	 * @param name
- 	 *            the resource name
+ 	 *            the resource name (the full path, with "/" as separator)
  	 * 
- 	 * @return the opened resource if found, NLL if not
+ 	 * @return the opened resource if found, NULL if not
  	 */
  	public static InputStream openResource(String name) {
  		ClassLoader loader = IOUtils.class.getClassLoader();