diff --git a/src/main/java/plugins/tprovoost/Microscopy/MicroManager/tools/MMUtils.java b/src/main/java/plugins/tprovoost/Microscopy/MicroManager/tools/MMUtils.java index cf5ba3ccef82addbadaf1aa452677dc8d5dcf3eb..7cf14be029f7f15f477c49ef4199e6c17fb8ebed 100644 --- a/src/main/java/plugins/tprovoost/Microscopy/MicroManager/tools/MMUtils.java +++ b/src/main/java/plugins/tprovoost/Microscopy/MicroManager/tools/MMUtils.java @@ -152,7 +152,7 @@ public class MMUtils 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)); } finally @@ -840,7 +840,7 @@ public class MMUtils return true; } - private static boolean loadJarFrom(File microManagerDirectoryPath) + private static boolean loadJarsFrom(File microManagerDirectoryPath) { File[] files = FileUtil.getFiles(microManagerDirectoryPath, new FileFilter() { @@ -863,7 +863,26 @@ public class MMUtils final String ext = FileUtil.getFileExtension(path, false).toLowerCase(); 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); + } } }