X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FBndWrapper.java;h=ab495d219dd4c8fb449da79ea61e44d652284bc9;hb=305ecfa036fac8562fbb3af875c6ecf5822b6dcb;hp=42111e7df52b4b019509d584712725f2d1b66213;hpb=3ff90591a4e64b7459372afe4129f84fb959bbe0;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java index 42111e7df..ab495d219 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java @@ -9,7 +9,7 @@ import java.util.jar.Manifest; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.CategorizedNameVersion; +import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.build.Distribution; import org.argeo.slc.build.License; @@ -23,7 +23,7 @@ import aQute.bnd.osgi.Constants; import aQute.bnd.osgi.Jar; /** Utilities around the BND library, which manipulates OSGi metadata. */ -public class BndWrapper implements Constants, CategorizedNameVersion, Distribution, BeanNameAware { +public class BndWrapper implements Constants, CategoryNameVersion, Distribution, BeanNameAware { private final static Log log = LogFactory.getLog(BndWrapper.class); private String groupId; @@ -213,8 +213,8 @@ public class BndWrapper implements Constants, CategorizedNameVersion, Distributi @Override public boolean equals(Object obj) { - if (obj instanceof CategorizedNameVersion) { - CategorizedNameVersion cnv = (CategorizedNameVersion) obj; + if (obj instanceof CategoryNameVersion) { + CategoryNameVersion cnv = (CategoryNameVersion) obj; return getCategory().equals(cnv.getCategory()) && getName().equals(cnv.getName()) && getVersion().equals(cnv.getVersion()); } else