diff -r 3bb3ec5c0696 java.source/src/org/netbeans/modules/java/source/save/CasualDiff.java --- a/java.source/src/org/netbeans/modules/java/source/save/CasualDiff.java Thu Jun 04 00:47:41 2009 +0200 +++ b/java.source/src/org/netbeans/modules/java/source/save/CasualDiff.java Sat Jun 06 23:24:12 2009 +0100 @@ -1060,24 +1060,42 @@ int localPointer = bounds[0]; if (nameChanged(oldT.label, newT.label)) { copyTo(localPointer, localPointer = getOldPos(oldT)); - printer.print("break "); - printer.print(newT.label); - localPointer += 6 + oldT.label.length(); + printer.print("break"); + localPointer += 5; + if (oldT.label != null && oldT.label.length() > 0) { + // XXX could be arbitrary whitespace + localPointer += 1; + } + if (newT.label != null && newT.label.length() > 0) { + printer.print(" "); + printer.print(newT.label); + } + if (oldT.label != null) + localPointer += oldT.label.length(); } copyTo(localPointer, bounds[1]); return bounds[1]; } protected int diffContinue(JCContinue oldT, JCContinue newT, int[] bounds) { + // XXX code repetition with diffBreak int localPointer = bounds[0]; if (nameChanged(oldT.label, newT.label)) { copyTo(localPointer, localPointer = getOldPos(oldT)); - printer.print("continue "); - printer.print(newT.label); - localPointer += 9 + oldT.label.length(); + printer.print("continue"); + localPointer += 8; + if (oldT.label != null && oldT.label.length() > 0) { + // XXX could be arbitrary whitespace + localPointer += 1; + } + if (newT.label != null && newT.label.length() > 0) { + printer.print(" "); + printer.print(newT.label); + } + if (oldT.label != null) + localPointer += oldT.label.length(); } copyTo(localPointer, bounds[1]); - return bounds[1]; }