cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jrcs JDiff.java jdiff.java

[dl...@apache.org]

dlr         02/02/27 08:15:36

  Added:       src/java/org/apache/maven/jrcs JDiff.java
  Removed:     src/java/org/apache/maven/jrcs jdiff.java
  Log:
  Renamed jdiff to JDiff (yes, not one but two capital letters, James! ;-)
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-maven/src/java/org/apache/maven/jrcs/JDiff.java
  
  Index: JDiff.java
  ===================================================================
  package org.apache.maven.jrcs;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Maven" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Maven", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  
  import java.io.BufferedReader;
  import java.io.FileReader;
  import java.io.IOException;
  import java.util.Date;
  import java.util.Vector;
  
  import org.apache.maven.jrcs.diff.Diff;
  import org.apache.maven.jrcs.diff.Revision;
  
  
  public class JDiff
  {
  
      static final String[] loadFile(String name) throws IOException
      {
          BufferedReader data = new BufferedReader(new FileReader(name));
          Vector lines = new Vector();
          String s;
          while ((s = data.readLine()) != null)
          {
              lines.addElement(s);
          }
          return (String[])lines.toArray(new String[lines.size()]);
      }
  
      static final void usage(String name)
      {
          System.err.println("Usage: " + name + " file1 file2");
      }
  
      public static void main(String[] argv) throws Exception
      {
          if (argv.length < 2)
          {
              usage("JDiff");
          }
          else
          {
              Object[] orig = loadFile(argv[0]);
              Object[] rev = loadFile(argv[1]);
  
              System.err.println("---go!----");
              Diff df = new Diff(orig);
              Revision r = df.diff(rev);
              System.err.println("---end!---");
  
              System.err.println("------");
              System.out.print(r.toString());
              System.err.println("------" + new Date());
  
              try
              {
                  Object[] reco = r.patch(orig);
                  String recos = Diff.arrayToString(reco);
                  if (!Diff.compare(rev, reco))
                  {
                      /*
                      System.err.println("**********");
                      System.err.print(Diff.arrayToString(rev));
                      System.err.println("**********");
                      System.err.print(recos);
                      System.err.println("**********");
                      */
                      System.err.println("files differ");
                  }
              }
              catch (Throwable o)
              {
                  System.out.println("Patch failed");
              }
          }
      }
  }
  
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>