From 859ad45231d0a331671047b015d68c4e27a2ab80 Mon Sep 17 00:00:00 2001 From: Krzysztof Krason Date: Wed, 7 Feb 2018 18:54:51 +0100 Subject: adding java10 download script --- docker/provision/jdk/java-10.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docker/provision/jdk/java-10.sh diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh new file mode 100644 index 00000000..cdbfa9d1 --- /dev/null +++ b/docker/provision/jdk/java-10.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://download.java.net/java/jdk10/archive/42/BCL/jdk-10-ea+42_linux-x64_bin.tar.gz -O jdk.tar.gz +tar -xzf jdk.tar.gz -C /opt +mv /opt/jdk-10 /opt/jdk -- cgit From ab19f72400a9482015e117d9d0c9e60277a24a26 Mon Sep 17 00:00:00 2001 From: Javier Ramos Date: Fri, 16 Feb 2018 20:31:06 +0100 Subject: #1579: recycle handlers to avoid excessive garbage collection --- src/core/lombok/eclipse/handlers/HandleData.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/HandleData.java b/src/core/lombok/eclipse/handlers/HandleData.java index 0ff65a47..7c674ba9 100644 --- a/src/core/lombok/eclipse/handlers/HandleData.java +++ b/src/core/lombok/eclipse/handlers/HandleData.java @@ -43,6 +43,13 @@ import org.mangosdk.spi.ProviderFor; */ @ProviderFor(EclipseAnnotationHandler.class) public class HandleData extends EclipseAnnotationHandler { + + private HandleGetter handleGetter = new HandleGetter(); + private HandleSetter handleSetter = new HandleSetter(); + private HandleEqualsAndHashCode handleEqualsAndHashCode = new HandleEqualsAndHashCode(); + private HandleToString handleToString = new HandleToString(); + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.DATA_FLAG_USAGE, "@Data"); @@ -66,11 +73,11 @@ public class HandleData extends EclipseAnnotationHandler { //for whatever reason, though you can find callers of that one by focusing on the class name itself //and hitting 'find callers'. - new HandleGetter().generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleSetter().generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode); - new HandleToString().generateToStringForType(typeNode, annotationNode); - new HandleConstructor().generateRequiredArgsConstructor( + handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleSetter.generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleEqualsAndHashCode.generateEqualsAndHashCodeForType(typeNode, annotationNode); + handleToString.generateToStringForType(typeNode, annotationNode); + handleConstructor.generateRequiredArgsConstructor( typeNode, AccessLevel.PUBLIC, ann.staticConstructor(), SkipIfConstructorExists.YES, Collections.emptyList(), annotationNode); } -- cgit From 72d22582bbb5ed7a33c3cee196248fcdaa65d541 Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Thu, 22 Feb 2018 19:25:36 +0900 Subject: add jdk-10.sh for openjdk10, update jdk-9 version (#1572) add jdk10.sh to download openjdk10+44 EA. update jdk 9.0.1 -> 9.0.4 --- docker/provision/jdk/java-10.sh | 4 ++++ docker/provision/jdk/java-8.sh | 0 docker/provision/jdk/java-9.sh | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 docker/provision/jdk/java-10.sh mode change 100644 => 100755 docker/provision/jdk/java-8.sh mode change 100644 => 100755 docker/provision/jdk/java-9.sh diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh new file mode 100755 index 00000000..ecdafc8b --- /dev/null +++ b/docker/provision/jdk/java-10.sh @@ -0,0 +1,4 @@ +apt-get update && apt-get install -y wget +wget https://download.java.net/java/jdk10/archive/44/GPL/openjdk-10+44_linux-x64_bin.tar.gz -O jdk.tar.gz +tar -xzf jdk.tar.gz -C /opt/ +mv /opt/jdk-10 /opt/jdk diff --git a/docker/provision/jdk/java-8.sh b/docker/provision/jdk/java-8.sh old mode 100644 new mode 100755 diff --git a/docker/provision/jdk/java-9.sh b/docker/provision/jdk/java-9.sh old mode 100644 new mode 100755 index 2023ae39..fd488dc8 --- a/docker/provision/jdk/java-9.sh +++ b/docker/provision/jdk/java-9.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz -O jdk.tar.gz +wget --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/9.0.4+11/c2514751926b4512b076cc82f959763f/jdk-9.0.4_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt/ -mv /opt/jdk-9.0.1 /opt/jdk +mv /opt/jdk-9.0.4 /opt/jdk -- cgit From cde38e51544544b5466181237a99483834c33b1f Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Thu, 22 Feb 2018 19:28:47 +0900 Subject: fix permissions of docker provision scripts --- docker/provision/ant/ant-1.10.1.sh | 0 docker/provision/gradle/gradle-4.2.1.sh | 0 docker/provision/maven/maven-3.5.0.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/provision/ant/ant-1.10.1.sh mode change 100644 => 100755 docker/provision/gradle/gradle-4.2.1.sh mode change 100644 => 100755 docker/provision/maven/maven-3.5.0.sh diff --git a/docker/provision/ant/ant-1.10.1.sh b/docker/provision/ant/ant-1.10.1.sh old mode 100644 new mode 100755 diff --git a/docker/provision/gradle/gradle-4.2.1.sh b/docker/provision/gradle/gradle-4.2.1.sh old mode 100644 new mode 100755 diff --git a/docker/provision/maven/maven-3.5.0.sh b/docker/provision/maven/maven-3.5.0.sh old mode 100644 new mode 100755 -- cgit From 3b46a241604496d716a57f078e27a254b03757c4 Mon Sep 17 00:00:00 2001 From: Krzysztof Krason Date: Fri, 2 Mar 2018 16:43:25 +0100 Subject: updated java 10 download --- docker/provision/jdk/java-10.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh index cdbfa9d1..e42afe44 100644 --- a/docker/provision/jdk/java-10.sh +++ b/docker/provision/jdk/java-10.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/jdk10/archive/42/BCL/jdk-10-ea+42_linux-x64_bin.tar.gz -O jdk.tar.gz +wget https://download.java.net/java/jdk10/archive/45/BCL/jdk-10+45_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt mv /opt/jdk-10 /opt/jdk -- cgit From 595a3041a01602d9a28aefe71bad021353900253 Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Wed, 21 Mar 2018 11:40:47 +0900 Subject: [fix] Fix intellij build with jdk10 (#1572) Add a JavaFileManager class name to KNOWN_JAVA9_FILE_MANAGERS. --- src/core/lombok/javac/apt/LombokFileObjects.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java index 7184629f..f74c7d22 100644 --- a/src/core/lombok/javac/apt/LombokFileObjects.java +++ b/src/core/lombok/javac/apt/LombokFileObjects.java @@ -106,7 +106,8 @@ final class LombokFileObjects { "com.google.devtools.build.buildjar.javac.BlazeJavacMain$ClassloaderMaskingFileManager", "com.google.devtools.build.java.turbine.javac.JavacTurbineCompiler$ClassloaderMaskingFileManager", "org.netbeans.modules.java.source.parsing.ProxyFileManager", - "com.sun.tools.javac.api.ClientCodeWrapper$WrappedStandardJavaFileManager" + "com.sun.tools.javac.api.ClientCodeWrapper$WrappedStandardJavaFileManager", + "com.sun.tools.javac.main.DelegatingJavaFileManager$DelegatingSJFM" // IntelliJ + JDK10 ); static Compiler getCompiler(JavaFileManager jfm) { -- cgit From 57b66fd5767354ec611a2e2d96d8cf3968513118 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 21 Mar 2018 21:54:07 +0200 Subject: fixed ExtensionMethod example to return T (generic type) , seem to remove or forgot for some reason... --- website/templates/features/experimental/ExtensionMethod.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/features/experimental/ExtensionMethod.html b/website/templates/features/experimental/ExtensionMethod.html index ca63bb2e..f1d8b084 100644 --- a/website/templates/features/experimental/ExtensionMethod.html +++ b/website/templates/features/experimental/ExtensionMethod.html @@ -36,7 +36,7 @@

