Untangling patches to classes that only exist in eclipse, not ecj

Specifically, Rawi01's patches to make javadoc behaviour in eclipse better,
which cannot be applied to ecj as you get load errors (javadoc not a thing there).

As part of this commit, tests can be limited to ecj or eclipse, and I made cut-down
versions of a few tests (to run on ecj, as the main one cannot be, due to javadoc issues).

The tests now marked as eclipse only don't fail on ecj, but they don't generate the same
result. Alternatively, we could go with a separated out after-ecj and after-eclipse dir
instead, but that's perhaps going overboard.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
index a2cda66c..55e8e0bf 100755
--- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java
+++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
@@ -66,7 +66,7 @@ import org.eclipse.jdt.internal.core.dom.rewrite.TokenScanner;
 import org.eclipse.jdt.internal.corext.refactoring.SearchResultGroup;
 import org.eclipse.jdt.internal.corext.refactoring.structure.ASTNodeSearchUtil;
 
-import lombok.eclipse.EclipseAugments;
+import static lombok.eclipse.EcjAugments.ASTNode_generatedBy;
 
 /** These contain a mix of the following:
  * <ul>
@@ -545,14 +545,14 @@ final class PatchFixesHider {
 		
 		public static int fixRetrieveRightBraceOrSemiColonPosition(int retVal, AbstractMethodDeclaration amd) {
 			if (retVal != -1 || amd == null) return retVal;
-			boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get(amd) != null;
+			boolean isGenerated = ASTNode_generatedBy.get(amd) != null;
 			if (isGenerated) return amd.declarationSourceEnd;
 			return -1;
 		}
 		
 		public static int fixRetrieveRightBraceOrSemiColonPosition(int retVal, FieldDeclaration fd) {
 			if (retVal != -1 || fd == null) return retVal;
-			boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get(fd) != null;
+			boolean isGenerated = ASTNode_generatedBy.get(fd) != null;
 			if (isGenerated) return fd.declarationSourceEnd;
 			return -1;
 		}
@@ -578,13 +578,13 @@ final class PatchFixesHider {
 				org.eclipse.jdt.internal.compiler.ast.ASTNode internalNode) throws Exception {
 			
 			if (internalNode == null || domNode == null) return;
-			boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get(internalNode) != null;
+			boolean isGenerated = ASTNode_generatedBy.get(internalNode) != null;
 			if (isGenerated) domNode.getClass().getField("$isGenerated").set(domNode, true);
 		}
 		
 		public static void setIsGeneratedFlagForName(org.eclipse.jdt.core.dom.Name name, Object internalNode) throws Exception {
 			if (internalNode instanceof org.eclipse.jdt.internal.compiler.ast.ASTNode) {
-				boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get((org.eclipse.jdt.internal.compiler.ast.ASTNode) internalNode) != null;
+				boolean isGenerated = ASTNode_generatedBy.get((org.eclipse.jdt.internal.compiler.ast.ASTNode) internalNode) != null;
 				if (isGenerated) name.getClass().getField("$isGenerated").set(name, true);
 			}
 		}