X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fviews%2FModulesView.java;h=f476d82a9928759d511221254e2b80569c56b3e1;hb=06c090bb350bf6d539dd0f0848177c22cc87e759;hp=d0fac981d7f209db13b56dc335e44523e717dcbd;hpb=9485fdca99c408ae16fd077577973b80b7dde81f;p=gpl%2Fargeo-slc.git diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java index d0fac981d..f476d82a9 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java +++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java @@ -10,7 +10,6 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.eclipse.ui.TreeObject; import org.argeo.eclipse.ui.TreeParent; import org.argeo.slc.client.ui.dist.DistPlugin; import org.eclipse.jface.viewers.ITableLabelProvider; @@ -137,31 +136,35 @@ public class ModulesView extends ViewPart { } } - Map> traces1 = new TreeMap>(); - Map space1 = dependencySpace(bundle1, - importedPackages, traces1); - Map> traces2 = new TreeMap>(); - Map space2 = dependencySpace(bundle2, - importedPackages, traces2); - for (String key : space1.keySet()) { - if (space2.containsKey(key)) { - ExportedPackage pkg1 = space1.get(key); - ExportedPackage pkg2 = space2.get(key); - if (!pkg1.getVersion().equals(pkg2.getVersion())) { - log.debug("\n##" + pkg1 + " <> " + pkg2); - log.debug("# Traces for " - + bundle1.getSymbolicName()); - for (String trace : traces1.get(pkg1.getName())) { - log.debug(trace); - } - log.debug("# Traces for " - + bundle2.getSymbolicName()); - for (String trace : traces2.get(pkg2.getName())) { - log.debug(trace); - } - } - } - } + // Map> traces1 = new TreeMap>(); + // Map space1 = + // dependencySpace(bundle1, + // importedPackages, traces1); + // Map> traces2 = new TreeMap>(); + // Map space2 = + // dependencySpace(bundle2, + // importedPackages, traces2); + // for (String key : space1.keySet()) { + // if (space2.containsKey(key)) { + // ExportedPackage pkg1 = space1.get(key); + // ExportedPackage pkg2 = space2.get(key); + // if (!pkg1.getVersion().equals(pkg2.getVersion())) { + // log.debug("\n##" + pkg1 + " <> " + pkg2); + // log.debug("# Traces for " + // + bundle1.getSymbolicName()); + // for (String trace : traces1.get(pkg1.getName())) { + // log.debug(trace); + // } + // log.debug("# Traces for " + // + bundle2.getSymbolicName()); + // for (String trace : traces2.get(pkg2.getName())) { + // log.debug(trace); + // } + // } + // } + // } return new Object[] { bundlesNode, mPackageNode, aPackageNode }; } else if (parentElement instanceof TreeParent) { @@ -295,7 +298,7 @@ public class ModulesView extends ViewPart { addChild(usingBundles); for (Bundle b : usedBundles) { if (b != null) - usingBundles.addChild(new TreeObject(b + usingBundles.addChild(new TreeParent(b .getSymbolicName())); } } @@ -303,7 +306,7 @@ public class ModulesView extends ViewPart { TreeParent properties = new TreeParent("Properties"); addChild(properties); for (String key : serviceReference.getPropertyKeys()) { - properties.addChild(new TreeObject(key + "=" + properties.addChild(new TreeParent(key + "=" + serviceReference.getProperty(key))); }