Lombok does not (currently) have any runtime dependencies which means lombok does not (currently) ship with any useful extension methods so you'll have to make your own. However, here's one that might spark your imagination: 

public class ObjectExtensions {
-	public static <T> or(T object, T ifNull) {
+	public static <T> T or(T object, T ifNull) {
 		return object != null ? object : ifNull;
 	}
 }

-- cgit From 6fa43957d70a2de2bb31e6a0e4f6978bf4a78d47 Mon Sep 17 00:00:00 2001 From: Krzysztof Krason Date: Thu, 22 Mar 2018 09:51:06 +0100 Subject: using GA java 10 --- docker/provision/jdk/java-10.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh index e42afe44..2fcffa60 100644 --- a/docker/provision/jdk/java-10.sh +++ b/docker/provision/jdk/java-10.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget https://download.java.net/java/jdk10/archive/45/BCL/jdk-10+45_linux-x64_bin.tar.gz -O jdk.tar.gz +wget --inet4-only -c --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/10+46/76eac37278c24557a3c4199677f19b62/jdk-10_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt mv /opt/jdk-10 /opt/jdk -- cgit From 16b77c03bf19378e103fbf58ca30e270005d9488 Mon Sep 17 00:00:00 2001 From: Krzysztof Krason Date: Thu, 22 Mar 2018 09:52:09 +0100 Subject: removed inet4 enforcement --- docker/provision/jdk/java-10.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/provision/jdk/java-10.sh b/docker/provision/jdk/java-10.sh index 2fcffa60..0ab52946 100644 --- a/docker/provision/jdk/java-10.sh +++ b/docker/provision/jdk/java-10.sh @@ -1,4 +1,4 @@ apt-get update && apt-get install -y wget -wget --inet4-only -c --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/10+46/76eac37278c24557a3c4199677f19b62/jdk-10_linux-x64_bin.tar.gz -O jdk.tar.gz +wget -c --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/10+46/76eac37278c24557a3c4199677f19b62/jdk-10_linux-x64_bin.tar.gz -O jdk.tar.gz tar -xzf jdk.tar.gz -C /opt mv /opt/jdk-10 /opt/jdk -- cgit From 3e0cdf5dc2119dcf860fb9effabc89523dee3975 Mon Sep 17 00:00:00 2001 From: Takuya Murakami Date: Sat, 24 Mar 2018 16:31:05 +0900 Subject: improve compiler detection for jdk9 later. --- src/core/lombok/javac/apt/LombokFileObjects.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java index f74c7d22..aba10540 100644 --- a/src/core/lombok/javac/apt/LombokFileObjects.java +++ b/src/core/lombok/javac/apt/LombokFileObjects.java @@ -130,6 +130,10 @@ final class LombokFileObjects { } catch (Throwable e) {} } + try { + if (Class.forName("com.sun.tools.javac.file.PathFileObject") == null) throw new NullPointerException(); + return new Java9Compiler(jfm); + } catch (Throwable e) {} try { if (Class.forName("com.sun.tools.javac.file.BaseFileObject") == null) throw new NullPointerException(); return Compiler.JAVAC7; -- cgit From 44fb322c8501ca44faaddbbdb9743a38ec1e2d52 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 27 Mar 2018 20:35:16 +0200 Subject: rt-openjdk6 is downloaded from the lombok site, we had a weird version up there for a while that broke the build, we fixed it, but you won’t know until you do some fairly fancy cleaning (a complete re-clone or a distclean). Updated build script to scan for anything that isn’t the right version and re-download. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 645114a7..f6988255 100644 --- a/build.xml +++ b/build.xml @@ -28,8 +28,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - - + + + + + + -- cgit From 54ad28b71e5c40d532c92fc4e863cb342883da4a Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 27 Mar 2018 20:40:59 +0200 Subject: Fixes #1613: add support for STS4 --- .../installer/eclipse/STS4LocationProvider.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/installer/lombok/installer/eclipse/STS4LocationProvider.java diff --git a/src/installer/lombok/installer/eclipse/STS4LocationProvider.java b/src/installer/lombok/installer/eclipse/STS4LocationProvider.java new file mode 100644 index 00000000..47a07bdd --- /dev/null +++ b/src/installer/lombok/installer/eclipse/STS4LocationProvider.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2018 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.installer.eclipse; + +import java.util.Arrays; +import java.util.Collections; + +import lombok.installer.IdeLocationProvider; + +import org.mangosdk.spi.ProviderFor; + +@ProviderFor(IdeLocationProvider.class) +public class STS4LocationProvider extends EclipseProductLocationProvider { + + private static final EclipseProductDescriptor STS4 = new StandardProductDescriptor("Spring Tools Suite 4", + "SpringToolSuite4", + "sts", + STS4LocationProvider.class.getResource("STS.png"), + Collections.unmodifiableList(Arrays.asList("springsource", "spring-tool-suite")) + ); + + public STS4LocationProvider() { + super(STS4); + } +} -- cgit From 2a55bfa0bd0949dfc1ee6f46c27052f669234053 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 27 Mar 2018 21:23:33 +0200 Subject: [JDK10] Building lombok on JDK10 now works fine. --- build.xml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index f6988255..b55b2866 100644 --- a/build.xml +++ b/build.xml @@ -28,11 +28,18 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + + - + + + + + + @@ -102,12 +109,17 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + - + + + + + + - + @@ -127,9 +139,10 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + + @@ -164,10 +177,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + + @@ -176,6 +191,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + @@ -208,16 +224,19 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + + + @@ -239,6 +258,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + @@ -512,6 +532,7 @@ ${sourceWarning} + -- cgit From 01bbd212e943c726049ad3d837d7a876f02e08d3 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 27 Mar 2018 22:04:43 +0200 Subject: [trivial] some memoryload improvements by not making a new instance but using a cached one instead. Fixes issue #1579 --- .../lombok/eclipse/handlers/EclipseHandlerUtil.java | 2 +- src/core/lombok/eclipse/handlers/HandleBuilder.java | 4 +++- .../lombok/eclipse/handlers/HandleConstructor.java | 12 +++++++++--- src/core/lombok/eclipse/handlers/HandleData.java | 1 - src/core/lombok/eclipse/handlers/HandleGetter.java | 2 +- src/core/lombok/eclipse/handlers/HandleValue.java | 16 +++++++++++----- src/core/lombok/javac/handlers/HandleBuilder.java | 4 +++- src/core/lombok/javac/handlers/HandleConstructor.java | 12 +++++++++--- src/core/lombok/javac/handlers/HandleData.java | 17 +++++++++++------ src/core/lombok/javac/handlers/HandleGetter.java | 2 +- src/core/lombok/javac/handlers/HandleValue.java | 18 +++++++++++------- src/core/lombok/javac/handlers/JavacHandlerUtil.java | 2 +- 12 files changed, 61 insertions(+), 31 deletions(-) diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index e36e80bc..6617d21a 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -897,7 +897,7 @@ public class EclipseHandlerUtil { // Check if the class has a @Getter annotation. - if (!hasGetterAnnotation && new HandleGetter().fieldQualifiesForGetterGeneration(field)) { + if (!hasGetterAnnotation && HandleGetter.fieldQualifiesForGetterGeneration(field)) { //Check if the class has @Getter or @Data annotation. EclipseNode containingType = field.up(); diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index dd862393..d4cdc654 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -89,6 +89,8 @@ import lombok.experimental.NonFinal; @ProviderFor(EclipseAnnotationHandler.class) @HandlerPriority(-1024) //-2^10; to ensure we've picked up @FieldDefault's changes (-2048) but @Value hasn't removed itself yet (-512), so that we can error on presence of it on the builder classes. public class HandleBuilder extends EclipseAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + private static final char[] CLEAN_FIELD_NAME = "$lombokUnclean".toCharArray(); private static final char[] CLEAN_METHOD_NAME = "$lombokClean".toCharArray(); @@ -225,7 +227,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { allFields.add(fieldNode); } - new HandleConstructor().generateConstructor(tdParent, AccessLevel.PACKAGE, allFields, false, null, SkipIfConstructorExists.I_AM_BUILDER, + handleConstructor.generateConstructor(tdParent, AccessLevel.PACKAGE, allFields, false, null, SkipIfConstructorExists.I_AM_BUILDER, Collections.emptyList(), annotationNode); returnType = namePlusTypeParamsToTypeReference(td.name, td.typeParameters, p); diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java index 4263e3e9..62e2c18c 100644 --- a/src/core/lombok/eclipse/handlers/HandleConstructor.java +++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java @@ -80,6 +80,8 @@ import org.mangosdk.spi.ProviderFor; public class HandleConstructor { @ProviderFor(EclipseAnnotationHandler.class) public static class HandleNoArgsConstructor extends EclipseAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.NO_ARGS_CONSTRUCTOR_FLAG_USAGE, "@NoArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -95,12 +97,14 @@ public class HandleConstructor { List fields = force ? findFinalFields(typeNode) : Collections.emptyList(); List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@NoArgsConstructor(onConstructor", annotationNode); - new HandleConstructor().generateConstructor(typeNode, level, fields, force, staticName, SkipIfConstructorExists.NO, onConstructor, annotationNode); + handleConstructor.generateConstructor(typeNode, level, fields, force, staticName, SkipIfConstructorExists.NO, onConstructor, annotationNode); } } @ProviderFor(EclipseAnnotationHandler.class) public static class HandleRequiredArgsConstructor extends EclipseAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.REQUIRED_ARGS_CONSTRUCTOR_FLAG_USAGE, "@RequiredArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -116,7 +120,7 @@ public class HandleConstructor { List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@RequiredArgsConstructor(onConstructor", annotationNode); - new HandleConstructor().generateConstructor( + handleConstructor.generateConstructor( typeNode, level, findRequiredFields(typeNode), false, staticName, SkipIfConstructorExists.NO, onConstructor, annotationNode); } @@ -163,6 +167,8 @@ public class HandleConstructor { @ProviderFor(EclipseAnnotationHandler.class) public static class HandleAllArgsConstructor extends EclipseAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -178,7 +184,7 @@ public class HandleConstructor { List onConstructor = unboxAndRemoveAnnotationParameter(ast, "onConstructor", "@AllArgsConstructor(onConstructor", annotationNode); - new HandleConstructor().generateConstructor( + handleConstructor.generateConstructor( typeNode, level, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, onConstructor, annotationNode); } diff --git a/src/core/lombok/eclipse/handlers/HandleData.java b/src/core/lombok/eclipse/handlers/HandleData.java index 7c674ba9..025ceefd 100644 --- a/src/core/lombok/eclipse/handlers/HandleData.java +++ b/src/core/lombok/eclipse/handlers/HandleData.java @@ -43,7 +43,6 @@ import org.mangosdk.spi.ProviderFor; */ @ProviderFor(EclipseAnnotationHandler.class) public class HandleData extends EclipseAnnotationHandler { - private HandleGetter handleGetter = new HandleGetter(); private HandleSetter handleSetter = new HandleSetter(); private HandleEqualsAndHashCode handleEqualsAndHashCode = new HandleEqualsAndHashCode(); diff --git a/src/core/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java index c11303f3..f417aca5 100644 --- a/src/core/lombok/eclipse/handlers/HandleGetter.java +++ b/src/core/lombok/eclipse/handlers/HandleGetter.java @@ -105,7 +105,7 @@ public class HandleGetter extends EclipseAnnotationHandler { return true; } - public boolean fieldQualifiesForGetterGeneration(EclipseNode field) { + public static boolean fieldQualifiesForGetterGeneration(EclipseNode field) { if (field.getKind() != Kind.FIELD) return false; FieldDeclaration fieldDecl = (FieldDeclaration) field.get(); return filterField(fieldDecl); diff --git a/src/core/lombok/eclipse/handlers/HandleValue.java b/src/core/lombok/eclipse/handlers/HandleValue.java index 79c11771..a61ca6c3 100644 --- a/src/core/lombok/eclipse/handlers/HandleValue.java +++ b/src/core/lombok/eclipse/handlers/HandleValue.java @@ -47,6 +47,12 @@ import org.mangosdk.spi.ProviderFor; @ProviderFor(EclipseAnnotationHandler.class) @HandlerPriority(-512) //-2^9; to ensure @EqualsAndHashCode and such pick up on this handler making the class final and messing with the fields' access levels, run earlier. public class HandleValue extends EclipseAnnotationHandler { + private HandleFieldDefaults handleFieldDefaults = new HandleFieldDefaults(); + private HandleGetter handleGetter = new HandleGetter(); + private HandleEqualsAndHashCode handleEqualsAndHashCode = new HandleEqualsAndHashCode(); + private HandleToString handleToString = new HandleToString(); + private HandleConstructor handleConstructor = new HandleConstructor(); + public void handle(AnnotationValues annotation, Annotation ast, EclipseNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.VALUE_FLAG_USAGE, "@Value"); @@ -72,7 +78,7 @@ public class HandleValue extends EclipseAnnotationHandler { } } - new HandleFieldDefaults().generateFieldDefaultsForType(typeNode, annotationNode, AccessLevel.PRIVATE, true, true); + handleFieldDefaults.generateFieldDefaultsForType(typeNode, annotationNode, AccessLevel.PRIVATE, true, true); //Careful: Generate the public static constructor (if there is one) LAST, so that any attempt to //'find callers' on the annotation node will find callers of the constructor, which is by far the @@ -80,10 +86,10 @@ public class HandleValue extends EclipseAnnotationHandler { //for whatever reason, though you can find callers of that one by focusing on the class name itself //and hitting 'find callers'. - new HandleGetter().generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode); - new HandleToString().generateToStringForType(typeNode, annotationNode); - new HandleConstructor().generateAllArgsConstructor(typeNode, AccessLevel.PUBLIC, ann.staticConstructor(), SkipIfConstructorExists.YES, + handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleEqualsAndHashCode.generateEqualsAndHashCodeForType(typeNode, annotationNode); + handleToString.generateToStringForType(typeNode, annotationNode); + handleConstructor.generateAllArgsConstructor(typeNode, AccessLevel.PUBLIC, ann.staticConstructor(), SkipIfConstructorExists.YES, Collections.emptyList(), annotationNode); } } diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index 0631f12a..86ac00e6 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -74,6 +74,8 @@ import static lombok.javac.JavacTreeMaker.TypeTag.*; @ProviderFor(JavacAnnotationHandler.class) @HandlerPriority(-1024) //-2^10; to ensure we've picked up @FieldDefault's changes (-2048) but @Value hasn't removed itself yet (-512), so that we can error on presence of it on the builder classes. public class HandleBuilder extends JavacAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + private static final boolean toBoolean(Object expr, boolean defaultValue) { if (expr == null) return defaultValue; if (expr instanceof JCLiteral) return ((Integer) ((JCLiteral) expr).value) != 0; @@ -176,7 +178,7 @@ public class HandleBuilder extends JavacAnnotationHandler { allFields.append(fieldNode); } - new HandleConstructor().generateConstructor(tdParent, AccessLevel.PACKAGE, List.nil(), allFields.toList(), false, null, SkipIfConstructorExists.I_AM_BUILDER, annotationNode); + handleConstructor.generateConstructor(tdParent, AccessLevel.PACKAGE, List.nil(), allFields.toList(), false, null, SkipIfConstructorExists.I_AM_BUILDER, annotationNode); returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), td.name, td.typarams); typeParams = td.typarams; diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java index b3261379..dca25ee7 100644 --- a/src/core/lombok/javac/handlers/HandleConstructor.java +++ b/src/core/lombok/javac/handlers/HandleConstructor.java @@ -64,6 +64,8 @@ import com.sun.tools.javac.util.Name; public class HandleConstructor { @ProviderFor(JavacAnnotationHandler.class) public static class HandleNoArgsConstructor extends JavacAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.NO_ARGS_CONSTRUCTOR_FLAG_USAGE, "@NoArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -78,12 +80,14 @@ public class HandleConstructor { String staticName = ann.staticName(); boolean force = ann.force(); List fields = force ? findFinalFields(typeNode) : List.nil(); - new HandleConstructor().generateConstructor(typeNode, level, onConstructor, fields, force, staticName, SkipIfConstructorExists.NO, annotationNode); + handleConstructor.generateConstructor(typeNode, level, onConstructor, fields, force, staticName, SkipIfConstructorExists.NO, annotationNode); } } @ProviderFor(JavacAnnotationHandler.class) public static class HandleRequiredArgsConstructor extends JavacAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.REQUIRED_ARGS_CONSTRUCTOR_FLAG_USAGE, "@RequiredArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -100,7 +104,7 @@ public class HandleConstructor { annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); } - new HandleConstructor().generateConstructor(typeNode, level, onConstructor, findRequiredFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); + handleConstructor.generateConstructor(typeNode, level, onConstructor, findRequiredFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); } } @@ -131,6 +135,8 @@ public class HandleConstructor { @ProviderFor(JavacAnnotationHandler.class) public static class HandleAllArgsConstructor extends JavacAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.ALL_ARGS_CONSTRUCTOR_FLAG_USAGE, "@AllArgsConstructor", ConfigurationKeys.ANY_CONSTRUCTOR_FLAG_USAGE, "any @xArgsConstructor"); @@ -146,7 +152,7 @@ public class HandleConstructor { if (annotation.isExplicit("suppressConstructorProperties")) { annotationNode.addError("This deprecated feature is no longer supported. Remove it; you can create a lombok.config file with 'lombok.anyConstructor.suppressConstructorProperties = true'."); } - new HandleConstructor().generateConstructor(typeNode, level, onConstructor, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); + handleConstructor.generateConstructor(typeNode, level, onConstructor, findAllFields(typeNode), false, staticName, SkipIfConstructorExists.NO, annotationNode); } } diff --git a/src/core/lombok/javac/handlers/HandleData.java b/src/core/lombok/javac/handlers/HandleData.java index 9ecf8754..15f1fd83 100644 --- a/src/core/lombok/javac/handlers/HandleData.java +++ b/src/core/lombok/javac/handlers/HandleData.java @@ -40,6 +40,12 @@ import com.sun.tools.javac.tree.JCTree.JCAnnotation; */ @ProviderFor(JavacAnnotationHandler.class) public class HandleData extends JavacAnnotationHandler { + private HandleConstructor handleConstructor = new HandleConstructor(); + private HandleGetter handleGetter = new HandleGetter(); + private HandleSetter handleSetter = new HandleSetter(); + private HandleEqualsAndHashCode handleEqualsAndHashCode = new HandleEqualsAndHashCode(); + private HandleToString handleToString = new HandleToString(); + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.DATA_FLAG_USAGE, "@Data"); @@ -54,11 +60,10 @@ public class HandleData extends JavacAnnotationHandler { String staticConstructorName = annotation.getInstance().staticConstructor(); - // TODO move this to the end OR move it to the top in eclipse. - new HandleConstructor().generateRequiredArgsConstructor(typeNode, AccessLevel.PUBLIC, staticConstructorName, SkipIfConstructorExists.YES, annotationNode); - new HandleGetter().generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleSetter().generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode); - new HandleToString().generateToStringForType(typeNode, annotationNode); + handleConstructor.generateRequiredArgsConstructor(typeNode, AccessLevel.PUBLIC, staticConstructorName, SkipIfConstructorExists.YES, annotationNode); + handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleSetter.generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleEqualsAndHashCode.generateEqualsAndHashCodeForType(typeNode, annotationNode); + handleToString.generateToStringForType(typeNode, annotationNode); } } diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 5a2e1993..0540465d 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -95,7 +95,7 @@ public class HandleGetter extends JavacAnnotationHandler { } } - public boolean fieldQualifiesForGetterGeneration(JavacNode field) { + public static boolean fieldQualifiesForGetterGeneration(JavacNode field) { if (field.getKind() != Kind.FIELD) return false; JCVariableDecl fieldDecl = (JCVariableDecl) field.get(); //Skip fields that start with $ diff --git a/src/core/lombok/javac/handlers/HandleValue.java b/src/core/lombok/javac/handlers/HandleValue.java index 3961085c..d1af4168 100644 --- a/src/core/lombok/javac/handlers/HandleValue.java +++ b/src/core/lombok/javac/handlers/HandleValue.java @@ -47,6 +47,12 @@ import com.sun.tools.javac.tree.JCTree.JCModifiers; @ProviderFor(JavacAnnotationHandler.class) @HandlerPriority(-512) //-2^9; to ensure @EqualsAndHashCode and such pick up on this handler making the class final and messing with the fields' access levels, run earlier. public class HandleValue extends JavacAnnotationHandler { + private HandleFieldDefaults handleFieldDefaults = new HandleFieldDefaults(); + private HandleConstructor handleConstructor = new HandleConstructor(); + private HandleGetter handleGetter = new HandleGetter(); + private HandleEqualsAndHashCode handleEqualsAndHashCode = new HandleEqualsAndHashCode(); + private HandleToString handleToString = new HandleToString(); + @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { handleFlagUsage(annotationNode, ConfigurationKeys.VALUE_FLAG_USAGE, "@Value"); @@ -68,12 +74,10 @@ public class HandleValue extends JavacAnnotationHandler { typeNode.rebuild(); } } - new HandleFieldDefaults().generateFieldDefaultsForType(typeNode, annotationNode, AccessLevel.PRIVATE, true, true); - - // TODO move this to the end OR move it to the top in eclipse. - new HandleConstructor().generateAllArgsConstructor(typeNode, AccessLevel.PUBLIC, staticConstructorName, SkipIfConstructorExists.YES, annotationNode); - new HandleGetter().generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); - new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode); - new HandleToString().generateToStringForType(typeNode, annotationNode); + handleFieldDefaults.generateFieldDefaultsForType(typeNode, annotationNode, AccessLevel.PRIVATE, true, true); + handleConstructor.generateAllArgsConstructor(typeNode, AccessLevel.PUBLIC, staticConstructorName, SkipIfConstructorExists.YES, annotationNode); + handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true); + handleEqualsAndHashCode.generateEqualsAndHashCodeForType(typeNode, annotationNode); + handleToString.generateToStringForType(typeNode, annotationNode); } } diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 584c78c5..65d09a9a 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -818,7 +818,7 @@ public class JavacHandlerUtil { // Check if the class has a @Getter annotation. - if (!hasGetterAnnotation && new HandleGetter().fieldQualifiesForGetterGeneration(field)) { + if (!hasGetterAnnotation && HandleGetter.fieldQualifiesForGetterGeneration(field)) { //Check if the class has @Getter or @Data annotation. JavacNode containingType = field.up(); -- cgit From 113d1eb86190d73ab6d99225555c2ba2b07b9dd0 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 27 Mar 2018 22:08:52 +0200 Subject: Fixes #1608: give pages a title --- website/resources/js/supporters.js | 2 ++ website/templates/_download-edge.html | 2 +- website/templates/_scaffold.html | 4 ++-- website/templates/all-versions.html | 2 +- website/templates/changelog.html | 2 +- website/templates/contributing.html | 2 +- website/templates/credits.html | 2 +- website/templates/disable-checked-exceptions.html | 2 +- website/templates/download-edge.html | 2 +- website/templates/download.html | 2 +- website/templates/features/_features.html | 2 +- website/templates/features/experimental/index.html | 2 +- website/templates/features/index.html | 2 +- website/templates/order-license-info.html | 2 +- website/templates/order-license.html | 2 +- website/templates/setup/_setup.html | 2 +- website/templates/supporters.html | 2 +- 17 files changed, 19 insertions(+), 17 deletions(-) diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js index 11f77640..07319226 100644 --- a/website/resources/js/supporters.js +++ b/website/resources/js/supporters.js @@ -153,6 +153,8 @@ shuffle(list); var len = list.length; + if (!len) return; + var pos = 0; var c = [], cd = []; for (var i = 0; i < supPerBar; i++) { diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html index b5e8af0b..e7eb856c 100644 --- a/website/templates/_download-edge.html +++ b/website/templates/_download-edge.html @@ -1,5 +1,5 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="snapshot">
<@main.h1 title="Download 'Edgy Guinea Pig' - the Lombok Cutting Edge build" /> diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html index 646f0247..8bb22635 100644 --- a/website/templates/_scaffold.html +++ b/website/templates/_scaffold.html @@ -31,7 +31,7 @@ } }> -<#macro scaffold load=[]> +<#macro scaffold load=[] title='Project Lombok'> @@ -41,7 +41,7 @@ - Project Lombok + ${title} diff --git a/website/templates/all-versions.html b/website/templates/all-versions.html index 0c07a520..0207b351 100644 --- a/website/templates/all-versions.html +++ b/website/templates/all-versions.html @@ -1,5 +1,5 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="older versions">
diff --git a/website/templates/changelog.html b/website/templates/changelog.html index c02deba7..79ba7b2a 100644 --- a/website/templates/changelog.html +++ b/website/templates/changelog.html @@ -1,5 +1,5 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="changelog">
${changelog?no_esc} diff --git a/website/templates/contributing.html b/website/templates/contributing.html index 3a99c77a..16d68f32 100644 --- a/website/templates/contributing.html +++ b/website/templates/contributing.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Contribute">
<@main.h1 title="Contributing to Project Lombok's development" /> diff --git a/website/templates/credits.html b/website/templates/credits.html index 925ba2d4..3390d762 100644 --- a/website/templates/credits.html +++ b/website/templates/credits.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Credits">
<@main.h1 title="Project Lombok - About the authors and everyone that's helped us create Project Lombok." /> diff --git a/website/templates/disable-checked-exceptions.html b/website/templates/disable-checked-exceptions.html index ccbd0c01..4a758b11 100644 --- a/website/templates/disable-checked-exceptions.html +++ b/website/templates/disable-checked-exceptions.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Disable Checked Exceptions">

