diff options
Diffstat (limited to 'website')
| -rw-r--r-- | website/resources/css/custom.css | 2 | ||||
| -rw-r--r-- | website/resources/js/order-license.js | 2 | ||||
| -rw-r--r-- | website/templates/features/EqualsAndHashCode.html | 2 | ||||
| -rw-r--r-- | website/templates/features/configuration.html | 2 | ||||
| -rw-r--r-- | website/templates/features/experimental/Accessors.html | 9 | ||||
| -rw-r--r-- | website/templates/order-license.html | 8 | ||||
| -rw-r--r-- | website/templates/setup/intellij.html | 4 |
7 files changed, 17 insertions, 12 deletions
diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index 2588ae66..ded02a06 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -230,9 +230,7 @@ ul.dropdown-menu .header { } div.snippet code { - padding: 0 0 0 2rem; display: inline-block; - text-indent: -2rem; word-break: break-word; } diff --git a/website/resources/js/order-license.js b/website/resources/js/order-license.js index 21550f34..6745567d 100644 --- a/website/resources/js/order-license.js +++ b/website/resources/js/order-license.js @@ -110,7 +110,7 @@ formFail = true; } - if (!data.seats || isNaN(data.seats) || data.seats < 1) { + if (!data.seats || isNaN(data.seats) || data.seats < 10) { $("#seats").focus(); showError("seats"); formFail = true; diff --git a/website/templates/features/EqualsAndHashCode.html b/website/templates/features/EqualsAndHashCode.html index 2ea2954a..474b4ee2 100644 --- a/website/templates/features/EqualsAndHashCode.html +++ b/website/templates/features/EqualsAndHashCode.html @@ -12,6 +12,8 @@ <em>NEW in Lombok 0.10: </em>Unless your class is <code>final</code> and extends <code>java.lang.Object</code>, lombok generates a <code>canEqual</code> method which means JPA proxies can still be equal to their base class, but subclasses that add new state don't break the equals contract. The complicated reasons for why such a method is necessary are explained in this paper: <a href="https://www.artima.com/lejava/articles/equality.html">How to Write an Equality Method in Java</a>. If all classes in a hierarchy are a mix of scala case classes and classes with lombok-generated equals methods, all equality will 'just work'. If you need to write your own equals methods, you should always override <code>canEqual</code> if you change <code>equals</code> and <code>hashCode</code>. </p><p> <em>NEW in Lombok 1.14.0: </em>To put annotations on the <code>other</code> parameter of the <code>equals</code> (and, if relevant, <code>canEqual</code>) method, you can use <code>onParam=@__({@AnnotationsHere})</code>. Be careful though! This is an experimental feature. For more details see the documentation on the <a ng-click="toFeature('on-x')">onX</a> feature. + </p><p> + <em>NEW in Lombok 1.18.16: </em>The result of the generated <code>hashCode()</code> can be cached by setting <code>cacheStrategy</code> to a value other than <code>CacheStrategy.NEVER</code>. <em>Do not</em> use this if objects of the annotated class can be modified in any way that would lead to the result of <code>hashCode()</code> changing. </p> </@f.overview> diff --git a/website/templates/features/configuration.html b/website/templates/features/configuration.html index 16214d4e..11aa3455 100644 --- a/website/templates/features/configuration.html +++ b/website/templates/features/configuration.html @@ -84,7 +84,7 @@ can be included. We suggest you put this in the root of your workspace directory. </p><p id="addNullAnnotations"> Lombok can add nullity annotations (usually called <code>@NonNull</code> and <code>@Nullable</code>) whenever it makes sense to do so; think of generated <a href="ToString"><code>toString</code></a> and <a href="with"><code>withX</code> methods (these never return null), or the parameter of a generated <a href="EqualsAndHashCode"><code>equals</code></a> method, which is allowed to be null, and requires such an annotation if you've set up your IDE for strict null checks as well as 'parameters are non-null by default'. There are many such libraries; you must tell lombok which one to use. By default, no such annotations are added. Enable this feature with: - <ol class="snippet example oneLiner"> + <ol class="snippet example oneliner"> <li><code>lombok.addNullAnnotations = <em><flavor></em></code></li> </ol> Many <em>flavors</em> are available: <code>javax</code> (=JSR305; not recommended), <code>eclipse</code>, <code>jetbrains</code>, <code>netbeans</code>, <code>androidx</code>, <code>android.support</code> (deprecated within android), <code>checkerframework</code> (recommended), <code>findbugs</code>, <code>spring</code>, <code>jml</code>, or define your own via <code>CUSTOM:fully.qualified.NonNullAnnotation:fully.qualified.NullableAnnotation</code>; if your nullity annotation is solely of the type use style (it annotates types, such as eclipse's and checkerframework's offerings, versus annotating methods and parameters), the format is <code>CUSTOM:TYPE_USE:nonnullanno:nullableanno</code>.<br /> diff --git a/website/templates/features/experimental/Accessors.html b/website/templates/features/experimental/Accessors.html index 97017dc6..54d507f8 100644 --- a/website/templates/features/experimental/Accessors.html +++ b/website/templates/features/experimental/Accessors.html @@ -15,7 +15,12 @@ New feature – community feedback requested. </li> </ul> - Current status: <em>positive</em> - Currently we feel this feature may move out of experimental status with no or minor changes soon. + Current status: <em>neutral</em> - Some changes are expected. These changes are intended to be backwards compatible, but should start in an experimental feature: + <ul> + <li>Open feature request: naming behaviour for properties that start with a lowercase letter followed by an uppercase letter. Half of specs, tools and lombok users prefer that a field named <code>uLimit</code> into <code>getULimit</code> (including lombok) and the other half turn prefer <code>getuLimit</code>. <code>@Accessors</code> may be involved in any update that addresses this <a href="https://github.com/rzwitserloot/lombok/issues/2693">request</a>.</li> + <li>Open feature request: More control over naming accessors; for example to address creatively named boolean properties: Turn <code>boolean wasRunning</code> into <code>boolean wasRunning()</code> instead of <code>boolean isWasRunning()</code>, as well as more expansive prefix support. <code>@Accessors</code> will be involved if this feature <a href="https://github.com/rzwitserloot/lombok/issues/2464">request</a> is addressed.</li> + <li><code>@Accessors</code> currently does not 'cascade' from field <code>@Accessors</code> annotation to the class-level <code>@Accessors</code> annotation, but it does 'cascade' to <code>lombok.config</code>. Changing this is not difficult but backwards incompatible. It's not likely to break much existing code, but this needs to be decided on before the feature can move out of <em>experimental</em> status.</li> + </ul> </@f.experimental> <@f.overview> @@ -39,7 +44,7 @@ </li> </ul> <p><p> - The <code>@Accessors</code> annotation is legal on types and fields; the annotation that applies is the one on the field if present, otherwise the one on the class. When a <code>@Accessors</code> annotation on a field is present, any <code>@Accessors</code> annotation also present on that field's type is ignored. + The <code>@Accessors</code> annotation is legal on types and fields; the annotation that applies is the one on the field if present, otherwise the one on the class. When a <code>@Accessors</code> annotation on a field is present, any <code>@Accessors</code> annotation also present on the class the field is in, is entirely ignored, <em>even for properties not configured on the field <code>@Accessors</code></em>. This in contrast to any <code>lombok.config</code> configuration keys which serve as fall-back default if any explicit <code>@Accessors</code> annotation doesn't specify. </p> </@f.overview> diff --git a/website/templates/order-license.html b/website/templates/order-license.html index c3f52cef..1feacbbc 100644 --- a/website/templates/order-license.html +++ b/website/templates/order-license.html @@ -28,21 +28,21 @@ <div class="form-check"> <label class="form-check-label"> <input type="radio" class="form-check-input licenseType" name="licenseType" value="professional" checked="checked" /> - Professional (€2,- per developer per month; ~ $2.50). + Professional (€2,- per developer per month; ~ $2.40). </label> </div> <div class="form-check"> <label class="form-check-label"> <input type="radio" class="form-check-input licenseType" name="licenseType" value="enterprise" /> - Enterprise (€5,- per developer per month; ~ $6.10). + Enterprise (€5,- per developer per month; ~ $6.00). </label> </div> </div> <div id="licenseTypeErr" class="formErr" hidden="hidden">License type is a required field.</div> <div class="form-group"> - <label for="seats"># of developers using lombok</label> + <label for="seats"># of developers using lombok (minimum: 10)</label> <input type="number" placeholder="# of developers" class="form-control" id="seats" /> - <div id="seatsErr" class="formErr" hidden="hidden">We need to know the # of developers to determine the license price.</div> + <div id="seatsErr" class="formErr" hidden="hidden">We need to know the # of developers to determine the license price, and that # needs to be at least 10.</div> </div> </fieldset> <fieldset class="form-group"> diff --git a/website/templates/setup/intellij.html b/website/templates/setup/intellij.html index 9e99adbf..76a3c7b9 100644 --- a/website/templates/setup/intellij.html +++ b/website/templates/setup/intellij.html @@ -3,9 +3,9 @@ <@s.scaffold title="IntelliJ IDEA"> <@s.introduction> <p> - The <a href="https://www.jetbrains.com/idea/">Jetbrains IntelliJ IDEA</a> editor is compatible with lombok. + The <a href="https://www.jetbrains.com/idea/">Jetbrains IntelliJ IDEA</a> editor is compatible with lombok without a plugin as of version 2020.3. </p><p> - Add the <a href="https://plugins.jetbrains.com/plugin/6317">Lombok IntelliJ plugin</a> to add lombok support for IntelliJ: + For versions prior to 2020.3, you can add the <a href="https://plugins.jetbrains.com/plugin/6317">Lombok IntelliJ plugin</a> to add lombok support for IntelliJ: <ul><li> Go to <code>File > Settings > Plugins</code> </li><li> |