You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ju...@apache.org on 2002/03/03 21:31:51 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff AddDelta.java ChangeDelta.java Chunk.java DeleteDelta.java Delta.java Range.java
juanco 02/03/03 12:31:51
Modified: src/java/org/apache/maven/jrcs/diff AddDelta.java
ChangeDelta.java Chunk.java DeleteDelta.java
Delta.java
Removed: src/java/org/apache/maven/jrcs/diff Range.java
Log:
refactored class Range into extintion because it was acting only as a dumb proxy into information contained in Chunk
Revision Changes Path
1.6 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/AddDelta.java
Index: AddDelta.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/AddDelta.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddDelta.java 3 Mar 2002 19:59:44 -0000 1.5
+++ AddDelta.java 3 Mar 2002 20:31:51 -0000 1.6
@@ -58,7 +58,7 @@
/**
* Holds an add-delta between to revisions of a text.
*
- * @version $Id: AddDelta.java,v 1.5 2002/03/03 19:59:44 juanco Exp $
+ * @version $Id: AddDelta.java,v 1.6 2002/03/03 20:31:51 juanco Exp $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Delta
* @see Diff
@@ -94,7 +94,7 @@
{
s.append(original.anchor());
s.append("a");
- s.append(revised.range());
+ s.append(revised.rangeString());
s.append(Diff.NL);
revised.toString(s, "> ", Diff.NL);
}
@@ -104,7 +104,7 @@
s.append("a");
s.append(original.anchor());
s.append(" ");
- s.append(revised.range().length());
+ s.append(revised.size());
s.append(EOL);
revised.toString(s, "", EOL);
}
1.6 +7 -7 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/ChangeDelta.java
Index: ChangeDelta.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/ChangeDelta.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeDelta.java 3 Mar 2002 19:59:44 -0000 1.5
+++ ChangeDelta.java 3 Mar 2002 20:31:51 -0000 1.6
@@ -59,7 +59,7 @@
/**
* Holds an change-delta between to revisions of a text.
*
- * @version $Id: ChangeDelta.java,v 1.5 2002/03/03 19:59:44 juanco Exp $
+ * @version $Id: ChangeDelta.java,v 1.6 2002/03/03 20:31:51 juanco Exp $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Delta
* @see Diff
@@ -98,9 +98,9 @@
public void toString(StringBuffer s)
{
- original.range().toString(s);
+ original.rangeString(s);
s.append("c");
- revised.range().toString(s);
+ revised.rangeString(s);
s.append(Diff.NL);
original.toString(s, "< ", "\n");
s.append("---");
@@ -111,14 +111,14 @@
public void toRCSString(StringBuffer s, String EOL)
{
s.append("d");
- s.append(original.extfrom());
+ s.append(original.rcsfrom());
s.append(" ");
- s.append(original.range().length());
+ s.append(original.size());
s.append(EOL);
s.append("a");
- s.append(original.extfrom());
+ s.append(original.rcsfrom());
s.append(" ");
- s.append(revised.range().length());
+ s.append(revised.size());
s.append(EOL);
revised.toString(s, "", EOL);
}
1.6 +50 -15 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/Chunk.java
Index: Chunk.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/Chunk.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Chunk.java 3 Mar 2002 19:59:44 -0000 1.5
+++ Chunk.java 3 Mar 2002 20:31:51 -0000 1.6
@@ -64,7 +64,7 @@
* Holds a information about a parrt of the text involved in
* a differencing or patching operation.
*
- * @version $Id: Chunk.java,v 1.5 2002/03/03 19:59:44 juanco Exp $
+ * @version $Id: Chunk.java,v 1.6 2002/03/03 20:31:51 juanco Exp $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Diff
* @see Delta
@@ -177,32 +177,22 @@
}
/**
- * Returns the <i>from</i> index of the chunk in delta terms.
+ * Returns the <i>from</i> index of the chunk in RCS terms.
*/
- public int extfrom()
+ public int rcsfrom()
{
return anchor + 1;
}
/**
- * Returns the <i>to</i> index of the chunk in delta terms.
+ * Returns the <i>to</i> index of the chunk in RCS terms.
*/
- public int extto()
+ public int rcsto()
{
return anchor + count;
}
/**
- * Returns a {@link Range Range} object that describes the
- * scope covered by this chunk.
- */
- public Range range()
- {
- return new Range(first(), last());
- }
-
-
- /**
* Returns the text saved for this chunk.
* @return the text.
*/
@@ -263,6 +253,10 @@
}
}
+ /**
+ * Provide a string image of the chunk using the an empty prefix and
+ * postfix.
+ */
public void toString(StringBuffer s)
{
toString(s, "", "");
@@ -321,5 +315,46 @@
{
return slice(Arrays.asList(seq), pos, count);
}
+
+
+ /**
+ * Provide a string representation of the numeric range of this chunk.
+ */
+ public String rangeString()
+ {
+ StringBuffer result = new StringBuffer();
+ rangeString(result);
+ return result.toString();
+ }
+
+ /**
+ * Provide a string representation of the numeric range of this chunk.
+ * @param s where the string representation should be appended.
+ */
+ public void rangeString(StringBuffer s)
+ {
+ rangeString(s, ",");
+ }
+
+ /**
+ * Provide a string representation of the numeric range of this chunk.
+ * @param s where the string representation should be appended.
+ * @param separ what to use as line separator.
+ */
+ public void rangeString(StringBuffer s, String separ)
+ {
+ if (size() <= 1)
+ {
+ s.append(Integer.toString(rcsfrom()));
+ }
+ else
+ {
+ s.append(Integer.toString(rcsfrom()));
+ s.append(separ);
+ s.append(Integer.toString(rcsto()));
+ }
+ }
+
+
}
1.6 +5 -5 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/DeleteDelta.java
Index: DeleteDelta.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/DeleteDelta.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeleteDelta.java 3 Mar 2002 19:59:44 -0000 1.5
+++ DeleteDelta.java 3 Mar 2002 20:31:51 -0000 1.6
@@ -61,7 +61,7 @@
/**
* Holds a delete-delta between to revisions of a text.
*
- * @version $Id: DeleteDelta.java,v 1.5 2002/03/03 19:59:44 juanco Exp $
+ * @version $Id: DeleteDelta.java,v 1.6 2002/03/03 20:31:51 juanco Exp $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Delta
* @see Diff
@@ -95,9 +95,9 @@
public void toString(StringBuffer s)
{
- s.append(original.range());
+ s.append(original.rangeString());
s.append("d");
- s.append(revised.extto());
+ s.append(revised.rcsto());
s.append(Diff.NL);
original.toString(s, "< ", Diff.NL);
}
@@ -105,9 +105,9 @@
public void toRCSString(StringBuffer s, String EOL)
{
s.append("d");
- s.append(original.extfrom());
+ s.append(original.rcsfrom());
s.append(" ");
- s.append(original.range().length());
+ s.append(original.size());
s.append(EOL);
}
}
1.6 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/Delta.java
Index: Delta.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/diff/Delta.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Delta.java 3 Mar 2002 19:59:44 -0000 1.5
+++ Delta.java 3 Mar 2002 20:31:51 -0000 1.6
@@ -59,7 +59,7 @@
/**
* Holds a "delta" difference between to revisions of a text.
*
- * @version $Id: Delta.java,v 1.5 2002/03/03 19:59:44 juanco Exp $
+ * @version $Id: Delta.java,v 1.6 2002/03/03 20:31:51 juanco Exp $
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
* @see Diff
* @see Chunk
@@ -187,9 +187,9 @@
*/
public void toString(StringBuffer s)
{
- original.range().toString(s);
+ original.rangeString(s);
s.append("x");
- revised.range().toString(s);
+ revised.rangeString(s);
s.append(Diff.NL);
original.toString(s, "> ", "\n");
s.append("---");
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>