diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-19 11:08:35 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-19 11:12:32 +0700 |
| commit | 263d25ac28052dd2e7723c0275c05da8cd2e2c40 (patch) | |
| tree | ff61818bb2a34982e76dcf51898b190b0642bbce /org.aspectj.ajdt.core | |
| parent | 4e5430011fc9283074339b39754b0f07ff5d8a04 (diff) | |
| download | aspectj-263d25ac28052dd2e7723c0275c05da8cd2e2c40.tar.gz aspectj-263d25ac28052dd2e7723c0275c05da8cd2e2c40.zip | |
Begin migration to 'aspectj' locale for compiler messages
Renamed messages.properties to messages_aspectj.properties and moved to
a path identical with the Eclipse original resource file. Therefore, it
is now just treated as a localised version of it.
The new jdtcore-for-aspectj.jar already contains logic to use the new
locale. Hence, BuildArgParser no longer needs the static block to
initialise its own resource bundle, Eclipse JDT will automatically pick
it up.
The version string was also updated to the new Eclipse merge commit
hash + date + "Java16".
TODO: Strip down properties file in order to only contain delta to
Eclipse.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java | 11 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties (renamed from org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties) | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java index be594860b..7377b99ee 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -51,17 +51,6 @@ import org.aspectj.weaver.WeaverMessages; @SuppressWarnings("unchecked") public class BuildArgParser extends Main { - private static final String BUNDLE_NAME = "org.aspectj.ajdt.ajc.messages"; - private static boolean LOADED_BUNDLE = false; - - static { - Main.bundleName = BUNDLE_NAME; - ResourceBundleFactory.getBundle(Locale.getDefault()); - if (!LOADED_BUNDLE) { - LOADED_BUNDLE = true; - } - } - /** to initialize super's PrintWriter but refer to underlying StringWriter */ private static class StringPrintWriter extends PrintWriter { public final StringWriter stringWriter; diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties index 50e388af9..7d9219d5f 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties @@ -12,7 +12,7 @@ ### AspectJ-specific messages compiler.name = AspectJ Compiler -compiler.version = Eclipse Compiler 3caefb8021d710 (09Mar2021) - Java15 +compiler.version = Eclipse Compiler a00b62fa3572b0 (17Mar2021) - Java16 compiler.copyright = |