You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/12 09:32:57 UTC
cvs commit: avalon/framework/src/api/org/apache/avalon/framework Version.java
mcconnell 2003/07/12 00:32:57
Modified: framework/src/api/org/apache/avalon/framework Version.java
Log:
Add support for a -1 major version that matches any version.
Revision Changes Path
1.29 +14 -5 avalon/framework/src/api/org/apache/avalon/framework/Version.java
Index: Version.java
===================================================================
RCS file: /home/cvs/avalon/framework/src/api/org/apache/avalon/framework/Version.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Version.java 20 May 2003 19:46:31 -0000 1.28
+++ Version.java 12 Jul 2003 07:32:57 -0000 1.29
@@ -117,13 +117,18 @@
levels[ i ] = tokenizer.nextToken();
}
- if( 0 == levels.length || 3 < levels.length )
+ //if( 0 == levels.length || 3 < levels.length )
+ //{
+ // throw new IllegalArgumentException( "Malformed version string '" + version + "'." );
+ //}
+ //final int major = Integer.parseInt( levels[ 0 ] );
+
+ int major = -1;
+ if( 0 < levels.length )
{
- throw new IllegalArgumentException( "Malformed version string " + version );
+ major = Integer.parseInt( levels[ 0 ] );
}
- final int major = Integer.parseInt( levels[ 0 ] );
-
int minor = 0;
if( 1 < levels.length )
{
@@ -285,6 +290,10 @@
*/
public boolean complies( final Version other )
{
+ if( m_major == -1 )
+ {
+ return true;
+ }
if( m_major != other.m_major )
{
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org