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/23 14:43:16 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jrcs jdiff.java rcsp.java
sbailliez 02/02/23 05:43:16
Modified: src/java/org/apache/maven/jrcs jdiff.java rcsp.java
Log:
Apply Turbine coding style
Revision Changes Path
1.5 +22 -10 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java
Index: jdiff.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jdiff.java 21 Feb 2002 14:08:59 -0000 1.4
+++ jdiff.java 23 Feb 2002 13:43:16 -0000 1.5
@@ -65,14 +65,17 @@
import org.apache.maven.jrcs.diff.Revision;
-public class jdiff {
+public class jdiff
+{
- static final String[] loadFile(String name) throws IOException {
+ static final String[] loadFile(String name) throws IOException
+ {
BufferedReader data = new BufferedReader(new FileReader(name));
Vector v = new Vector();
String s;
- while ((s = data.readLine()) != null) {
+ while ((s = data.readLine()) != null)
+ {
v.addElement(s);
}
@@ -81,14 +84,19 @@
return result;
}
- static final void ussage(String name) {
+ static final void ussage(String name)
+ {
System.err.println("Ussage: " + name + " file1 file2");
}
- public static void main(String[] argv) throws Exception {
- if (argv.length < 2) {
+ public static void main(String[] argv) throws Exception
+ {
+ if (argv.length < 2)
+ {
ussage("jdiff");
- } else {
+ }
+ else
+ {
Object[] orig = loadFile(argv[0]);
Object[] rev = loadFile(argv[1]);
@@ -101,10 +109,12 @@
System.out.print(r.toString());
System.err.println("------" + new Date());
- try {
+ try
+ {
Object[] reco = r.patch(orig);
String recos = Diff.arrayToString(reco);
- if (!Diff.compare(rev, reco)) {
+ if (!Diff.compare(rev, reco))
+ {
/*
System.err.println("**********");
System.err.print(Diff.arrayToString(rev));
@@ -114,7 +124,9 @@
*/
System.err.println("files differ");
}
- } catch (Throwable o) {
+ }
+ catch (Throwable o)
+ {
System.out.println("Patch failed");
}
}
1.6 +23 -10 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java
Index: rcsp.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rcsp.java 21 Feb 2002 14:08:59 -0000 1.5
+++ rcsp.java 23 Feb 2002 13:43:16 -0000 1.6
@@ -58,19 +58,27 @@
import org.apache.maven.jrcs.diff.Diff;
import org.apache.maven.jrcs.rcs.*;
-public class rcsp {
+public class rcsp
+{
static Archive arc;
static Object[] orig;
- static public void main(String[] args) throws Exception {
+ static public void main(String[] args) throws Exception
+ {
// try {
- if (args.length > 2) {
+ if (args.length > 2)
+ {
System.out.println("WRONG USSAGE: need at most one parameter");
- } else {
- if (args.length >= 1) {
+ }
+ else
+ {
+ if (args.length >= 1)
+ {
arc = new Archive(args[0]);
- } else {
+ }
+ else
+ {
arc = new Archive("test,v", System.in);
}
System.err.println();
@@ -110,8 +118,10 @@
static int n = 1;
- static void trywith(String ver) {
- try {
+ static void trywith(String ver)
+ {
+ try
+ {
System.out.println();
System.out.println("-------------");
System.out.println("Adding " + ver);
@@ -129,7 +139,8 @@
Version newVer = arc.addRevision(rev, ver);
System.out.println(newVer + " added");
- if (newVer != null) {
+ if (newVer != null)
+ {
Object[] rec = arc.getRevision(newVer);
//System.out.print(Archive.arrayToString(rec));
@@ -147,7 +158,9 @@
*/
}
System.out.println(ver + " OK");
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
System.err.println(e.getMessage());
e.printStackTrace();
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>