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=0c0a679b177029518376266277e40eed8e7c22a0;hb=2aee0719f283ed82e2b2866070c7fa400426e22f;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..0c0a679b1 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.client.ui.dist.views;
 
 import java.util.Comparator;
@@ -10,7 +25,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 +151,35 @@ public class ModulesView extends ViewPart {
 					}
 				}
 
-				Map<String, Set<String>> traces1 = new TreeMap<String, Set<String>>();
-				Map<String, ExportedPackage> space1 = dependencySpace(bundle1,
-						importedPackages, traces1);
-				Map<String, Set<String>> traces2 = new TreeMap<String, Set<String>>();
-				Map<String, ExportedPackage> 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<String, Set<String>> traces1 = new TreeMap<String,
+				// Set<String>>();
+				// Map<String, ExportedPackage> space1 =
+				// dependencySpace(bundle1,
+				// importedPackages, traces1);
+				// Map<String, Set<String>> traces2 = new TreeMap<String,
+				// Set<String>>();
+				// Map<String, ExportedPackage> 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 +313,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 +321,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)));
 			}