GitHub/cyberduck
1
0
Fork 0
mirror of https://github.com/iterate-ch/cyberduck.git synced 2026-05-26 19:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
David Kocher
2005-08-10 15:36:10 +00:00
parent 36fd30203e
commit bc37ee244c
4 changed files with 151 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ext/junit.jar
BIN
View File
Binary file not shown.
source/ch/cyberduck/core/Version.java
+107
View File
@@ -0,0 +1,107 @@
package ch.cyberduck.core;
/*
* Copyright (c) 2005 David Kocher. All rights reserved.
* http://cyberduck.ch/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Bug fixes, suggestions and comments should be sent to:
* dkocher@cyberduck.ch
*/
/**
* @version $Id$
*/
public class Version implements Comparable {
private int major = 0;
private int minor = 0;
private int revision = 0;
private String suffix = "";
public Version(String version_string) {
this.parse(version_string);
}
/**
* parses major string in the form major[.minor[.subrevision[extension]]]
* into this instance.
*/
private void parse(String version_string) {
major = 0;
minor = 0;
revision = 0;
suffix = "";
int pos = 0;
int startpos = 0;
int endpos = version_string.length();
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
major = Integer.parseInt(version_string.substring(startpos,pos));
if ((pos < endpos) && version_string.charAt(pos)=='.') {
startpos = ++pos;
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
minor = Integer.parseInt(version_string.substring(startpos,pos));
}
if ((pos < endpos) && version_string.charAt(pos)=='.') {
startpos = ++pos;
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
revision = Integer.parseInt(version_string.substring(startpos,pos));
}
if (pos < endpos) {
suffix = version_string.substring(pos);
}
}
/**
* @return string representation of this major
*/
public String toString() {
StringBuffer sb = new StringBuffer(10);
sb.append(major);
sb.append('.');
sb.append(minor);
sb.append('.');
sb.append(revision);
sb.append(suffix);
return sb.toString();
}
/**
* Compares with other major. Does not take extension into account,
* as there is no reliable way to order them.
* @return <0 if this is older major that other,
* 0 if its same major,
* >0 if it's newer major than other
*/
public int compareTo(Object o) {
if (null == o)
throw new NullPointerException();
if(o instanceof Version) {
Version other = (Version)o;
if (this.major < other.major) return -1;
if (this.major > other.major) return 1;
if (this.minor < other.minor) return -1;
if (this.minor > other.minor) return 1;
if (this.revision < other.revision) return -1;
if (this.revision > other.revision) return 1;
if(null == this.suffix) return 1;
if(null == other.suffix) return -1;
return this.suffix.compareToIgnoreCase(other.suffix);
}
throw new IllegalArgumentException();
}
}
source/ch/cyberduck/ui/cocoa/CDMainController.java
+1 -87
View File
@@ -26,10 +26,7 @@ import java.util.*;
import org.apache.log4j.BasicConfigurator;
import ch.cyberduck.core.Host;
import ch.cyberduck.core.Message;
import ch.cyberduck.core.Preferences;
import ch.cyberduck.core.Rendezvous;
import ch.cyberduck.core.*;
import ch.cyberduck.ui.cocoa.growl.Growl;
/**
@@ -823,87 +820,4 @@ public class CDMainController extends CDController {
public boolean applicationShouldTerminateAfterLastWindowClosed(NSApplication app) {
return false;
}
private class Version implements Comparable {
private int major = 0;
private int minor = 0;
private int revision = 0;
private String suffix = "";
public Version(String version_string) {
this.parse(version_string);
}
/**
* parses major string in the form major[.minor[.subrevision[extension]]]
* into this instance.
*/
private void parse(String version_string) {
major = 0;
minor = 0;
revision = 0;
suffix = "";
int pos = 0;
int startpos = 0;
int endpos = version_string.length();
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
major = Integer.parseInt(version_string.substring(startpos,pos));
if ((pos < endpos) && version_string.charAt(pos)=='.') {
startpos = ++pos;
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
minor = Integer.parseInt(version_string.substring(startpos,pos));
}
if ((pos < endpos) && version_string.charAt(pos)=='.') {
startpos = ++pos;
while ( (pos < endpos) && Character.isDigit(version_string.charAt(pos))) {
pos++;
}
revision = Integer.parseInt(version_string.substring(startpos,pos));
}
if (pos < endpos) {
suffix = version_string.substring(pos);
}
}
/**
* @return string representation of this major
*/
public String toString() {
StringBuffer sb = new StringBuffer(10);
sb.append(major);
sb.append('.');
sb.append(minor);
sb.append('.');
sb.append(revision);
sb.append(suffix);
return sb.toString();
}
/**
* Compares with other major. Does not take extension into account,
* as there is no reliable way to order them.
* @return -1 if this is older major that other,
* 0 if its same major,
* 1 if it's newer major than other
*/
public int compareTo(Object o) {
if (null == o)
throw new NullPointerException();
if(o instanceof Version) {
Version other = (Version)o;
if (this.major < other.major) return -1;
if (this.major > other.major) return 1;
if (this.minor < other.minor) return -1;
if (this.minor > other.minor) return 1;
if (this.revision < other.revision) return -1;
if (this.revision > other.revision) return 1;
return 0;
}
throw new IllegalArgumentException();
}
}
}
test/ch/cyberduck/core/VersionTest.java
+43
View File
@@ -0,0 +1,43 @@
package ch.cyberduck.core;
/*
* Copyright (c) 2005 David Kocher. All rights reserved.
* http://cyberduck.ch/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Bug fixes, suggestions and comments should be sent to:
* dkocher@cyberduck.ch
*/
import junit.framework.TestCase;
import java.net.MalformedURLException;
/**
* @version $Id$
*/
public class VersionTest extends TestCase {
public VersionTest(String name) {
super(name);
}
public void testVersion() {
assertTrue(new Version("2.5").compareTo(new Version("2.4")) > 0);
assertTrue(new Version("2.3").compareTo(new Version("2.4")) < 0);
assertTrue(new Version("2.4.5").compareTo(new Version("2.4.6")) < 0);
assertTrue(new Version("2.4.7").compareTo(new Version("2.4.6")) > 0);
assertTrue(new Version("2.5b1").compareTo(new Version("2.5b2")) < 0);
assertTrue(new Version("2.5b3").compareTo(new Version("2.5b2")) > 0);
assertTrue(new Version("2.5").compareTo(new Version("2.5b2")) > 0);
}
}