aboutsummaryrefslogtreecommitdiff
path: root/website/templates
diff options
context:
space:
mode:
Diffstat (limited to 'website/templates')
-rw-r--r--website/templates/_download-edge.html2
-rw-r--r--website/templates/_scaffold.html71
-rw-r--r--website/templates/contributing.html6
-rw-r--r--website/templates/credits.html4
-rw-r--r--website/templates/download.html3
-rw-r--r--website/templates/features/GetterSetter.html2
-rw-r--r--website/templates/features/_features.html20
-rw-r--r--website/templates/features/configuration.html10
-rw-r--r--website/templates/features/constructor.html2
-rw-r--r--website/templates/features/delombok.html8
-rw-r--r--website/templates/features/experimental/FieldDefaults.html2
-rw-r--r--website/templates/features/experimental/index.html4
-rw-r--r--website/templates/features/index.html12
-rw-r--r--website/templates/main.html48
-rw-r--r--website/templates/setup/_setup.html4
-rw-r--r--website/templates/setup/android.html7
-rw-r--r--website/templates/setup/gradle.html6
-rw-r--r--website/templates/setup/main.html14
18 files changed, 143 insertions, 82 deletions
diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html
index 724efa58..b5e8af0b 100644
--- a/website/templates/_download-edge.html
+++ b/website/templates/_download-edge.html
@@ -2,7 +2,7 @@
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center versionInfo">
- <h1>Download 'Edgy Guinea Pig' – the Lombok Cutting Edge build</h1>
+ <@main.h1 title="Download 'Edgy Guinea Pig' - the Lombok Cutting Edge build" />
</div><div class="row versionInfo">
version: ${version} (${timestampString})
</div><div class="row" id="changelog">
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index cc7b0838..c461423f 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -5,6 +5,31 @@
</div>
</#macro>
+<#assign setupTargets = {
+ "Compilers": {
+ "Javac": "javac",
+ "ECJ": "ecj"
+ },
+ "Build tools": {
+ "maven": "maven",
+ "gradle": "gradle",
+ "ant": "ant",
+ "kobalt": "kobalt"
+ },
+ "IDEs": {
+ "Eclipse": "eclipse",
+ "IntelliJ IDEA": "intellij",
+ "Netbeans": "netbeans",
+ "MyEclipse": "eclipse",
+ "Spring Tool Suite": "eclipse",
+ "JBoss Developer Studio": "eclipse"
+ },
+ "Platforms": {
+ "Android": "android",
+ "GWT": "gwt"
+ }
+}>
+
<#macro scaffold load=[]>
<!DOCTYPE html>
<html lang="en">
@@ -32,7 +57,6 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>
- <script src="/js/swfobject.js"></script>
<script src="/js/history.js"></script>
<script src="/js/main.js"></script>
<#list load as ld>
@@ -79,28 +103,16 @@ ga('send', 'pageview');
</a>
</li>
<li class="dropdown">
- <a class="dropdown-toggle pointer" data-toggle="dropdown">Install<span class="caret"></span></a>
+ <a href="/setup/overview" class="smallOnly"><span>Install</span></a>
+ <a class="dropdown-toggle pointer wideOnly" data-toggle="dropdown">Install<span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="themes">
- <li class="header">Compilers</li>
- <li class="target"><a href="/setup/javac">Javac</a></li>
- <li class="target"><a href="/setup/ecj">ecj</a></li>
- <li class="divider"></li>
- <li class="header">Build tools</li>
- <li class="target"><a href="/setup/maven">maven</a></li>
- <li class="target"><a href="/setup/gradle">gradle</a></li>
- <li class="target"><a href="/setup/ant">ant</a></li>
- <li class="target"><a href="/setup/kobalt">kobalt</a></li>
- <li class="header">IDEs</li>
- <li class="target"><a href="/setup/eclipse">Eclipse</a></li>
- <li class="target"><a href="/setup/intellij">IntelliJ IDEA</a></li>
- <li class="target"><a href="/setup/netbeans">Netbeans</a></li>
- <li class="target"><a href="/setup/eclipse">MyEclipse</a></li>
- <li class="target"><a href="/setup/eclipse">Spring Tool Suite</a></li>
- <li class="target"><a href="/setup/eclipse">JBoss Developer Studio</a></li>
- <li class="divider"></li>
- <li class="header">Platforms</li>
- <li class="target"><a href="/setup/android">Android</a></li>
- <li class="target"><a href="/setup/gwt">GWT</a></li>
+ <#list setupTargets as cat, tgtList>
+ <li class="header">${cat}</li>
+ <#list tgtList as name, url>
+ <li class="target"><a href="/setup/${url}">${name}</a></li>
+ </#list>
+ <#sep><li class="divider"></li></#sep>
+ </#list>
</ul>
</li>
<li><a href="/download">Download</a></li>
@@ -123,3 +135,18 @@ ga('send', 'pageview');
</body>
</html>
</#macro>
+
+<#macro h1 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h1 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h1>
+</#macro>
+
+<#macro h2 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h2 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h2>
+</#macro>
+
+<#macro h3 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h3 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h3>
+</#macro>
diff --git a/website/templates/contributing.html b/website/templates/contributing.html
index 574e3aa8..dde6e3ff 100644
--- a/website/templates/contributing.html
+++ b/website/templates/contributing.html
@@ -3,7 +3,7 @@
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center">
- <h1>How to work on Project Lombok yourself</h1>
+ <@main.h1 title="How to work on Project Lombok yourself" />
</div><div class="row">
Project Lombok is being developed via the <a href="https://github.com/rzwitserloot/lombok">lombok git repository on github</a>.
</div><div class="row">
@@ -13,13 +13,13 @@
To produce a lombok jar, run <code>ant dist</code>; in general run <code>ant -p</code>; there's lots of stuff there, including downloading various versions of java runtimes to run the test suite against, and building this website.
</p>
</div><div class="row text-center">
- <h2>Adding your own handlers and annotations to Lombok</h2>
+ <@main.h2 title="Adding your own handlers and annotations to Lombok" />
</div><div class="row">
<p>
If you want to extend lombok, we advise that you fork lombok and add handlers directly into the same place and package that lombok's handlers are in (<code>lombok.javac.handlers</code> and <code>lombok.eclipse.handlers</code>) – lombok does some fancy footwork to ensure various modular class loading systems don't interface with finding the lombok classes, but that system is not (currently) easily expanded to include separate jars.
</p>
</div><div class="row text-center">
- <h2>Contributing to Project Lombok</h2>
+ <@main.h2 title="Contributing to Project Lombok" />
</div><div class="row">
<p>
To create new features and add them to project lombok itself, send us pull requests via github. However, before you start, discuss the feature or fix you'd like to contribute, preferably via the <a href="https://groups.google.com/forum/#!forum/project-lombok">Project Lombok Forum</a>. If you're going to add a new feature, make sure to post 2 snippets (one with the annotation, the other with what that would generate), similar to how the feature pages list 'with lombok' and 'without lombok' variants.
diff --git a/website/templates/credits.html b/website/templates/credits.html
index 9e929256..925ba2d4 100644
--- a/website/templates/credits.html
+++ b/website/templates/credits.html
@@ -3,12 +3,12 @@
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center">
- <h1>Project Lombok - About the authors and everyone that's helped us create Project Lombok.</h1>
+ <@main.h1 title="Project Lombok - About the authors and everyone that's helped us create Project Lombok." />
</div>
<div class="row">
<div class="credits">
<div class="committers personList">
- <h3>Regular contributors to Project Lombok:</h3>
+ <@main.h3 title="Regular contributors to Project Lombok:" />
<div class="row text-center">
<div class="person col-md-2">
diff --git a/website/templates/download.html b/website/templates/download.html
index 5d89061c..a6b21402 100644
--- a/website/templates/download.html
+++ b/website/templates/download.html
@@ -8,7 +8,8 @@
<div class="row">
<icon class="fa fa-download"></icon>
<a href="/downloads/lombok.jar">
- Download ${version}
+ Download <span id="currentVersion">${version}</span>
+ <span id="currentVersionFull" style="display: none;">${fullVersion}</span>
</a>
</div>
</h1>
diff --git a/website/templates/features/GetterSetter.html b/website/templates/features/GetterSetter.html
index 7ceaa3ba..1baa5bd0 100644
--- a/website/templates/features/GetterSetter.html
+++ b/website/templates/features/GetterSetter.html
@@ -62,7 +62,7 @@
</p><p>
You can annotate a class with a <code>@Getter</code> or <code>@Setter</code> annotation. Doing so is equivalent to annotating all non-static fields in that class with that annotation. <code>@Getter</code>/<code>@Setter</code> annotations on fields take precedence over the ones on classes.
</p><p>
- Using the <code>AccessLevel.NONE</code> access level simply generates nothing. It's useful only in combination with <a href="features/Data"><code>@Data</code></a> or a class-wide <code>@Getter</code> or <code>@Setter</code>.
+ Using the <code>AccessLevel.NONE</code> access level simply generates nothing. It's useful only in combination with <a href="/features/Data"><code>@Data</code></a> or a class-wide <code>@Getter</code> or <code>@Setter</code>.
</p><p>
<code>@Getter</code> can also be used on enums. <code>@Setter</code> can't, not for a technical reason, but for a pragmatic one: Setters on enums are an extremely bad idea.
</p>
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index c0c63a76..dcee152c 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -14,14 +14,14 @@
<#macro overview>
<div class="row">
- <h3>Overview</h3>
+ <@main.h3 title="Overview" />
<#nested>
</div>
</#macro>
<#macro experimental>
<div class="row">
- <h3>Experimental</h3>
+ <@main.h3 title="Experimental" />
Experimental because:
<#nested>
@@ -30,14 +30,14 @@
<#macro snippets name>
<div class="row container-fluid">
- <div class="col-lg-6">
- <h3>With Lombok</h3>
+ <div class="snippet-col first-snippet">
+ <@main.h3 title="With Lombok" />
<div class="snippet">${usages.pre(name)?no_esc}</div>
</div>
<div class="sep"></div>
- <div class="col-lg-6">
- <h3>Vanilla Java</h3>
+ <div class="snippet-col second-snippet">
+ <@main.h3 title="Vanilla Java" />
<div class="snippet">${usages.post(name)?no_esc}</div>
</div>
@@ -46,7 +46,7 @@
<#macro confKeys>
<div class="row">
- <h3>Supported configuration keys:</h3>
+ <@main.h3 title="Supported configuration keys:" />
<dl>
<#nested>
</dl>
@@ -55,7 +55,7 @@
<#macro smallPrint>
<div class="row">
- <h3>Small print</h3>
+ <@main.h3 title="Small print" />
<div class="smallprint">
<#nested>
@@ -68,9 +68,9 @@
<div class="page-header top5" id="featureContent">
<div class="row text-center">
<div class="header-group">
- <h1>${title}</h1>
+ <@main.h1 title="${title}" />
- <h3>${logline?no_esc}</h3>
+ <@main.h3 title="${logline?no_esc}" />
</div>
</div>
<#nested>
diff --git a/website/templates/features/configuration.html b/website/templates/features/configuration.html
index 642332a0..4f861287 100644
--- a/website/templates/features/configuration.html
+++ b/website/templates/features/configuration.html
@@ -70,7 +70,7 @@
</@f.overview>
<@f.featureSection>
- <h3>Global config keys</h3>
+ <@f.main.h3 title="Global config keys" />
<p>
To stop lombok from looking at parent directories for more configuration files, the special key:
@@ -79,10 +79,12 @@
</div>
can be included. We suggest you put this in the root of your workspace directory.
</p><p>
- Lombok normally adds <code>@javax.annotation.Generated</code> annotations to all generated nodes where possible. You can stop this with:
+ Lombok can add <code>@javax.annotation.Generated</code> annotations to all generated nodes where possible. You can enable this with:
<div class="snippet example">
- <code>lombok.addJavaxGeneratedAnnotation = false</code>
+ <code>lombok.addJavaxGeneratedAnnotation = true</code>
</div>
+ We advise against this; JDK9 breaks this annotation, and it's unlikely to ever get fixed.<br />
+ <em>NB:</em> Until Lombok v2.0.0, this setting defaulted to <code>true</code>.
</p><p>
Lombok can be configured to add <code>@lombok.Generated</code> annotations to all generated nodes where possible; useful for JaCoCo (which has built in support),
or other style checkers and code coverage tools:
@@ -98,7 +100,7 @@
</@f.featureSection>
<@f.featureSection>
- <h3>Config keys that can affect any source file</h3>
+ <@f.main.h3 title="Config keys that can affect any source file" />
<p>
These config keys can make lombok affect source files even if they have 0 lombok annotations in them.<br />
diff --git a/website/templates/features/constructor.html b/website/templates/features/constructor.html
index 6a12fa2a..716efe5a 100644
--- a/website/templates/features/constructor.html
+++ b/website/templates/features/constructor.html
@@ -7,7 +7,7 @@
<p>
This set of 3 annotations generate a constructor that will accept 1 parameter for certain fields, and simply assigns this parameter to the field.
</p><p>
- <code>@NoArgsConstructor</code> will generate a constructor with no parameters. If this is not possible (because of final fields), a compiler error will result instead, unless <code>@NoArgsConstructor(force = true</code> is used, then all final fields are initialized with <code>0</code> / <code>false</code> / <code>null</code>. For fields with constraints, such as <code>@NonNull</code> fields, <em>no</em> check is generated,so be aware that these constraints will generally not be fulfilled until those fields are properly initialized later. Certain java constructs, such as hibernate and the Service Provider Interface require a no-args constructor. This annotation is useful primarily in combination with either <code>@Data</code> or one of the other constructor generating annotations.
+ <code>@NoArgsConstructor</code> will generate a constructor with no parameters. If this is not possible (because of final fields), a compiler error will result instead, unless <code>@NoArgsConstructor(force = true)</code> is used, then all final fields are initialized with <code>0</code> / <code>false</code> / <code>null</code>. For fields with constraints, such as <code>@NonNull</code> fields, <em>no</em> check is generated,so be aware that these constraints will generally not be fulfilled until those fields are properly initialized later. Certain java constructs, such as hibernate and the Service Provider Interface require a no-args constructor. This annotation is useful primarily in combination with either <code>@Data</code> or one of the other constructor generating annotations.
</p><p>
<code>@RequiredArgsConstructor</code> generates a constructor with 1 parameter for each field that requires special handling. All non-initialized <code>final</code> fields get a parameter, as well as any fields that are marked as <code>@NonNull</code> that aren't initialized where they are declared. For those fields marked with <code>@NonNull</code>, an explicit null check is also generated. The constructor will throw a <code>NullPointerException</code> if any of the parameters intended for the fields marked with <code>@NonNull</code> contain <code>null</code>. The order of the parameters match the order in which the fields appear in your class.
</p><p>
diff --git a/website/templates/features/delombok.html b/website/templates/features/delombok.html
index fc9dfddc..6f41fc46 100644
--- a/website/templates/features/delombok.html
+++ b/website/templates/features/delombok.html
@@ -13,7 +13,7 @@
Delombok's output format can be configured with command line options (use <code>--format-help</code> for a complete list). A few such options are automatically scanned from input if possible (such as indent). If delombok's formatting is not conforming to your preferred code style, have a look!
</p>
- <h3>Running delombok on the command line</h3>
+ <@f.main.h3 title="Running delombok on the command line" />
<p>
Delombok is included in <code>lombok.jar</code>. To use it, all you need to run on the command line is:
@@ -28,7 +28,7 @@
</div>
</p>
- <h3>Running delombok in ant</h3>
+ <@f.main.h3 title="Running delombok in ant" />
<p>
<code>lombok.jar</code> includes an ant task which can apply delombok for you. For example, to create javadoc for your project, your <code>build.xml</code> file would look something like:
@@ -45,13 +45,13 @@
Instead of a <code>from</code> attribute, you can also nest <code>&lt;fileset&gt;</code> nodes.
</p>
- <h3>Running delombok in maven</h3>
+ <@f.main.h3 title="Running delombok in maven" />
<p>
Anthony Whitford has written a <a href="https://github.com/awhitford/lombok.maven">maven plugin</a> for delomboking your source code.
</p>
- <h3>Limitations</h3>
+ <@f.main.h3 title="Limitations" />
<p>
Delombok tries to preserve your code as much as it can, but comments may move around a little bit, especially comments that are in the middle of a syntax node. For example, any comments appearing in the middle of a list of method modifiers, such as <code>public /*comment*/ static ...</code> will move towards the front of the list of modifiers. In practice, any java source parsing tool will not be affected.<br />
diff --git a/website/templates/features/experimental/FieldDefaults.html b/website/templates/features/experimental/FieldDefaults.html
index 0d4cda9e..c0d3db96 100644
--- a/website/templates/features/experimental/FieldDefaults.html
+++ b/website/templates/features/experimental/FieldDefaults.html
@@ -38,7 +38,7 @@
</dt><dd>
Lombok will flag any usage of <code>@FieldDefaults</code> as a warning or error if configured.
</dd><dt>
- <code>lombok.fieldDefautls.defaultPrivate</code> = [<code>true</code> | <code>false</code>] (default: false)
+ <code>lombok.fieldDefaults.defaultPrivate</code> = [<code>true</code> | <code>false</code>] (default: false)
</dt><dd>
(Since 1.16.8) If set to <code>true</code>, <em>every</em> field in <em>every</em> class or enum anywhere in the sources being compiled will be marked as <code>private</code> unless it has an explicit access modifier or the <code>@PackagePrivate</code> annotation, or an explicit <code>@FieldDefaults</code> annotation is present to override this config key.
</dd><dt>
diff --git a/website/templates/features/experimental/index.html b/website/templates/features/experimental/index.html
index 11d48485..dbd2f93c 100644
--- a/website/templates/features/experimental/index.html
+++ b/website/templates/features/experimental/index.html
@@ -4,9 +4,11 @@
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center">
- <h1>Lombok experimental features</h1>
+ <@main.h1 title="Lombok experimental features" />
</div>
<div class="row">
+ The <a href="/api/">Lombok javadoc</a> is available, but we advise these pages.
+
<p>
Experimental features are available in your normal lombok installation, but are not as robustly supported as lombok's main features. In particular, experimental features:
<ul>
diff --git a/website/templates/features/index.html b/website/templates/features/index.html
index da3db634..73b5dce8 100644
--- a/website/templates/features/index.html
+++ b/website/templates/features/index.html
@@ -3,9 +3,11 @@
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center">
- <h1>Lombok features.</h1>
+ <@main.h1 title="Lombok features" />
</div>
<div class="row">
+ The <a href="/api/">Lombok javadoc</a> is available, but we advise these pages.
+
<@main.feature title="val" href="val">
Finally! Hassle-free final local variables.
</@main.feature>
@@ -66,10 +68,14 @@
<@main.feature title="@Log" href="log">
Captain's Log, stardate 24435.7: &quot;What was that line again?&quot;
</@main.feature>
+
+ <@main.feature title="experimental" href="/features/experimental/all">
+ Head to the lab: The new stuff we're working on.
+ </@main.feature>
</div>
<div class="row">
- <h1>Configuration system</h1>
+ <@main.h1 title="Configuration system" />
<div class="text-center">
Lombok, made to order: <a href="configuration">Configure lombok features</a> in one place for your entire project or even your workspace.
@@ -77,7 +83,7 @@
</div>
<div class="row">
- <h1 class="text-center">Running delombok</h1>
+ <@main.h1 title="Running delombok" />
<div>
Delombok copies your source files to another directory, replacing all lombok annotations with their desugared form. So, it'll turn <code>@Getter</code> back into the actual getter. It then removes the annotation. This is useful for all sorts of reasons; you can check out what's happening under the hood, if the unthinkable happens and you want to stop using lombok, you can easily remove all traces of it in your source, and you can use delombok to preprocess your source files for source-level tools such as javadoc and GWT. More information about how to run delombok, including instructions for build tools can be found at the <a href="delombok">delombok page</a>.
diff --git a/website/templates/main.html b/website/templates/main.html
index b836a3c9..d52df167 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -1,39 +1,35 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold load=["/js/supporters.js"]>
<div class="page-header top5">
<div class="row text-center">
- <h1>Lombok Demo</h1>
+ <@main.h1 title="Project Lombok" />
+ <p>
+ Project Lombok is a java library that automatically plugs into your editor and build tools, spicing up your java.<br />
+ Never write another getter or equals method again. Early access to future java features such as <code>val</code>, and much more.
+ </p>
</div>
<div class="video text-center">
- <video width="800" height="480" poster="/img/poster.png" controls="controls" preload="none">
- <source src="/videos/lombok.ogv" type="video/ogg" />
- <source src="/videos/lombok.mp4" type="video/mp4" />
- <source src="/videos/lombok-iPhone.m4v" type="video/mp4" />
- <object id="player" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="800" height="500">
- <param name="movie" value="/videos/player.swf?image=/img/poster.png&amp;file=/videos/lombok.mp4" />
- <param name="allowfullscreen" value="true" />
- <!--[if !IE]>-->
- <object width="800" height="500" type="application/x-shockwave-flash"
- data="/videos/player.swf?image=poster.png&amp;file=lombok.mp4" allowfullscreen="true">
- <!--<![endif]-->
- <h1>Can't watch the video?</h1>
- <p>
- <a href="https://www.youtube.com/watch?v=y6zMyM-YTgg">See it on Youtube instead</a>.
- </p><p>
- Or, download the video:<br/>
- <a href="/videos/lombok.mp4">MPEG4 / H.264 (Windows / Mac)</a> |
- <a href="/videos/lombok.ogv">Ogg Theora &amp; Vorbis ".ogv" (Linux)</a>
- </p>
- <!--[if !IE]>-->
- </object>
- <!--<![endif]-->
- </object>
+ <div id="clickForVideo"><span class="clickToTap">Click</span> to watch a 4 minute demo to learn more.</div>
+ <video id="demoVideo" hidden="hidden" width="800" height="480" poster="/img/poster.png" controls="controls" preload="none">
+ <source src="https://projectlombok.org/videos/lombok.ogv" type="video/ogg" />
+ <source src="https://projectlombok.org/videos/lombok.mp4" type="video/mp4" />
+ <source src="https://projectlombok.org/videos/lombok-iPhone.m4v" type="video/mp4" />
+ <@main.h1 title="Can't watch the video?" />
+ <p>
+ <a href="https://www.youtube.com/watch?v=y6zMyM-YTgg">See it on Youtube instead</a>.
+ </p><p>
+ Or, download the video:<br/>
+ <a href="/videos/lombok.mp4">MPEG4 / H.264 (Windows / Mac)</a> |
+ <a href="/videos/lombok.ogv">Ogg Theora &amp; Vorbis ".ogv" (Linux)</a>
+ </p>
</video>
<div class="row">
<div class="text-center">
- <a href="http://jnb.ociweb.com/jnb/jnbJan2010.html">I can't see video. Show me a text and images based explanation and tutorial instead!</a>
+ <a href="http://jnb.ociweb.com/jnb/jnbJan2010.html">Show me a text and images based explanation and tutorial instead!</a>
</div>
</div>
+ <div class="row supporterBar">
+ </div>
</div>
</div>
</@main.scaffold>
diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html
index e5c2c007..d5a88fb7 100644
--- a/website/templates/setup/_setup.html
+++ b/website/templates/setup/_setup.html
@@ -8,7 +8,7 @@
<#macro section title>
<div class="row">
- <h3>${title}</h3>
+ <@main.h3 title="${title}" />
<#nested>
</div>
@@ -19,7 +19,7 @@
<div class="page-header top5" id="featureContent">
<div class="row text-center">
<div class="header-group">
- <h1>${title}</h1>
+ <@main.h1 title="${title}" />
</div>
</div>
<#nested>
diff --git a/website/templates/setup/android.html b/website/templates/setup/android.html
index 8762d355..19e92a58 100644
--- a/website/templates/setup/android.html
+++ b/website/templates/setup/android.html
@@ -42,6 +42,13 @@ dependencies {
Restart Android Studio
</li></ul>
</p>
+ <p>
+ Modify your application's <code>dependencies</code> block:
+<pre>
+dependencies {
+ compileOnly 'org.projectlombok:lombok:${version}'
+ annotationProcessor 'org.projectlombok:lombok:${version}'
+}</pre>
</@s.section>
<@s.section title="Eclipse">
diff --git a/website/templates/setup/gradle.html b/website/templates/setup/gradle.html
index 579aa6a2..7cb4af0d 100644
--- a/website/templates/setup/gradle.html
+++ b/website/templates/setup/gradle.html
@@ -28,8 +28,14 @@ repositories {
mavenCentral()
}
+plugins {
+ id 'net.ltgt.apt' version '0.10'
+}
+
dependencies {
compileOnly 'org.projectlombok:lombok:${version}'
+
+ apt "org.projectlombok:lombok:${version}"
}</pre>
</p><p>
Remember that you still have to download <code>lombok.jar</code> (or find it in gradle's caches) and run it as a jarfile, if you wish to program in eclipse. The plugin makes that part easier.
diff --git a/website/templates/setup/main.html b/website/templates/setup/main.html
new file mode 100644
index 00000000..8c874a55
--- /dev/null
+++ b/website/templates/setup/main.html
@@ -0,0 +1,14 @@
+<#import "_setup.html" as s>
+
+<@s.scaffold title="Using lombok">
+ <@s.introduction>
+ <#list s.main.setupTargets as cat, tgtList>
+ <h3 class="listHeader">${cat}</h3>
+ <ul>
+ <#list tgtList as name, url>
+ <li class="target"><a href="/setup/${url}">${name}</a></li>
+ </#list>
+ </ul>
+ </#list>
+ </@s.introduction>
+</@s.scaffold>