81,7 → 81,6 |
void add(final String fileName, final PluginProperties pp, final Sandbox sbox) { |
byName.put(pp.name, sbox); |
byFilename.put(fileName, sbox); |
|
if (byType.get(pp.type) == null) { |
byType.put(pp.type, new LinkedList<Sandbox>()); |
} |
299,7 → 298,7 |
/** |
* Scan over a directory inside a jar file |
* @param jarUri Directory to scan |
* @return LIst of plugins in directory <code>jarUri</code> |
* @return List of plugins in directory <code>jarUri</code> |
*/ |
private void scan(final URI jarUri) { |
assert jarUri.getScheme().equals("jar"); |
321,12 → 320,11 |
|
if (url.startsWith(root) && !je.isDirectory()) { |
// Accepted URI |
|
try { |
final URI pluginUri = new URI("jar:"+jarFile+"!"+url); |
|
final Sandbox sb = environment.createSandbox(pluginUri); |
final PluginProperties pp = PluginEnvironment.fetchPluginProperties(jarUri); |
final PluginProperties pp = PluginEnvironment.fetchPluginProperties(pluginUri); |
// JarEntry's getName() returns the full path |
final String fileName = new File(je.getName()).getName(); |
if (pp.name == null) { |