krysalis-version/src/java/org/krysalis/version/impl/apache ApacheVersionMarker.java,1.3,1.4 ApacheVersionFormat.java,1.4,1.5 ApacheVersion.java,1.4,1.5

Update of /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24759/src/java/org/krysalis/version/impl/apache

Modified Files:
	ApacheVersionMarker.java ApacheVersionFormat.java 
	ApacheVersion.java 
Log Message:
Change back to JDK 1.4,  and I was having such fun :-(

Index: ApacheVersionMarker.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache/ApacheVersionMarker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ApacheVersionMarker.java	10 Nov 2004 07:56:57 -0000	1.3
--- ApacheVersionMarker.java	11 Nov 2004 07:11:38 -0000	1.4
***************
*** 37,43 ****
  	/** Extended Optional Settings... */
  	// :TODO: final on these two?
! 	private final Map<String, Object> m_attributes = new HashMap<String, Object>();
  
! 	private final List<Object> m_annotations = new ArrayList<Object>();
  
  	/**
--- 37,43 ----
  	/** Extended Optional Settings... */
  	// :TODO: final on these two?
! 	private final Map m_attributes = new HashMap();
  
! 	private final List m_annotations = new ArrayList();
  
  	/**
***************
*** 72,76 ****
  	 */
  	public ApacheVersionMarker(VersionIdentifier id, ApacheVersion version,
! 			Map<String, Object> properties) {
  		m_identifier = id;
  		m_version = version;
--- 72,76 ----
  	 */
  	public ApacheVersionMarker(VersionIdentifier id, ApacheVersion version,
! 			Map properties) {
  		m_identifier = id;
  		m_version = version;

Index: ApacheVersionFormat.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache/ApacheVersionFormat.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ApacheVersionFormat.java	10 Nov 2004 07:56:58 -0000	1.4
--- ApacheVersionFormat.java	11 Nov 2004 07:11:38 -0000	1.5
***************
*** 317,323 ****
  	 * @see org.apache.depot.version.specification.formatting.VersionFormat#parseVersion(java.lang.String)
  	 */
! 	public ApacheVersion parseVersion(String version)
  			throws VersionFormatException {
  
  		try {
  			ApacheVersionFormat avf = new ApacheVersionFormat();
--- 317,332 ----
  	 * @see org.apache.depot.version.specification.formatting.VersionFormat#parseVersion(java.lang.String)
  	 */
! 	public Version parseVersion(String version)
  			throws VersionFormatException {
  
+ 		return parseApacheVersion(version);
+ 	}
+ 
+ 	/**
+ 	 * @param version
+ 	 * @return
+ 	 * @throws VersionFormatException
+ 	 */
+ 	protected ApacheVersion parseApacheVersion(String version) throws VersionFormatException {
  		try {
  			ApacheVersionFormat avf = new ApacheVersionFormat();

Index: ApacheVersion.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache/ApacheVersion.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ApacheVersion.java	10 Nov 2004 06:27:14 -0000	1.4
--- ApacheVersion.java	11 Nov 2004 07:11:38 -0000	1.5
***************
*** 94,98 ****
  	 */
  	public ApacheVersion(String data) throws VersionException {
! 		this(APACHE_VERSION_FORMAT.parseVersion(data));
  	}
  
--- 94,98 ----
  	 */
  	public ApacheVersion(String data) throws VersionException {
! 		this(APACHE_VERSION_FORMAT.parseApacheVersion(data));
  	}
  



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click