Revision 718 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/impl/DefaultVersion.java
| DefaultVersion.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
public class DefaultVersion implements Version {
|
| 9 | 9 |
|
| 10 |
private int mayor = 0;
|
|
| 10 |
private int major = 0;
|
|
| 11 | 11 |
private int minor = 0; |
| 12 | 12 |
private int rev = 0; |
| 13 | 13 |
private String classifier = null; |
| ... | ... | |
| 20 | 20 |
protected DefaultVersion(int mayor, int minor, int rev, String classifier, |
| 21 | 21 |
int build) {
|
| 22 | 22 |
this(); |
| 23 |
this.mayor = mayor;
|
|
| 23 |
this.major = mayor;
|
|
| 24 | 24 |
this.minor = minor; |
| 25 | 25 |
this.rev = rev; |
| 26 | 26 |
this.classifier = classifier; |
| 27 | 27 |
this.build = build; |
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 |
public Version parse(String version) {
|
|
| 30 |
public org.gvsig.installer.lib.api.Version parse(String version) {
|
|
| 31 | 31 |
if( version == null || version.length()==0 ) {
|
| 32 |
this.mayor = 0;
|
|
| 32 |
this.major = 0;
|
|
| 33 | 33 |
this.minor = 0; |
| 34 | 34 |
this.rev = 0; |
| 35 | 35 |
this.classifier = null; |
| ... | ... | |
| 41 | 41 |
String[] x = version.split("[.]");
|
| 42 | 42 |
int lx = x.length; |
| 43 | 43 |
if (lx == 1) {
|
| 44 |
this.mayor = parseIntClassifierAndBuild(x[0], version);
|
|
| 44 |
this.major = parseIntClassifierAndBuild(x[0], version);
|
|
| 45 | 45 |
this.minor = 0; |
| 46 | 46 |
this.rev = 0; |
| 47 | 47 |
this.classifier = null; |
| 48 | 48 |
this.build = 0; |
| 49 | 49 |
} else if (lx == 2) {
|
| 50 |
this.mayor = Integer.parseInt(x[0]);
|
|
| 50 |
this.major = Integer.parseInt(x[0]);
|
|
| 51 | 51 |
this.minor = parseIntClassifierAndBuild(x[1], version); |
| 52 | 52 |
this.rev = 0; |
| 53 | 53 |
this.classifier = null; |
| 54 | 54 |
this.build = 0; |
| 55 | 55 |
} else if (lx == 3) {
|
| 56 |
this.mayor = Integer.parseInt(x[0]);
|
|
| 56 |
this.major = Integer.parseInt(x[0]);
|
|
| 57 | 57 |
this.minor = Integer.parseInt(x[1]); |
| 58 | 58 |
this.rev = parseIntClassifierAndBuild(x[2], version); |
| 59 | 59 |
} else {
|
| ... | ... | |
| 90 | 90 |
return value; |
| 91 | 91 |
} |
| 92 | 92 |
|
| 93 |
public int getMayor() {
|
|
| 94 |
return this.mayor;
|
|
| 93 |
public int getMajor() {
|
|
| 94 |
return this.major;
|
|
| 95 | 95 |
} |
| 96 |
|
|
| 96 | 97 |
|
| 98 |
public int getMayor() {
|
|
| 99 |
return getMajor(); |
|
| 100 |
} |
|
| 101 |
|
|
| 97 | 102 |
public int getMinor() {
|
| 98 | 103 |
return this.minor; |
| 99 | 104 |
} |
| ... | ... | |
| 110 | 115 |
return this.build; |
| 111 | 116 |
} |
| 112 | 117 |
|
| 113 |
public boolean check(String op, Version other) {
|
|
| 118 |
public boolean check(String op, org.gvsig.installer.lib.api.Version other) {
|
|
| 114 | 119 |
if ("=".equals(op) || "==".equals(op) || "-eq".equals(op)) {
|
| 115 | 120 |
return this.fullFormat().compareTo(other.fullFormat()) == 0; |
| 116 | 121 |
} |
| ... | ... | |
| 133 | 138 |
if (this.classifier == null) {
|
| 134 | 139 |
return MessageFormat.format("{0}.{1}.{2}-{3,number,####}",
|
| 135 | 140 |
new Object[] {
|
| 136 |
new Integer(this.mayor),
|
|
| 141 |
new Integer(this.major),
|
|
| 137 | 142 |
new Integer(this.minor), |
| 138 | 143 |
new Integer(this.rev), |
| 139 | 144 |
new Integer(this.build) |
| ... | ... | |
| 142 | 147 |
} else {
|
| 143 | 148 |
return MessageFormat.format("{0}.{1}.{2}-{3}-{4,number,####}",
|
| 144 | 149 |
new Object[] {
|
| 145 |
new Integer(this.mayor),
|
|
| 150 |
new Integer(this.major),
|
|
| 146 | 151 |
new Integer(this.minor), |
| 147 | 152 |
new Integer(this.rev), |
| 148 | 153 |
this.classifier, |
| ... | ... | |
| 158 | 163 |
return MessageFormat.format( |
| 159 | 164 |
"{0,number,0000}.{1,number,0000}.{2,number,0000}-AAAA-{3,number,0000}",
|
| 160 | 165 |
new Object[] {
|
| 161 |
new Integer(this.mayor),
|
|
| 166 |
new Integer(this.major),
|
|
| 162 | 167 |
new Integer(this.minor), |
| 163 | 168 |
new Integer(this.rev), |
| 164 | 169 |
new Integer(this.build) |
| ... | ... | |
| 168 | 173 |
return MessageFormat.format( |
| 169 | 174 |
"{0,number,0000}.{1,number,0000}.{2,number,0000}-{3}-{4,number,0000}",
|
| 170 | 175 |
new Object[] {
|
| 171 |
new Integer(this.mayor),
|
|
| 176 |
new Integer(this.major),
|
|
| 172 | 177 |
new Integer(this.minor), |
| 173 | 178 |
new Integer(this.rev), |
| 174 | 179 |
this.classifier, |
| ... | ... | |
| 184 | 189 |
|
| 185 | 190 |
public boolean equals(Object obj) {
|
| 186 | 191 |
Version other = (Version) obj; |
| 187 |
if (this.mayor != other.getMayor()) {
|
|
| 192 |
if (this.major != other.getMajor()) {
|
|
| 188 | 193 |
return false; |
| 189 | 194 |
} |
| 190 | 195 |
if (this.minor != other.getMinor()) {
|
| ... | ... | |
| 211 | 216 |
|
| 212 | 217 |
public int hashCode() {
|
| 213 | 218 |
return (classifier == null ? 0 : classifier.hashCode()) + |
| 214 |
(mayor<<13) + (minor<<19) + (rev<<25) + build;
|
|
| 219 |
(major<<13) + (minor<<19) + (rev<<25) + build;
|
|
| 215 | 220 |
} |
| 216 | 221 |
|
| 217 |
public Version setBuild(int build) {
|
|
| 222 |
public org.gvsig.installer.lib.api.Version setBuild(int build) {
|
|
| 218 | 223 |
this.build = build; |
| 219 | 224 |
return this; |
| 220 | 225 |
} |
Also available in: Unified diff