Tired of checked exceptions?

diff --git a/website/templates/download-edge.html b/website/templates/download-edge.html index 469f1284..22044842 100644 --- a/website/templates/download-edge.html +++ b/website/templates/download-edge.html @@ -1,5 +1,5 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="snapshot">
No edge build has been released since the last stable release of lombok. diff --git a/website/templates/download.html b/website/templates/download.html index a6b21402..3eb5787b 100644 --- a/website/templates/download.html +++ b/website/templates/download.html @@ -1,5 +1,5 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Download">
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html index dcee152c..f602b95b 100644 --- a/website/templates/features/_features.html +++ b/website/templates/features/_features.html @@ -64,7 +64,7 @@ <#macro scaffold title logline load=[]> - <@main.scaffold load> + <@main.scaffold load title>
diff --git a/website/templates/features/experimental/index.html b/website/templates/features/experimental/index.html index dbd2f93c..21e8fceb 100644 --- a/website/templates/features/experimental/index.html +++ b/website/templates/features/experimental/index.html @@ -1,7 +1,7 @@ <#import "../../_scaffold.html" as main> <#import "../_features.html" as f> -<@main.scaffold> +<@main.scaffold title="Experimental">
<@main.h1 title="Lombok experimental features" /> diff --git a/website/templates/features/index.html b/website/templates/features/index.html index d077ab4d..cd4c9e26 100644 --- a/website/templates/features/index.html +++ b/website/templates/features/index.html @@ -1,6 +1,6 @@ <#import "../_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Stable">
<@main.h1 title="Lombok features" /> diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html index 724e44f7..3572ad0f 100644 --- a/website/templates/order-license-info.html +++ b/website/templates/order-license-info.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold> +<@main.scaffold title="Order / Donate">

