Skip to content
Snippets Groups Projects
Commit 61b9d548 authored by Stéphane  DALLONGEVILLE's avatar Stéphane DALLONGEVILLE
Browse files

Fixed MM JARs loading to not load duplicated libraries

parent 123939c2
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,7 @@ public class MMUtils ...@@ -152,7 +152,7 @@ public class MMUtils
try try
{ {
loaded = loadJarFrom(new File(uManagerRep + FileUtil.separator + "plugins" + FileUtil.separator loaded = loadJarsFrom(new File(uManagerRep + FileUtil.separator + "plugins" + FileUtil.separator
+ "Micro-Manager" + FileUtil.separator)); + "Micro-Manager" + FileUtil.separator));
} }
finally finally
...@@ -840,7 +840,7 @@ public class MMUtils ...@@ -840,7 +840,7 @@ public class MMUtils
return true; return true;
} }
private static boolean loadJarFrom(File microManagerDirectoryPath) private static boolean loadJarsFrom(File microManagerDirectoryPath)
{ {
File[] files = FileUtil.getFiles(microManagerDirectoryPath, new FileFilter() File[] files = FileUtil.getFiles(microManagerDirectoryPath, new FileFilter()
{ {
...@@ -863,7 +863,26 @@ public class MMUtils ...@@ -863,7 +863,26 @@ public class MMUtils
final String ext = FileUtil.getFileExtension(path, false).toLowerCase(); final String ext = FileUtil.getFileExtension(path, false).toLowerCase();
if (ext.equals("jar") || ext.equals("class")) if (ext.equals("jar") || ext.equals("class"))
{
// don't load libraries that area already included in Icy
if (path.contains("clojure"))
continue;
if (path.contains("rsyntaxtextarea"))
continue;
if (path.contains("swingx"))
continue;
if (path.contains("ome-xml"))
continue;
if (path.contains("jfreechart"))
continue;
if (path.contains("jcommon"))
continue;
if (path.contains("formats-"))
continue;
// we can add it
((PluginClassLoader) cl).add(path); ((PluginClassLoader) cl).add(path);
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment