mirror of
https://github.com/java-diff-utils/java-diff-utils.git
synced 2026-03-13 10:11:17 +08:00
cleaned up
This commit is contained in:
@@ -125,6 +125,7 @@ public class DiffRow {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "[" + this.tag + "," + this.oldLine + "," + this.newLine + "]";
|
||||
}
|
||||
|
||||
@@ -17,7 +17,6 @@ package difflib;
|
||||
|
||||
import difflib.DiffRow.Tag;
|
||||
import difflib.myers.Equalizer;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,7 +17,6 @@ package difflib;
|
||||
|
||||
import difflib.myers.Equalizer;
|
||||
import difflib.myers.MyersDiff;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
@@ -159,7 +158,7 @@ public class DiffUtils {
|
||||
Matcher m = unifiedDiffChunkRe.matcher(line);
|
||||
if (m.find()) {
|
||||
// Process the lines in the previous chunk
|
||||
if (rawChunk.size() != 0) {
|
||||
if (!rawChunk.isEmpty()) {
|
||||
List<String> oldChunkLines = new ArrayList<String>();
|
||||
List<String> newChunkLines = new ArrayList<String>();
|
||||
|
||||
@@ -202,7 +201,7 @@ public class DiffUtils {
|
||||
}
|
||||
|
||||
// Process the lines in the last chunk
|
||||
if (rawChunk.size() != 0) {
|
||||
if (!rawChunk.isEmpty()) {
|
||||
List<String> oldChunkLines = new ArrayList<String>();
|
||||
List<String> newChunkLines = new ArrayList<String>();
|
||||
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
package difflib.myers;
|
||||
|
||||
import difflib.*;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
@@ -123,6 +123,7 @@ public abstract class PathNode {
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuffer buf = new StringBuffer("[");
|
||||
PathNode node = this;
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
package diffutils;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import difflib.DiffRow;
|
||||
import difflib.DiffRowGenerator;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class DiffRowGeneratorTest extends TestCase {
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
package diffutils;
|
||||
|
||||
import difflib.*;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class DiffTest extends TestCase {
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
package diffutils;
|
||||
|
||||
import difflib.DiffUtils;
|
||||
import difflib.Patch;
|
||||
import difflib.PatchFailedException;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
@@ -7,11 +10,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import difflib.DiffUtils;
|
||||
import difflib.Patch;
|
||||
import difflib.PatchFailedException;
|
||||
|
||||
public class GenerateUnifiedDiffTest extends TestCase {
|
||||
|
||||
|
||||
@@ -3,10 +3,9 @@ package diffutils;
|
||||
import difflib.DiffUtils;
|
||||
import difflib.Patch;
|
||||
import difflib.PatchFailedException;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class PatchTest extends TestCase {
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package diffutils.examples;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import difflib.DiffUtils;
|
||||
import difflib.Patch;
|
||||
import difflib.PatchFailedException;
|
||||
import diffutils.TestConstants;
|
||||
import java.util.List;
|
||||
|
||||
public class ApplyPatch extends Example {
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package diffutils.examples;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import difflib.Delta;
|
||||
import difflib.DiffUtils;
|
||||
import difflib.Patch;
|
||||
import diffutils.TestConstants;
|
||||
import java.util.List;
|
||||
|
||||
public class ComputeDifference extends Example {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user