dorkbox/Version
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor previous commit; remove duplications

Browse Source
This commit is contained in:
Zafar Khaja 2012-11-27 22:00:08 +04:00
parent e0bca455ae
commit 7b4e653723
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/github/zafarkhaja/semver/Version.java
View File

@ -173,40 +173,31 @@ public class Version implements Comparable<Version> {
}
private int comparePreReleaseVersions(Version other) {
int result;
if (preReleaseVersion == null &&
other.getPreReleaseVersion() == null) {
result = 0;
} else if (preReleaseVersion == null ||
other.getPreReleaseVersion() == null) {
result = preReleaseVersion == null ? 1 : -1;
if (preReleaseVersion == null ^ other.getPreReleaseVersion() == null) {
return preReleaseVersion == null ? 1 : -1;
} else {
result = compareAlphaNumericVersions(
return compareAlphaNumericVersions(
preReleaseVersion,
other.getPreReleaseVersion()
);
}
return result;
}
private int compareBuildVersions(Version other) {
int result;
if (buildVersion == null &&
other.getBuildVersion()== null) {
result = 0;
} else if (buildVersion == null ||
other.getBuildVersion()== null) {
result = buildVersion == null ? -1 : 1;
if (buildVersion == null ^ other.getBuildVersion() == null) {
return buildVersion == null ? -1 : 1;
} else {
result = compareAlphaNumericVersions(
return compareAlphaNumericVersions(
buildVersion,
other.getBuildVersion()
);
}
return result;
}
private int compareAlphaNumericVersions(String thisOp, String otherOp) {
if (thisOp == null && otherOp == null) {
return 0;
}
String[] thisIdents = thisOp.split("\\.");
String[] otherIdents = otherOp.split("\\.");