krysalis-version/src/java/org/krysalis/version/ant/constraint ConstraintEvaluatorTask.java,1.7,1.8 ConstraintClassGenerator.java,1.4,1.5 ConstraintGeneratorTask.java,1.9,1.10 ConstraintInformationSet.java,1.3,1.4

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

Modified Files:
	ConstraintEvaluatorTask.java ConstraintClassGenerator.java 
	ConstraintGeneratorTask.java ConstraintInformationSet.java 
Log Message:
Docs

Index: ConstraintEvaluatorTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/ConstraintEvaluatorTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ConstraintEvaluatorTask.java	11 Feb 2003 23:45:42 -0000	1.7
--- ConstraintEvaluatorTask.java	17 Feb 2003 06:27:26 -0000	1.8
***************
*** 61,65 ****
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.Project;
! import org.krysalis.version.ant.VersionIdentifierTask;
  import org.krysalis.version.constraint.Constraint;
  import org.krysalis.version.constraint.ConstraintConclusion;
--- 61,65 ----
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.Project;
! import org.krysalis.version.ant.AntTask;
  import org.krysalis.version.constraint.Constraint;
  import org.krysalis.version.constraint.ConstraintConclusion;
***************
*** 69,73 ****
   * @author [email protected]
   */
! public class ConstraintEvaluatorTask extends VersionIdentifierTask {
      private ArrayList m_information = null;
  
--- 69,73 ----
   * @author [email protected]
   */
! public class ConstraintEvaluatorTask extends AntTask {
      private ArrayList m_information = null;
  
***************
*** 116,121 ****
      }
  
!     public ConstraintInformationSet createConstraintGroup() {
!         ConstraintInformationSet info = new ConstraintInformationSet();
          m_information.add(info);
          return info;
--- 116,121 ----
      }
  
!     public ConstraintInformationSet createConstraintSet() {
!         ConstraintInformationSet info = new ConstraintInformationSet(this);
          m_information.add(info);
          return info;

Index: ConstraintClassGenerator.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/ConstraintClassGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConstraintClassGenerator.java	11 Feb 2003 23:45:39 -0000	1.4
--- ConstraintClassGenerator.java	17 Feb 2003 06:27:26 -0000	1.5
***************
*** 139,142 ****
--- 139,145 ----
          out.indent();
  
+         int constraintCount = 0;
+         int constraintSetCount = 0;
+ 
          for (Iterator i = m_constraintInfoSets.iterator(); i.hasNext();) {
              ConstraintInformationSet infoSet =
***************
*** 145,148 ****
--- 148,153 ----
              ArrayList constraints = infoSet.getConstraints();
  
+             out.println("// :TODO: ConstraintSet: Severity : " + infoSet.getSeverity());
+ 
              for (Iterator ii = constraints.iterator(); ii.hasNext();) {
                  Constraint constraint = (Constraint) ii.next();
***************
*** 150,156 ****
                  out.println(" // :TODO: Constraint: " + constraint);
  
              }
          }
! 
          out.undent();
          out.println("}");
--- 155,166 ----
                  out.println(" // :TODO: Constraint: " + constraint);
  
+                 constraintCount++;
              }
+             constraintSetCount++;
          }
!         
!             out.println(" // ConstraintSets: " + constraintSetCount);
!             out.println(" // Constraints: " + constraintCount);
!         
          out.undent();
          out.println("}");

Index: ConstraintGeneratorTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/ConstraintGeneratorTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConstraintGeneratorTask.java	11 Feb 2003 23:45:40 -0000	1.9
--- ConstraintGeneratorTask.java	17 Feb 2003 06:27:26 -0000	1.10
***************
*** 91,94 ****
--- 91,97 ----
  
              validate(generator);
+             
+             generator.createClass();
+             
              log(
                  "Created class " + generator.getFullClassName(),
***************
*** 104,109 ****
      }
  
!     public ConstraintInformationSet createConstraintGroup() {
!         ConstraintInformationSet info = new ConstraintInformationSet();
          m_information.add(info);
          return info;
--- 107,112 ----
      }
  
!     public ConstraintInformationSet createConstraintSet() {
!         ConstraintInformationSet info = new ConstraintInformationSet(this);
          m_information.add(info);
          return info;

Index: ConstraintInformationSet.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/ConstraintInformationSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConstraintInformationSet.java	11 Feb 2003 23:45:40 -0000	1.3
--- ConstraintInformationSet.java	17 Feb 2003 06:27:26 -0000	1.4
***************
*** 56,62 ****
--- 56,70 ----
  package org.krysalis.version.ant.constraint;
  
+ import java.io.StringReader;
  import java.util.ArrayList;
  import java.util.Iterator;
+ import java.util.StringTokenizer;
  
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+ import org.krysalis.version.ant.nested.NestedElement;
+ import org.krysalis.version.constraint.Constraint;
+ import org.krysalis.version.constraint.ConstraintSet;
+ import org.krysalis.version.constraint.loading.loaders.ConstraintTextLoader;
  import org.krysalis.version.internal.data.util.VersionDataComparison;
  
***************
*** 64,68 ****
   * @author [email protected]
   */
! public class ConstraintInformationSet {
      private String m_severity = null;
      private ArrayList m_constraintInfos = null;
--- 72,76 ----
   * @author [email protected]
   */
! public class ConstraintInformationSet extends NestedElement {
      private String m_severity = null;
      private ArrayList m_constraintInfos = null;
***************
*** 71,75 ****
       * Constructor for ConstraintInformationSet.
       */
!     public ConstraintInformationSet() {
          m_constraintInfos = new ArrayList();
      }
--- 79,85 ----
       * Constructor for ConstraintInformationSet.
       */
!     public ConstraintInformationSet(Task task) {
!         super(task);
!         
          m_constraintInfos = new ArrayList();
      }
***************
*** 160,164 ****
      }
  
- 
      public VersionExistenceConstraintInformation createExists() {
          VersionExistenceConstraintInformation constraint =
--- 170,173 ----
***************
*** 169,173 ****
          return constraint;
      }
!     
      /**
       * Returns the constraints.
--- 178,192 ----
          return constraint;
      }
! 
!     public void addText(String text) throws Exception {
!         StringTokenizer tokens = new StringTokenizer(text, "\t\n ");
! 
!         if (tokens.countTokens() > 0) {
!             ConstraintTextLoader loader = new ConstraintTextLoader();
!             ConstraintSet set = loader.load(new StringReader(text));
!             m_constraintInfos.addAll(set);
!         }
!     }
! 
      /**
       * Returns the constraints.
***************
*** 178,184 ****
  
          for (Iterator i = m_constraintInfos.iterator(); i.hasNext();) {
!             ConstraintInformation info = (ConstraintInformation) i.next();
  
!             constraints.add(info.getConstraint());
          }
  
--- 197,216 ----
  
          for (Iterator i = m_constraintInfos.iterator(); i.hasNext();) {
!             Object info = i.next();
  
!             if (info instanceof Constraint) {
!                 constraints.add((Constraint) info);
!             }
!             else if (info instanceof ConstraintInformation) {
!                 ConstraintInformation cinfo = (ConstraintInformation) info;
!                 constraints.add(cinfo.getConstraint());
!             }
!             else
!                 throw new BuildException(
!                     "Unknown contents in contratints : "
!                         + info.getClass().getName()
!                         + " : "
!                         + info,
!                     getLocation());
          }
  




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf