You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by sb...@apache.org on 2002/02/27 21:18:05 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs Line.java Lines.java Path.java Version.java
sbailliez 02/02/27 12:18:05
Modified: src/java/org/apache/maven/jrcs/rcs Line.java Lines.java
Path.java Version.java
Log:
More refactoring:
- Encapsulate fields
- remove _ coding style
Revision Changes Path
1.6 +18 -8 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Line.java
Index: Line.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Line.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Line.java 27 Feb 2002 16:49:48 -0000 1.5
+++ Line.java 27 Feb 2002 20:18:05 -0000 1.6
@@ -63,16 +63,16 @@
*
* @see Node
* @see Archive
- *
+ *
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
- * @version $Id: Line.java,v 1.5 2002/02/27 16:49:48 juanco Exp $
+ * @version $Id: Line.java,v 1.6 2002/02/27 20:18:05 sbailliez Exp $
*/
-class Line
+final class Line
{
- public Node revision;
- public final Object text;
+ private final Node revision;
+ private final Object text;
- public Line(Node revision, Object text)
+ Line(Node revision, Object text)
{
this.text = text;
this.revision = revision;
@@ -90,12 +90,22 @@
}
else
{
- return this.text.equals(((Line) other).text);
+ return this.getText().equals(((Line) other).getText());
}
}
public int hashCode()
{
- return text.hashCode();
+ return getText().hashCode();
+ }
+
+ final Node getRevision()
+ {
+ return revision;
+ }
+
+ final Object getText()
+ {
+ return text;
}
}
1.6 +7 -7 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Lines.java
Index: Lines.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Lines.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Lines.java 27 Feb 2002 16:49:48 -0000 1.5
+++ Lines.java 27 Feb 2002 20:18:05 -0000 1.6
@@ -68,11 +68,11 @@
*
* @see Line
* @see Archive
- *
+ *
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
- * @version $Id: Lines.java,v 1.5 2002/02/27 16:49:48 juanco Exp $
+ * @version $Id: Lines.java,v 1.6 2002/02/27 20:18:05 sbailliez Exp $
*/
-class Lines
+class Lines
extends ArrayList
{
@@ -86,7 +86,7 @@
public Lines(String text)
{
- this(null, org.apache.maven.jrcs.diff.Diff.stringToArray(text));
+ this(null, Diff.stringToArray(text));
}
public Lines(Node release, String text)
@@ -125,10 +125,10 @@
while (r.hasNext())
{
Line l = (Line) r.next();
- Object o = l.text;
+ Object o = l.getText();
if (annotate)
{
- Node rev = l.revision;
+ Node rev = l.getRevision();
o = annotationFormat.format(new Object[]{rev.version, rev._author, rev._date});
}
result[i++] = o;
@@ -143,7 +143,7 @@
public String toString(boolean annotate)
{
- return org.apache.maven.jrcs.diff.Diff.arrayToString(this.toArray(annotate));
+ return Diff.arrayToString(this.toArray(annotate));
}
}
1.6 +7 -7 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Path.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Path.java 27 Feb 2002 16:49:48 -0000 1.5
+++ Path.java 27 Feb 2002 20:18:05 -0000 1.6
@@ -70,13 +70,13 @@
*
* @see Archive
* @see Node
- *
+ *
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
- * @version $Id: Path.java,v 1.5 2002/02/27 16:49:48 juanco Exp $
+ * @version $Id: Path.java,v 1.6 2002/02/27 20:18:05 sbailliez Exp $
*/
class Path
{
- protected List _path = new LinkedList();
+ private List path = new LinkedList();
public Path()
{
@@ -84,12 +84,12 @@
public void add(Node node)
{
- _path.add(node);
+ path.add(node);
}
public int size()
{
- return _path.size();
+ return path.size();
}
public Node last()
@@ -100,7 +100,7 @@
}
else
{
- return (Node) _path.get(size() - 1);
+ return (Node) path.get(size() - 1);
}
}
@@ -133,7 +133,7 @@
PatchFailedException,
NodeNotFoundException
{
- Iterator p = _path.iterator();
+ Iterator p = path.iterator();
// get full text of first node
TrunkNode head = (TrunkNode) p.next();
1.6 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Version.java
Index: Version.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Version.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Version.java 27 Feb 2002 16:49:49 -0000 1.5
+++ Version.java 27 Feb 2002 20:18:05 -0000 1.6
@@ -65,15 +65,15 @@
* This class is NOT thread safe.
*
* @see Archive
- *
+ *
* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
- * @version $Id: Version.java,v 1.5 2002/02/27 16:49:49 juanco Exp $
+ * @version $Id: Version.java,v 1.6 2002/02/27 20:18:05 sbailliez Exp $
*/
public class Version
extends ToString
implements Cloneable, Comparable
{
- int[] numbers = new int[0];
+ private int[] numbers = new int[0];
public Version(int major)
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>