diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-11-28 23:43:07 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2017-11-29 04:06:23 +0100 |
| commit | 2d5ae0d920d1f602e15d9430f3650c946ad2cdfe (patch) | |
| tree | 175aaf4267eb702b2677a72acd86091a9ff28e50 | |
| parent | 6bc9912d2675fa790b50fefc75027bc2f39f5d58 (diff) | |
| download | lombok-2d5ae0d920d1f602e15d9430f3650c946ad2cdfe.tar.gz lombok-2d5ae0d920d1f602e15d9430f3650c946ad2cdfe.tar.bz2 lombok-2d5ae0d920d1f602e15d9430f3650c946ad2cdfe.zip | |
some bugfixes for JDK9 support involving the Options system of javac.
7 files changed, 36 insertions, 2 deletions
diff --git a/src/core/lombok/javac/Javac9BasedLombokOptions.java b/src/core/lombok/javac/Javac9BasedLombokOptions.java index 95bfff77..e786346d 100644 --- a/src/core/lombok/javac/Javac9BasedLombokOptions.java +++ b/src/core/lombok/javac/Javac9BasedLombokOptions.java @@ -39,6 +39,7 @@ public class Javac9BasedLombokOptions extends LombokOptions { } @Override public void putJavacOption(String optionName, String value) { + if (optionName.equals("CLASSPATH")) optionName = "CLASS_PATH"; if (optionName.equals("SOURCEPATH")) optionName = "SOURCE_PATH"; if (optionName.equals("BOOTCLASSPATH")) optionName = "BOOT_CLASS_PATH"; String optionText = Option.valueOf(optionName).primaryName; diff --git a/src/delombok/lombok/delombok/LombokOptionsFactory.java b/src/delombok/lombok/delombok/LombokOptionsFactory.java index bd615ac5..62dc953a 100644 --- a/src/delombok/lombok/delombok/LombokOptionsFactory.java +++ b/src/delombok/lombok/delombok/LombokOptionsFactory.java @@ -50,7 +50,7 @@ public class LombokOptionsFactory { } }; - abstract LombokOptions createAndRegisterOptions(Context context); + abstract LombokOptions createAndRegisterOptions(Context context); } public static LombokOptions getDelombokOptions(Context context) { diff --git a/src/stubs/com/sun/tools/javac/util/Options.java b/src/stubs/com/sun/tools/javac/util/Options.java new file mode 100644 index 00000000..e7ba8960 --- /dev/null +++ b/src/stubs/com/sun/tools/javac/util/Options.java @@ -0,0 +1,20 @@ +package com.sun.tools.javac.util; + +import java.util.Set; + +import com.sun.tools.javac.main.Option; +import com.sun.tools.javac.main.OptionName; +import com.sun.tools.javac.main.JavacOption; + +public class Options { + public Options(Context context) {} + public static final Context.Key<Options> optionsKey = new Context.Key<Options>(); + public static Options instance(Context context) { return null; } + public String get(String key) { return null; } + public String get(Option opt) { return null; } + public String get(OptionName name) { return null; } + public String get(JavacOption.Option opt) { return null; } + public void putAll(Options o) {} + public void put(String key, String value) {} + public Set<String> keySet() { return null; } +} diff --git a/src/stubsstubs/com/sun/tools/javac/main/JavacOption.java b/src/stubsstubs/com/sun/tools/javac/main/JavacOption.java new file mode 100644 index 00000000..8e74d3d3 --- /dev/null +++ b/src/stubsstubs/com/sun/tools/javac/main/JavacOption.java @@ -0,0 +1,5 @@ +package com.sun.tools.javac.main; + +public class JavacOption { + public static class Option {} +}
\ No newline at end of file diff --git a/src/stubsstubs/com/sun/tools/javac/main/Option.java b/src/stubsstubs/com/sun/tools/javac/main/Option.java new file mode 100644 index 00000000..45988e4c --- /dev/null +++ b/src/stubsstubs/com/sun/tools/javac/main/Option.java @@ -0,0 +1,3 @@ +package com.sun.tools.javac.main; + +public class Option {}
\ No newline at end of file diff --git a/src/stubsstubs/com/sun/tools/javac/main/OptionName.java b/src/stubsstubs/com/sun/tools/javac/main/OptionName.java new file mode 100644 index 00000000..b1866633 --- /dev/null +++ b/src/stubsstubs/com/sun/tools/javac/main/OptionName.java @@ -0,0 +1,3 @@ +package com.sun.tools.javac.main; + +public class OptionName {}
\ No newline at end of file diff --git a/src/stubsstubs/com/sun/tools/javac/util/Context.java b/src/stubsstubs/com/sun/tools/javac/util/Context.java index 9fa6b080..a090714e 100644 --- a/src/stubsstubs/com/sun/tools/javac/util/Context.java +++ b/src/stubsstubs/com/sun/tools/javac/util/Context.java @@ -1,3 +1,5 @@ package com.sun.tools.javac.util; -public class Context {}
\ No newline at end of file +public class Context { + public static class Key<T> {} +}
\ No newline at end of file |