diff options
author | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
---|---|---|
committer | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
commit | 2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8 (patch) | |
tree | 238b9877ce1daa83b3e8d422eb4d2f7ab89f3864 /test/transform/resource/after-delombok/SynchronizedPlain.java | |
parent | f51bbce3e396a0151bc0242d00e250f2bc720316 (diff) | |
parent | a2c10c70fa8e2c8736464a5c3d445e2ca6e8a296 (diff) | |
download | lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.gz lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.bz2 lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.zip |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/core/lombok/eclipse/handlers/HandleBuilder.java
# src/core/lombok/eclipse/handlers/HandleConstructor.java
# src/core/lombok/javac/handlers/HandleBuilder.java
# src/core/lombok/javac/handlers/HandleConstructor.java
Diffstat (limited to 'test/transform/resource/after-delombok/SynchronizedPlain.java')
-rw-r--r-- | test/transform/resource/after-delombok/SynchronizedPlain.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java index 4e9ecac1..229d261a 100644 --- a/test/transform/resource/after-delombok/SynchronizedPlain.java +++ b/test/transform/resource/after-delombok/SynchronizedPlain.java @@ -1,7 +1,6 @@ class SynchronizedPlain1 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private final java.lang.Object $lock = new java.lang.Object[0]; void test() { synchronized (this.$lock) { @@ -17,7 +16,6 @@ class SynchronizedPlain1 { class SynchronizedPlain2 { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - @lombok.Generated private static final java.lang.Object $LOCK = new java.lang.Object[0]; static void test() { synchronized (SynchronizedPlain2.$LOCK) { @@ -29,4 +27,4 @@ class SynchronizedPlain2 { System.out.println("four"); } } -}
\ No newline at end of file +} |