X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2Fbuild%2FAbstractOsgiModularDistribution.java;h=2827c86d6f937fd7707b6e89618e9a24e94aa67d;hb=7d6251e4260ed330236ae86b732307439affcf76;hp=3e0d14b925365edc327218a5712b880270600b73;hpb=58e0e18d64a2080680a9f8397b0dfa2894519910;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
index 3e0d14b92..2827c86d6 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
@@ -17,6 +17,7 @@ package org.argeo.slc.osgi.build;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
@@ -24,7 +25,7 @@ import java.util.TreeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.BasicNameVersion;
+import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.UnsupportedException;
@@ -52,21 +53,25 @@ public abstract class AbstractOsgiModularDistribution implements
 
 	public Distribution getModuleDistribution(String moduleName,
 			String moduleVersion) {
-		return distributions
-				.get(new BasicNameVersion(moduleName, moduleVersion));
+		return distributions.get(new DefaultNameVersion(moduleName,
+				moduleVersion));
 	}
 
 	public String getDistributionId() {
 		return bundleContext.getBundle().getSymbolicName()
 				+ "-"
-				+ bundleContext.getBundle().getHeaders().get(
-						Constants.BUNDLE_VERSION);
+				+ bundleContext.getBundle().getHeaders()
+						.get(Constants.BUNDLE_VERSION);
 	}
 
 	public Set<NameVersion> listModulesNameVersions() {
 		return distributions.keySet();
 	}
 
+	public Iterator<NameVersion> nameVersions() {
+		return distributions.keySet().iterator();
+	}
+
 	public void setBundleContext(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
 	}
@@ -152,13 +157,13 @@ public abstract class AbstractOsgiModularDistribution implements
 	}
 
 	public String getVersion() {
-		return bundleContext.getBundle().getHeaders().get(
-				Constants.BUNDLE_VERSION).toString();
+		return bundleContext.getBundle().getHeaders()
+				.get(Constants.BUNDLE_VERSION).toString();
 	}
 
 	@Override
 	public String toString() {
-		return new BasicNameVersion(this).toString();
+		return new DefaultNameVersion(this).toString();
 	}
 
 	public void setEclipseUpdateSite(EclipseUpdateSite eclipseUpdateSite) {