Order a professional or enterprise license

diff --git a/website/templates/order-license.html b/website/templates/order-license.html index a364fc79..818c27f3 100644 --- a/website/templates/order-license.html +++ b/website/templates/order-license.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold load=["/js/order-license.js"]> +<@main.scaffold load=["/js/order-license.js"] title="Order a license">

Order a professional or enterprise license

diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html index d5a88fb7..166891ce 100644 --- a/website/templates/setup/_setup.html +++ b/website/templates/setup/_setup.html @@ -15,7 +15,7 @@ <#macro scaffold title load=[]> - <@main.scaffold load> + <@main.scaffold load title>
diff --git a/website/templates/supporters.html b/website/templates/supporters.html index 2003a23f..9facb090 100644 --- a/website/templates/supporters.html +++ b/website/templates/supporters.html @@ -1,6 +1,6 @@ <#import "/_scaffold.html" as main> -<@main.scaffold load=["js/supporters.js"]> +<@main.scaffold load=["js/supporters.js"] title="Supporters">

Project Lombok supporters

-- cgit From 92aa6854fa54e11607ff4c1c7fe18a4aa1607494 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 27 Mar 2018 22:09:51 +0200 Subject: fix javadoc warnings --- src/core/lombok/ConfigurationKeys.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index 4ea3b91a..29c43d3f 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -42,7 +42,7 @@ public class ConfigurationKeys { * lombok configuration: {@code lombok.addGeneratedAnnotation} = {@code true} | {@code false}. * * If {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated, unless {@code lombok.addJavaxGeneratedAnnotation} is set. - *
+ *
* BREAKING CHANGE: Starting with lombok v2.0.0, defaults to {@code false} instead of {@code true}, as this annotation is broken in JDK9. * * @see ConfigurationKeys#ADD_JAVAX_GENERATED_ANNOTATIONS @@ -56,7 +56,7 @@ public class ConfigurationKeys { * lombok configuration: {@code lombok.addJavaxGeneratedAnnotation} = {@code true} | {@code false}. * * If {@code true}, lombok generates {@code @javax.annotation.Generated("lombok")} on all fields, methods, and types that are generated. - *
+ *
* BREAKING CHANGE: Starting with lombok v2.0.0, defaults to {@code false} instead of {@code true}, as this annotation is broken in JDK9. */ public static final ConfigurationKey ADD_JAVAX_GENERATED_ANNOTATIONS = new ConfigurationKey("lombok.addJavaxGeneratedAnnotation", "Generate @javax.annotation.Generated on all generated code (default: follow lombok.addGeneratedAnnotation).") {}; @@ -94,7 +94,7 @@ public class ConfigurationKeys { * * NB: GWT projects, and probably android projects, should explicitly set this key to {@code true} for the entire project. * - *
+ *
* BREAKING CHANGE: Starting with lombok v2.0.0, defaults to {@code false} instead of {@code true}, as {@code @ConstructorProperties} requires extra modules in JDK9. * * @see ConfigurationKeys#ANY_CONSTRUCTOR_ADD_CONSTRUCTOR_PROPERTIES -- cgit From c709f8b949c83a50e734372b1acea697839f7c9e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 27 Mar 2018 22:17:05 +0200 Subject: [trivial] eclipse patches are loaded from Class50 even if you override the shadowloader classpath, but only if you have lombok.jar in there. This solves exotic problems if you try to add some features to lombok in a separate jar, and addresses issue #1523 --- src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 135b5c77..33d7a496 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -23,6 +23,7 @@ package lombok.eclipse.agent; import static lombok.patcher.scripts.ScriptBuilder.*; +import java.io.File; import java.lang.instrument.Instrumentation; import java.net.URLClassLoader; import java.security.ProtectionDomain; @@ -86,7 +87,7 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable { } }); - final boolean forceBaseResourceNames = !"".equals(System.getProperty("shadow.override.lombok", "")); + final boolean forceBaseResourceNames = shouldForceBaseResourceNames(); sm.setTransplantMapper(new TransplantMapper() { public String mapResourceName(int classFileFormatVersion, String resourceName) { if (classFileFormatVersion < 50 || forceBaseResourceNames) return resourceName; @@ -125,6 +126,15 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable { if (reloadExistingClasses) sm.reloadClasses(instrumentation); } + private static boolean shouldForceBaseResourceNames() { + String shadowOverride = System.getProperty("shadow.override.lombok", ""); + if (shadowOverride == null || shadowOverride.length() == 0) return false; + for (String part : shadowOverride.split("\\s*" + (File.pathSeparatorChar == ';' ? ";" : ":") + "\\s*")) { + if (part.equalsIgnoreCase("lombok.jar")) return false; + } + return true; + } + private static void patchRenameField(ScriptManager sm) { /* RefactoringSearchEngine.search will not return results when renaming field and Data Annotation is present. Return a fake Element to make checks pass */ sm.addScript(ScriptBuilder.wrapMethodCall() -- cgit From 327def3adad63510e9b9202efa3108acd505c4b7 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 27 Mar 2018 23:00:36 +0200 Subject: Previous add to the build system to verify checksums is not really workable in ant without a page worth of tasks so reverted that and went with a renamed file instead to solve the problem of having served the wrong rt.jar for a while. --- build.xml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/build.xml b/build.xml index b55b2866..91b7940a 100644 --- a/build.xml +++ b/build.xml @@ -28,18 +28,10 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - - - - - - - - - - - - + + + + -- cgit From af9861ad9f7151c6d12f56ecf11d7ce10826201a Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 27 Mar 2018 23:31:45 +0200 Subject: add subresource integrity to external resources on webpage --- website/templates/_scaffold.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html index 8bb22635..e3096d7d 100644 --- a/website/templates/_scaffold.html +++ b/website/templates/_scaffold.html @@ -43,10 +43,12 @@ ${title} - + - + @@ -55,8 +57,10 @@ - - + + -- cgit