cleanup after merge changes, no drive-by changes

Author: homberghp

java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java

@@ -857,7 +857,6 @@ public void visitImport(JCImport tree) {
 
     @Override
     public void visitClassDef(JCClassDecl tree) {
-        System.err.println("VP visit clas/"+tree+"//class");
         JCClassDecl enclClassPrev = enclClass;
 	enclClass = tree;
 	toLeftMargin();

java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java

@@ -1274,9 +1274,9 @@ private ComponentsAndOtherMembers splitOutRecordComponents(List<JCTree> defs, JC
     record ComponentsAndOtherMembers(List<? extends JCTree> components, List<JCTree> defs) {}
 
     /**
-     * When the enumeration contains just methods, it is necessary to preced them with single ;. If a constant is
+     * When the enumeration contains just methods, it is necessary to preceed them with single ;. If a constant is
      * inserted, it must be inserted first; and the semicolon should be removed. This method will attempt to remove entire
-     * lines of whitespace around the semicolon. Preceding or following comments are preserved.
+     * lines of white space around the semicolon. Preceding or following comments are preserved.
      *
      * @param insertHint the local Pointer value
      * @return new localPointer value

java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/ExtractSuperclassTest.java

@@ -48,6 +48,8 @@ public class ExtractSuperclassTest extends RefactoringTestBase {
 
     public ExtractSuperclassTest(String name) {
         super(name);
+        RETRIES=1;
+//        show
     }
 
     public void test235246() throws Exception {

java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/InnerOuterRecordTest.java

@@ -66,7 +66,6 @@ public InnerOuterRecordTest(String name) {
         }
         sideBySideCompare = true;
         showOutputOnPass=true;
-
     }
 
     public void test9ApacheNetbeans7044() throws Exception {
@@ -645,7 +644,6 @@ record A(F f, String... params) {
                  * @author junit
                  */
                  record F<P>(P first, String... second) {
-
                     public F {
                         assert null != first;
                         assert null != second && second.length > 0;
@@ -708,6 +706,8 @@ record F<P>(P first, P... second) {
 
     // show that brace comes too early in inner record.
     public void test8RecordImplements1() throws Exception {
+//        debug = true;
+        RETRIES = 0;
         sideBySideCompare = true;
         String source
                 = """
@@ -757,7 +757,6 @@ public record F(int x, int y) implements Cloneable, Serializable {
     // show that outer record survives casual diff.
     public void test8RecordImplements2() throws Exception {
         sideBySideCompare = true;
-//        showOutputOnPass=true;
         String source
                 = """
                 package t;
@@ -807,7 +806,6 @@ enum F {
 
     // Test shows that inner enum does not have the too early brace problem.
     public void test8EnumImplements() throws Exception {
-//        debug = true;
         sideBySideCompare = true;
         String source
                 = """

java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/PullUpTest.java

@@ -53,6 +53,7 @@ public class PullUpTest extends RefactoringTestBase {
 
     public PullUpTest(String name) {
         super(name, "1.8");
+        RETRIES=1;
     }
 
     static {