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

1 files changed, 1 insertions, 27 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index 851fc3db..08becf6b 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -12,7 +12,6 @@ class BuilderSingularGuavaListsSets<T> {
 	private ImmutableTable<? extends Number, ? extends Number, String> users;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
 		this.cards = cards;
 		this.frogs = frogs;
@@ -22,36 +21,28 @@ class BuilderSingularGuavaListsSets<T> {
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public static class BuilderSingularGuavaListsSetsBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private com.google.common.collect.ImmutableList.Builder<T> cards;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private com.google.common.collect.ImmutableList.Builder<Number> frogs;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		BuilderSingularGuavaListsSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.add(card);
@@ -59,7 +50,6 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
@@ -67,14 +57,12 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
 			this.cards = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.add(frog);
@@ -82,7 +70,6 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
@@ -90,14 +77,12 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
 			this.frogs = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.add(rawSet);
@@ -105,7 +90,6 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
@@ -113,14 +97,12 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
 			this.rawSet = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.add(pass);
@@ -128,7 +110,6 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
@@ -136,14 +117,12 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
 			this.passes = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.put(rowKey, columnKey, value);
@@ -151,7 +130,6 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.putAll(users);
@@ -159,14 +137,12 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
 			this.users = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderSingularGuavaListsSets<T> build() {
 			com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build();
 			com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build();
@@ -178,15 +154,13 @@ class BuilderSingularGuavaListsSets<T> {
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public java.lang.String toString() {
 			return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
 		return new BuilderSingularGuavaListsSetsBuilder<T>();
 	}
-}
\ No newline at end of file
+}