Repo init

git-svn-id: http://java-diff-utils.googlecode.com/svn/trunk@2 d8d7d024-a22d-11de-b755-fd640f38fa9d

Author: dm.naumenko@gmail.com

src/difflib/ChangeDelta.java

@@ -0,0 +1,36 @@
+package difflib;
+
+import java.util.List;
+
+/**
+ * Describes the change-delta between original and revised texts.
+ * 
+ * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
+ */
+public class ChangeDelta extends Delta {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public ChangeDelta(Chunk original, Chunk revised) {
+		super(original, revised);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void applyTo(List<Object> target) {
+		int position = getOriginal().getPosition();
+		int originalSize = getOriginal().getSize();
+		for (int i = 0; i < originalSize; i++) {
+			target.remove(position);
+		}
+		int i = 0;
+		for (Object line: getRevised().getLines()) {
+			target.add(position + i, line);
+			i++;
+		}
+	}
+
+}

src/difflib/Chunk.java

@@ -0,0 +1,130 @@
+package difflib;
+
+import java.util.*;
+
+/**
+ * Holds the information about the part of text involved in the diff process
+ * 
+ * <p>Text is represented as <code>Object[]</code> because
+ * the diff engine is capable of handling more than plain ascci. In fact,
+ * arrays or lists of any type that implements
+ * {@link java.lang.Object#hashCode hashCode()} and
+ * {@link java.lang.Object#equals equals()}
+ * correctly can be subject to differencing using this
+ * library.</p>
+ * 
+ * @author <a href="dm.naumenko@gmail.com>Dmitry Naumenko</a>
+ */
+public class Chunk {
+	private int position;
+	private int size;
+	private List<?> lines;
+	
+	/**
+	 * Creates a chunk and saves a copy of affected lines
+	 * 
+	 * @param position the start position
+	 * @param size the size of a Chunk
+	 * @param lines the affected lines  
+	 */
+	public Chunk(int position, int size, List<?> lines) {
+		this.position = position;
+		this.size = size;
+		this.lines = lines;
+	}
+	
+	/**
+	 * Creates a chunk and saves a copy of affected lines
+	 * 
+	 * @param position the start position
+	 * @param size the size of a Chunk
+	 * @param lines the affected lines  
+	 */
+	public Chunk(int position, int size, Object[] lines) {
+		this.position = position;
+		this.size = size;
+		this.lines = Arrays.asList(lines);
+	}
+	
+	/**
+	 * @return the start position of chunk in the text  
+	 */
+	public int getPosition() {
+		return position;
+	}
+	/**
+	 * @param position the start position to set
+	 */
+	public void setPosition(int position) {
+		this.position = position;
+	}
+	
+	/**
+	 * @return the size of Chunk (size of affected lines)
+	 */
+	public int getSize() {
+		return size;
+	}
+	/**
+	 * @param size the size of affected lines to set
+	 */
+	public void setSize(int size) {
+		this.size = size;
+	}
+	
+	/**
+	 * @return the affected lines
+	 */
+	public List<?> getLines() {
+		return lines;
+	}
+	/**
+	 * @param lines the affected lines to set
+	 */
+	public void setLines(List<?> lines) {
+		this.lines = lines;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((lines == null) ? 0 : lines.hashCode());
+		result = prime * result + position;
+		result = prime * result + size;
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Chunk other = (Chunk) obj;
+		if (lines == null) {
+			if (other.lines != null)
+				return false;
+		} else if (!lines.equals(other.lines))
+			return false;
+		if (position != other.position)
+			return false;
+		if (size != other.size)
+			return false;
+		return true;
+	}
+	
+	@Override
+	public String toString() {
+		return "[position: " + position + ", size: " + size + ", lines: " + lines + "]";
+	}
+	
+}

src/difflib/DeleteDelta.java

@@ -0,0 +1,31 @@
+package difflib;
+
+import java.util.List;
+
+/**
+ * Describes the delete-delta between original and revised texts.
+ * 
+ * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
+ */
+public class DeleteDelta extends Delta {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public DeleteDelta(Chunk original, Chunk revised) {
+		super(original, revised);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void applyTo(List<Object> target) {
+		int position = getOriginal().getPosition();
+		int size = getOriginal().getSize();
+		for (int i = 0; i < size; i++) {
+			target.remove(position);
+		}
+	}
+
+}

src/difflib/Delta.java

@@ -0,0 +1,57 @@
+package difflib;
+
+import java.util.*;
+
+/**
+ * Describes the delta between original and revised texts.
+ * 
+ * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
+ */
+public abstract class Delta {
+	private Chunk original;
+	private Chunk revised;
+
+	/**
+	 * Construct the delta for original and revised chunks
+	 * 
+	 * @param original chunk describes the original text
+	 * @param revised chunk describes the revised text
+	 */
+	public Delta(Chunk original, Chunk revised) {
+		this.original = original;
+		this.revised  = revised;
+	}
+	
+	/**
+	 * Applies this delta as the patch for a given target
+	 * 
+	 * @param target the given target 
+	 */
+	public abstract void applyTo(List<Object> target);
+	
+	/**
+	 * @return the Chunk describing the original text
+	 */
+	public Chunk getOriginal() {
+		return original;
+	}
+	/**
+	 * @param original the Chunk describing the original text to set
+	 */
+	public void setOriginal(Chunk original) {
+		this.original = original;
+	}
+	
+	/**
+	 * @return the Chunk describing the revised text
+	 */
+	public Chunk getRevised() {
+		return revised;
+	}
+	/**
+	 * @param revised the Chunk describing the revised text to set
+	 */
+	public void setRevised(Chunk revised) {
+		this.revised = revised;
+	}
+}

src/difflib/DiffAlgorithm.java

@@ -0,0 +1,33 @@
+package difflib;
+
+import java.util.*;
+
+/**
+ * The general interface for computing diffs between two texts
+ * 
+ * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
+ */
+public interface DiffAlgorithm {
+	
+    /**
+     * Computes the difference between the original
+     * sequence and the revised sequence and returns it
+     * as a {@link difflib.Patch Patch} object.
+     *
+     * @param original the original text
+     * @param revised the revised text
+     * @return the patch
+     */
+	public Patch diff(Object[] original, Object[] revised);
+	
+    /**
+     * Computes the difference between the original
+     * sequence and the revised sequence and returns it
+     * as a {@link difflib.Patch Patch} object.
+     *
+     * @param original the original text
+     * @param revised the revised text
+     * @return the patch
+     */
+	public Patch diff(List<?> original, List<?> revised);
+}

src/difflib/DiffRow.java

@@ -0,0 +1,56 @@
+package difflib;
+
+/**
+ * Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two
+ * texts 
+ * 
+ * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
+ */
+public class DiffRow {
+	private Tag tag;
+	private String oldLine;
+	private String newLine;
+	
+	public enum Tag {
+		INSERT, DELETE, CHANGE
+	}
+	
+	/**
+	 * @return the tag
+	 */
+	public Tag getTag() {
+		return tag;
+	}
+	/**
+	 * @param tag the tag to set
+	 */
+	public void setTag(Tag tag) {
+		this.tag = tag;
+	}
+	
+	/**
+	 * @return the oldLine
+	 */
+	public String getOldLine() {
+		return oldLine;
+	}
+	/**
+	 * @param oldLine the oldLine to set
+	 */
+	public void setOldLine(String oldLine) {
+		this.oldLine = oldLine;
+	}
+	
+	/**
+	 * @return the newLine
+	 */
+	public String getNewLine() {
+		return newLine;
+	}
+	/**
+	 * @param newLine the newLine to set
+	 */
+	public void setNewLine(String newLine) {
+		this.newLine = newLine;
+	}
+}