Latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1350613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/version/Version.java b/bundleplugin/src/main/java/aQute/libg/version/Version.java
index d326ec4..77d21e4 100755
--- a/bundleplugin/src/main/java/aQute/libg/version/Version.java
+++ b/bundleplugin/src/main/java/aQute/libg/version/Version.java
@@ -3,150 +3,148 @@
import java.util.regex.*;
public class Version implements Comparable<Version> {
- final int major;
- final int minor;
- final int micro;
- final String qualifier;
- public final static String VERSION_STRING = "(\\d+)(\\.(\\d+)(\\.(\\d+)(\\.([-_\\da-zA-Z]+))?)?)?";
- public final static Pattern VERSION = Pattern
- .compile(VERSION_STRING);
- public final static Version LOWEST = new Version();
- public final static Version HIGHEST = new Version(Integer.MAX_VALUE,
- Integer.MAX_VALUE,
- Integer.MAX_VALUE,
- "\uFFFF");
+ final int major;
+ final int minor;
+ final int micro;
+ final String qualifier;
+ public final static String VERSION_STRING = "(\\d+)(\\.(\\d+)(\\.(\\d+)(\\.([-_\\da-zA-Z]+))?)?)?";
+ public final static Pattern VERSION = Pattern.compile(VERSION_STRING);
+ public final static Version LOWEST = new Version();
+ public final static Version HIGHEST = new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE,
+ "\uFFFF");
- public static final Version emptyVersion = LOWEST;
- public static final Version ONE = new Version(1,0,0);
+ public static final Version emptyVersion = LOWEST;
+ public static final Version ONE = new Version(1, 0, 0);
- public Version() {
- this(0);
- }
+ public Version() {
+ this(0);
+ }
- public Version(int major, int minor, int micro, String qualifier) {
- this.major = major;
- this.minor = minor;
- this.micro = micro;
- this.qualifier = qualifier;
- }
+ public Version(int major, int minor, int micro, String qualifier) {
+ this.major = major;
+ this.minor = minor;
+ this.micro = micro;
+ this.qualifier = qualifier;
+ }
- public Version(int major, int minor, int micro) {
- this(major, minor, micro, null);
- }
+ public Version(int major, int minor, int micro) {
+ this(major, minor, micro, null);
+ }
- public Version(int major, int minor) {
- this(major, minor, 0, null);
- }
+ public Version(int major, int minor) {
+ this(major, minor, 0, null);
+ }
- public Version(int major) {
- this(major, 0, 0, null);
- }
+ public Version(int major) {
+ this(major, 0, 0, null);
+ }
- public Version(String version) {
- version = version.trim();
- Matcher m = VERSION.matcher(version);
- if (!m.matches())
- throw new IllegalArgumentException("Invalid syntax for version: "
- + version);
+ public Version(String version) {
+ version = version.trim();
+ Matcher m = VERSION.matcher(version);
+ if (!m.matches())
+ throw new IllegalArgumentException("Invalid syntax for version: " + version);
- major = Integer.parseInt(m.group(1));
- if (m.group(3) != null)
- minor = Integer.parseInt(m.group(3));
- else
- minor = 0;
+ major = Integer.parseInt(m.group(1));
+ if (m.group(3) != null)
+ minor = Integer.parseInt(m.group(3));
+ else
+ minor = 0;
- if (m.group(5) != null)
- micro = Integer.parseInt(m.group(5));
- else
- micro = 0;
+ if (m.group(5) != null)
+ micro = Integer.parseInt(m.group(5));
+ else
+ micro = 0;
- qualifier = m.group(7);
- }
+ qualifier = m.group(7);
+ }
- public int getMajor() {
- return major;
- }
+ public int getMajor() {
+ return major;
+ }
- public int getMinor() {
- return minor;
- }
+ public int getMinor() {
+ return minor;
+ }
- public int getMicro() {
- return micro;
- }
+ public int getMicro() {
+ return micro;
+ }
- public String getQualifier() {
- return qualifier;
- }
+ public String getQualifier() {
+ return qualifier;
+ }
- public int compareTo(Version other) {
- if (other == this)
- return 0;
+ public int compareTo(Version other) {
+ if (other == this)
+ return 0;
- Version o = other;
- if (major != o.major)
- return major - o.major;
+ Version o = other;
+ if (major != o.major)
+ return major - o.major;
- if (minor != o.minor)
- return minor - o.minor;
+ if (minor != o.minor)
+ return minor - o.minor;
- if (micro != o.micro)
- return micro - o.micro;
+ if (micro != o.micro)
+ return micro - o.micro;
- int c = 0;
- if (qualifier != null)
- c = 1;
- if (o.qualifier != null)
- c += 2;
+ int c = 0;
+ if (qualifier != null)
+ c = 1;
+ if (o.qualifier != null)
+ c += 2;
- switch (c) {
- case 0:
- return 0;
- case 1:
- return 1;
- case 2:
- return -1;
- }
- return qualifier.compareTo(o.qualifier);
- }
+ switch (c) {
+ case 0 :
+ return 0;
+ case 1 :
+ return 1;
+ case 2 :
+ return -1;
+ }
+ return qualifier.compareTo(o.qualifier);
+ }
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(major);
- sb.append(".");
- sb.append(minor);
- sb.append(".");
- sb.append(micro);
- if (qualifier != null) {
- sb.append(".");
- sb.append(qualifier);
- }
- return sb.toString();
- }
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(major);
+ sb.append(".");
+ sb.append(minor);
+ sb.append(".");
+ sb.append(micro);
+ if (qualifier != null) {
+ sb.append(".");
+ sb.append(qualifier);
+ }
+ return sb.toString();
+ }
- public boolean equals(Object ot) {
- if ( ! (ot instanceof Version))
- return false;
-
- return compareTo((Version)ot) == 0;
- }
+ public boolean equals(Object ot) {
+ if (!(ot instanceof Version))
+ return false;
- public int hashCode() {
- return major * 97 ^ minor * 13 ^ micro
- + (qualifier == null ? 97 : qualifier.hashCode());
- }
+ return compareTo((Version) ot) == 0;
+ }
- public int get(int i) {
- switch(i) {
- case 0 : return major;
- case 1 : return minor;
- case 2 : return micro;
- default:
- throw new IllegalArgumentException("Version can only get 0 (major), 1 (minor), or 2 (micro)");
- }
- }
-
- public static Version parseVersion(String version) {
+ public int hashCode() {
+ return major * 97 ^ minor * 13 ^ micro + (qualifier == null ? 97 : qualifier.hashCode());
+ }
+
+ public int get(int i) {
+ switch (i) {
+ case 0 :
+ return major;
+ case 1 :
+ return minor;
+ case 2 :
+ return micro;
+ default :
+ throw new IllegalArgumentException("Version can only get 0 (major), 1 (minor), or 2 (micro)");
+ }
+ }
+
+ public static Version parseVersion(String version) {
if (version == null) {
return LOWEST;
}
@@ -158,9 +156,9 @@
return new Version(version);
- }
-
- public Version getWithoutQualifier() {
- return new Version(major,minor,micro);
- }
+ }
+
+ public Version getWithoutQualifier() {
+ return new Version(major, minor, micro);
+ }
}
diff --git a/bundleplugin/src/main/java/aQute/libg/version/VersionRange.java b/bundleplugin/src/main/java/aQute/libg/version/VersionRange.java
index 46f9e94..3e00c76 100755
--- a/bundleplugin/src/main/java/aQute/libg/version/VersionRange.java
+++ b/bundleplugin/src/main/java/aQute/libg/version/VersionRange.java
@@ -9,9 +9,8 @@
char start = '[';
char end = ']';
- static Pattern RANGE = Pattern.compile("(\\(|\\[)\\s*(" +
- Version.VERSION_STRING + ")\\s*,\\s*(" +
- Version.VERSION_STRING + ")\\s*(\\)|\\])");
+ static Pattern RANGE = Pattern.compile("(\\(|\\[)\\s*(" + Version.VERSION_STRING + ")\\s*,\\s*("
+ + Version.VERSION_STRING + ")\\s*(\\)|\\])");
public VersionRange(String string) {
string = string.trim();
@@ -24,9 +23,7 @@
high = new Version(v2);
end = m.group(18).charAt(0);
if (low.compareTo(high) > 0)
- throw new IllegalArgumentException(
- "Low Range is higher than High Range: " + low + "-" +
- high);
+ throw new IllegalArgumentException("Low Range is higher than High Range: " + low + "-" + high);
} else
high = low = new Version(string);
@@ -66,8 +63,8 @@
}
public boolean includes(Version v) {
- if ( !isRange() ) {
- return low.compareTo(v) <=0;
+ if (!isRange()) {
+ return low.compareTo(v) <= 0;
}
if (includeLow()) {
if (v.compareTo(low) < 0)
@@ -80,17 +77,17 @@
return false;
} else if (v.compareTo(high) >= 0)
return false;
-
+
return true;
}
-
- public Iterable<Version> filter( final Iterable<Version> versions) {
+
+ public Iterable<Version> filter(final Iterable<Version> versions) {
List<Version> list = new ArrayList<Version>();
- for ( Version v : versions) {
- if ( includes(v))
+ for (Version v : versions) {
+ if (includes(v))
list.add(v);
}
return list;
}
-
+
}
\ No newline at end of file