You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2016/11/28 15:14:55 UTC
svn commit: r1771760 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
Author: alexparvulescu
Date: Mon Nov 28 15:14:55 2016
New Revision: 1771760
URL: http://svn.apache.org/viewvc?rev=1771760&view=rev
Log:
OAK-5172 TarMK Revision Diff should also print the deleted nodes properties
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java?rev=1771760&r1=1771759&r2=1771760&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java Mon Nov 28 15:14:55 2016
@@ -59,41 +59,28 @@ final class PrintingDiff implements Node
private final String path;
- private final boolean skipProps;
-
PrintingDiff(PrintWriter pw, String path) {
- this(pw, path, false);
- }
-
- private PrintingDiff(PrintWriter pw, String path, boolean skipProps) {
this.pw = pw;
this.path = path;
- this.skipProps = skipProps;
}
@Override
public boolean propertyAdded(PropertyState after) {
- if (!skipProps) {
- pw.println(" + " + toString(after));
- }
+ pw.println(" + " + toString(after));
return true;
}
@Override
public boolean propertyChanged(PropertyState before, PropertyState after) {
- if (!skipProps) {
- pw.println(" ^ " + before.getName());
- pw.println(" - " + toString(before));
- pw.println(" + " + toString(after));
- }
+ pw.println(" ^ " + before.getName());
+ pw.println(" - " + toString(before));
+ pw.println(" + " + toString(after));
return true;
}
@Override
public boolean propertyDeleted(PropertyState before) {
- if (!skipProps) {
- pw.println(" - " + toString(before));
- }
+ pw.println(" - " + toString(before));
return true;
}
@@ -101,23 +88,21 @@ final class PrintingDiff implements Node
public boolean childNodeAdded(String name, NodeState after) {
String p = concat(path, name);
pw.println("+ " + p);
- return after.compareAgainstBaseState(EMPTY_NODE, new PrintingDiff(
- pw, p));
+ return after.compareAgainstBaseState(EMPTY_NODE, new PrintingDiff(pw, p));
}
@Override
public boolean childNodeChanged(String name, NodeState before, NodeState after) {
String p = concat(path, name);
pw.println("^ " + p);
- return after.compareAgainstBaseState(before,
- new PrintingDiff(pw, p));
+ return after.compareAgainstBaseState(before, new PrintingDiff(pw, p));
}
@Override
public boolean childNodeDeleted(String name, NodeState before) {
String p = concat(path, name);
pw.println("- " + p);
- return MISSING_NODE.compareAgainstBaseState(before, new PrintingDiff(pw, p, true));
+ return MISSING_NODE.compareAgainstBaseState(before, new PrintingDiff(pw, p));
}
private static String toString(PropertyState ps) {