krysalis-version/src/java/org/krysalis/version/constraint VersionIdentifierConstraint.java,1.3,1.4 VersionDataComparisonConstraint.java,1.5,1.6 VersionDataRangeConstraint.java,1.5,1.6 ConstraintSet.java,1.1,1.2

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

Modified Files:
	VersionIdentifierConstraint.java 
	VersionDataComparisonConstraint.java 
	VersionDataRangeConstraint.java ConstraintSet.java 
Log Message:
Try removing directories I thought I'd already removed.
Constraints from text file.

Index: VersionIdentifierConstraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/VersionIdentifierConstraint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionIdentifierConstraint.java	4 Feb 2003 06:37:16 -0000	1.3
--- VersionIdentifierConstraint.java	16 Feb 2003 00:08:11 -0000	1.4
***************
*** 60,63 ****
--- 60,64 ----
  import org.krysalis.version.resolve.VersionMetadata;
  import org.krysalis.version.resolve.VersionResolver;
+ import org.krysalis.version.util.DebugUtils;
  
  /**
***************
*** 104,106 ****
--- 105,110 ----
      }
  
+     public String toString() {
+         return DebugUtils.getShortName(getClass()) + ": Id=" + m_identifier;
+     }
  }

Index: VersionDataComparisonConstraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/VersionDataComparisonConstraint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VersionDataComparisonConstraint.java	6 Feb 2003 22:08:22 -0000	1.5
--- VersionDataComparisonConstraint.java	16 Feb 2003 00:08:11 -0000	1.6
***************
*** 101,103 ****
--- 101,107 ----
          return conclusion;
      }
+ 
+     public String toString() {
+         return super.toString() + ":" + m_comparison;
+     }
  }

Index: VersionDataRangeConstraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/VersionDataRangeConstraint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VersionDataRangeConstraint.java	6 Feb 2003 22:08:17 -0000	1.5
--- VersionDataRangeConstraint.java	16 Feb 2003 00:08:11 -0000	1.6
***************
*** 101,103 ****
--- 101,106 ----
          return conclusion;
      }
+     public String toString() {
+         return super.toString() + ":" + m_range;
+     }
  }

Index: ConstraintSet.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/ConstraintSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstraintSet.java	4 Feb 2003 22:03:00 -0000	1.1
--- ConstraintSet.java	16 Feb 2003 00:08:11 -0000	1.2
***************
*** 56,61 ****
--- 56,64 ----
  package org.krysalis.version.constraint;
  
+ import java.io.PrintStream;
+ import java.io.PrintWriter;
  import java.util.ArrayList;
  import java.util.Collection;
+ import java.util.Iterator;
  
  /**
***************
*** 87,89 ****
--- 90,120 ----
      }
  
+     public boolean hasEntries() {
+         return !isEmpty();
+     }
+ 
+     public void dump(PrintStream out) {
+         dump(out, 0);
+     }
+ 
+     public void dump(PrintStream out, int depth) {
+         dump(new PrintWriter(out, true), depth);
+     }
+ 
+     public void dump(PrintWriter out) {
+         dump(out, 0);
+     }
+ 
+     public void dump(PrintWriter out, int depth) {
+         out.println("Constraint Set");
+         if (hasEntries()) {
+             out.println("(");
+             for (Iterator i = iterator(); i.hasNext();) {
+                 Object entry = (Object) i.next();
+                 //out.println(DebugUtils.getShortName(entry.getClass())+"\t" + entry.toString());
+                 out.println("\t" + entry.toString());
+             }
+             out.println(")");
+         }
+     }
  }




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