Merge pull request #2780 from md-5/delombok-16

[jdk16] Add lombok opens in single location

4 files changed, 4 insertions, 13 deletions

diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java
index b210bab9..10ec5015 100755
--- a/src/delombok/lombok/delombok/Delombok.java
+++ b/src/delombok/lombok/delombok/Delombok.java
@@ -168,6 +168,10 @@ public class Delombok {
 		private boolean help;
 	}
 	
+	static {
+		LombokProcessor.addOpensForLombok();
+	}
+	
 	private static String indentAndWordbreak(String in, int indent, int maxLen) {
 		StringBuilder out = new StringBuilder();
 		StringBuilder line = new StringBuilder();
@@ -315,7 +319,6 @@ public class Delombok {
 				}
 			}
 			
-			LombokProcessor.addOpensForLombok();
 			delombok.delombok();
 		} catch (Exception e) {
 			if (!args.quiet) {
diff --git a/src/delombok/lombok/delombok/DelombokApp.java b/src/delombok/lombok/delombok/DelombokApp.java
index ef3bbd50..f5a5fc81 100644
--- a/src/delombok/lombok/delombok/DelombokApp.java
+++ b/src/delombok/lombok/delombok/DelombokApp.java
@@ -36,7 +36,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 import lombok.core.LombokApp;
-import lombok.javac.apt.LombokProcessor;
 import lombok.permit.Permit;
 import lombok.spi.Provides;
 
@@ -174,7 +173,6 @@ public class DelombokApp extends LombokApp {
 	}
 	
 	private void runDirectly(List<String> args) {
-		LombokProcessor.addOpensForLombok();
 		Delombok.main(args.toArray(new String[0]));
 	}
 	
diff --git a/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java b/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java
index f2cd80e1..bd2f93e7 100644
--- a/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java
+++ b/src/delombok/lombok/delombok/ant/DelombokTaskImpl.java
@@ -30,7 +30,6 @@ import java.util.List;
 
 import lombok.delombok.Delombok;
 import lombok.delombok.Delombok.InvalidFormatOptionException;
-import lombok.javac.apt.LombokProcessor;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
@@ -47,10 +46,6 @@ public class DelombokTaskImpl {
 	private Path path;
 	private List<String> formatOptions = new ArrayList<String>();
 	
-	static {
-		LombokProcessor.addOpensForLombok();
-	}
-	
 	public void execute(Location location) throws BuildException {
 		if (fromDir == null && path == null) throw new BuildException("Either 'from' attribute, or nested <fileset> tags are required.");
 		if (fromDir != null && path != null) throw new BuildException("You can't specify both 'from' attribute and nested filesets. You need one or the other.");
diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java
index 08e3283f..13acdf55 100644
--- a/test/core/src/lombok/RunTestsViaDelombok.java
+++ b/test/core/src/lombok/RunTestsViaDelombok.java
@@ -62,15 +62,10 @@ import lombok.delombok.Delombok;
 import lombok.javac.CapturingDiagnosticListener;
 import lombok.javac.Javac;
 import lombok.javac.CapturingDiagnosticListener.CompilerMessage;
-import lombok.javac.apt.LombokProcessor;
 
 public class RunTestsViaDelombok extends AbstractRunTests {
 	private Delombok delombok = new Delombok();
 	
-	static {
-		LombokProcessor.addOpensForLombok();
-	}
-	
 	@Override
 	public boolean transformCode(Collection<CompilerMessage> messages, StringWriter result, final File file, String encoding, Map<String, String> formatPreferences, int version, boolean checkPositions) throws Throwable {
 		delombok.setVerbose(true);