krysalis-version/optional/src/java/org/krysalis/version/ant VersionIdentifierTask.java,1.1,1.2 VersionTask.java,1.1,1.2

Update of /cvsroot/metamorphosis/krysalis-version/optional/src/java/org/krysalis/version/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv22898/optional/src/java/org/krysalis/version/ant

Modified Files:
	VersionIdentifierTask.java VersionTask.java 
Log Message:
1) Wrote version-available & tested it, which helped me w/ some debugging..
2) Moved the jdk14 dependency out

Index: VersionIdentifierTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/optional/src/java/org/krysalis/version/ant/VersionIdentifierTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionIdentifierTask.java	9 Feb 2003 19:38:14 -0000	1.1
--- VersionIdentifierTask.java	10 Feb 2003 16:27:41 -0000	1.2
***************
*** 56,59 ****
--- 56,60 ----
  package org.krysalis.version.ant;
  
+ import org.apache.tools.ant.BuildException;
  
  /**
***************
*** 63,86 ****
  public abstract class VersionIdentifierTask extends AntTask {
  
! 	private String m_versionId = null;
  
! 	public VersionIdentifierTask() {
! 		super();
! 	}
  
! 	/**
! 	 * Returns the versionId.
! 	 * @return String
! 	 */
! 	public String getVersionId() {
! 		return m_versionId;
! 	}
  
! 	/**
! 	 * Sets the versionId.
! 	 * @param versionId The versionId to set
! 	 */
! 	public void setVersionId(String versionId) {
! 		m_versionId = versionId;
! 	}
  }
--- 64,103 ----
  public abstract class VersionIdentifierTask extends AntTask {
  
!     private String m_versionId = null;
  
!     public VersionIdentifierTask() {
!         super();
!     }
  
!     /**
!      * Returns the versionId.
!      * @return String
!      */
!     public String getVersionId() {
!         if (null == m_versionId)
!             throw new BuildException(
!                 "Missing manadtory setting 'versionId'",
!                 getLocation());
!         return m_versionId;
!     }
!     
!    /**
!         * Returns the versionId.
!          * @return String
!          */
!     public String getVersionIdIfSet() {
!         return m_versionId;
!     }
  
!     public boolean isVersionIdSet() {
!         return (null != m_versionId);
!     }
! 
!     /**
!      * Sets the versionId.
!      * @param versionId The versionId to set
!      */
!     public void setVersionId(String versionId) {
!         m_versionId = versionId;
!     }
  }

Index: VersionTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/optional/src/java/org/krysalis/version/ant/VersionTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionTask.java	9 Feb 2003 19:38:14 -0000	1.1
--- VersionTask.java	10 Feb 2003 16:27:41 -0000	1.2
***************
*** 70,83 ****
  public abstract class VersionTask extends VersionIdentifierTask {
  
! 	private VersionNestedElement m_versionBean = null;
  
! 	public VersionTask() {
! 		super();
! 	}
  
! 	public VersionNestedElement createVersion() {
! 		m_versionBean = new VersionNestedElement(this);
! 		return m_versionBean;
! 	}
  
      public Version getVersion() {
--- 70,87 ----
  public abstract class VersionTask extends VersionIdentifierTask {
  
!     private VersionNestedElement m_versionBean = null;
  
!     public VersionTask() {
!         super();
!     }
  
!     public VersionNestedElement createVersion() {
!         m_versionBean = new VersionNestedElement(this, getVersionIdIfSet());
!         return m_versionBean;
!     }
! 
!     public boolean isVersionSet() {
!         return (null != m_versionBean);
!     }
  
      public Version getVersion() {
***************
*** 97,100 ****
--- 101,122 ----
  
          return m_versionBean.getCompoundVersionObject();
+     }
+ 
+     protected void validate() {
+         //:TODO: make VersionBean Validate Itself...
+     }
+     
+     /**
+      * Sets the versionId.
+      * @param versionId The versionId to set
+      */
+     public void setVersionId(String versionId) {
+         super.setVersionId(versionId);
+         
+         if ((null != m_versionBean ) 
+             && !m_versionBean.isVersionIdSet())
+         {
+             m_versionBean.setVersionId(versionId);
+         }
      }
  }




-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com