Latest pre-release bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1387568 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java b/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
index cb4d489..255eef1 100644
--- a/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
+++ b/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
@@ -34,7 +34,7 @@
analyzer.error("No name for a reference");
if ((updated != null && !updated.equals("-")) || policyOption != null)
- version = max(version, AnnotationReader.V1_2);
+ updateVersion(AnnotationReader.V1_2);
if (target != null) {
String error = Verifier.validateFilter(target);
@@ -81,16 +81,14 @@
return ref;
}
- static <T extends Comparable<T>> T max(T a, T b) {
- int n = a.compareTo(b);
- if (n >= 0)
- return a;
- return b;
- }
-
@Override
public String toString() {
return name;
}
+
+ void updateVersion(Version version) {
+ this.version = ComponentDef.max(this.version, version);
+ }
+
}