diff options
author | Christian Nüssgens <christian@nuessgens.com> | 2018-03-28 19:13:10 +0200 |
---|---|---|
committer | Christian Nüssgens <christian@nuessgens.com> | 2018-03-28 19:13:10 +0200 |
commit | 96cd4f5010d30aa08835f592403e6a7aceb23e46 (patch) | |
tree | 978a3672dd32d78e9eeef8caf28dba63fc7dce8c /website/templates/features | |
parent | 06da0854e93df222603fcc2e51c9594c16899087 (diff) | |
parent | af9861ad9f7151c6d12f56ecf11d7ce10826201a (diff) | |
download | lombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.tar.gz lombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.tar.bz2 lombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.zip |
Merge remote-tracking branch 'remotes/upstream/master'
Diffstat (limited to 'website/templates/features')
-rw-r--r-- | website/templates/features/_features.html | 2 | ||||
-rw-r--r-- | website/templates/features/experimental/ExtensionMethod.html | 2 | ||||
-rw-r--r-- | website/templates/features/experimental/index.html | 2 | ||||
-rw-r--r-- | website/templates/features/index.html | 2 |
4 files changed, 4 insertions, 4 deletions
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> <#macro scaffold title logline load=[]> - <@main.scaffold load> + <@main.scaffold load title> <div class="page-header top5" id="featureContent"> <div class="row text-center"> <div class="header-group"> 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 @@ </p><p> 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: <br /> <pre>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; } }</pre><br /> 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"> <div class="page-header top5"> <div class="row text-center"> <@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"> <div class="page-header top5"> <div class="row text-center"> <@main.h1 title="Lombok features" /> |