From f0e90c418f385d36ba216f83525af37e93497ea6 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 27 Mar 2012 00:35:34 +0200 Subject: fixes for 'ant website' build target. Also fixing some errors in javadoc. --- buildScripts/website.ant.xml | 5 ++++- src/core/lombok/core/TransformationsUtil.java | 4 ++-- .../lombok/eclipse/handlers/EclipseHandlerUtil.java | 2 +- usage_examples/AccessorsExample_post.jpage | 20 -------------------- usage_examples/AccessorsExample_pre.jpage | 14 -------------- .../experimental/AccessorsExample_post.jpage | 20 ++++++++++++++++++++ .../experimental/AccessorsExample_pre.jpage | 14 ++++++++++++++ website/features/experimental/Accessors.html | 2 +- 8 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 usage_examples/AccessorsExample_post.jpage delete mode 100644 usage_examples/AccessorsExample_pre.jpage create mode 100644 usage_examples/experimental/AccessorsExample_post.jpage create mode 100644 usage_examples/experimental/AccessorsExample_pre.jpage diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index f949efcf..8397185a 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -145,6 +145,9 @@ such as converting the changelog into HTML, and creating javadoc. + + + @@ -199,7 +202,7 @@ such as converting the changelog into HTML, and creating javadoc. - + diff --git a/src/core/lombok/core/TransformationsUtil.java b/src/core/lombok/core/TransformationsUtil.java index 60d9bab0..e94558f9 100644 --- a/src/core/lombok/core/TransformationsUtil.java +++ b/src/core/lombok/core/TransformationsUtil.java @@ -93,7 +93,7 @@ public class TransformationsUtil { * Strategy: *
    *
  • Reduce the field's name to its base name by stripping off any prefix (from {@code Accessors}). If the field name does not fit - * the prefix list, this method immediately returns {@null}.
    • + * the prefix list, this method immediately returns {@code null}. *
  • If {@code Accessors} has {@code fluent=true}, then return the basename.
    • *
  • Pick a prefix. 'get' normally, but 'is' if {@code isBoolean} is true.
    • *
  • Only if {@code isBoolean} is true: Check if the field starts with {@code is} followed by a non-lowercase character. If so, return the field name verbatim.
    • @@ -130,7 +130,7 @@ public class TransformationsUtil { * Strategy: *
      *
    • Reduce the field's name to its base name by stripping off any prefix (from {@code Accessors}). If the field name does not fit - * the prefix list, this method immediately returns {@null}.
      • + * the prefix list, this method immediately returns {@code null}. *
    • If {@code Accessors} has {@code fluent=true}, then return the basename.
      • *
    • Only if {@code isBoolean} is true: Check if the field starts with {@code is} followed by a non-lowercase character. * If so, replace {@code is} with {@code set} and return that.
      • diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index a056c396..8b01f453 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -1055,7 +1055,7 @@ public class EclipseHandlerUtil { } /** - * Wrapper for {@link #methodExists(String, EclipseNode, boolean)} with {@code caseSensitive} = {@code true}. + * Wrapper for {@link #methodExists(String, EclipseNode, boolean, int)} with {@code caseSensitive} = {@code true}. */ public static MemberExistsResult methodExists(String methodName, EclipseNode node, int params) { return methodExists(methodName, node, true, params); diff --git a/usage_examples/AccessorsExample_post.jpage b/usage_examples/AccessorsExample_post.jpage deleted file mode 100644 index ae5a39db..00000000 --- a/usage_examples/AccessorsExample_post.jpage +++ /dev/null @@ -1,20 +0,0 @@ -public class AccessorsExample { - private int age = 10; - - public int age() { - return this.age; - } - - public AccessorsExample age(final int age) { - this.age = age; - return this; - } -} - -class PrefixExample { - private String fName = "Hello, World!"; - - public String getName() { - return this.fName; - } -} diff --git a/usage_examples/AccessorsExample_pre.jpage b/usage_examples/AccessorsExample_pre.jpage deleted file mode 100644 index ef063daa..00000000 --- a/usage_examples/AccessorsExample_pre.jpage +++ /dev/null @@ -1,14 +0,0 @@ -import lombok.Accessors; -import lombok.Getter; -import lombok.Setter; - -@Accessors(fluent = true) -public class AccessorsExample { - @Getter @Setter - private int age = 10; -} - -class PrefixExample { - @Accessors(prefix = "f") @Getter - private String fName = "Hello, World!"; -} diff --git a/usage_examples/experimental/AccessorsExample_post.jpage b/usage_examples/experimental/AccessorsExample_post.jpage new file mode 100644 index 00000000..ae5a39db --- /dev/null +++ b/usage_examples/experimental/AccessorsExample_post.jpage @@ -0,0 +1,20 @@ +public class AccessorsExample { + private int age = 10; + + public int age() { + return this.age; + } + + public AccessorsExample age(final int age) { + this.age = age; + return this; + } +} + +class PrefixExample { + private String fName = "Hello, World!"; + + public String getName() { + return this.fName; + } +} diff --git a/usage_examples/experimental/AccessorsExample_pre.jpage b/usage_examples/experimental/AccessorsExample_pre.jpage new file mode 100644 index 00000000..ef063daa --- /dev/null +++ b/usage_examples/experimental/AccessorsExample_pre.jpage @@ -0,0 +1,14 @@ +import lombok.Accessors; +import lombok.Getter; +import lombok.Setter; + +@Accessors(fluent = true) +public class AccessorsExample { + @Getter @Setter + private int age = 10; +} + +class PrefixExample { + @Accessors(prefix = "f") @Getter + private String fName = "Hello, World!"; +} diff --git a/website/features/experimental/Accessors.html b/website/features/experimental/Accessors.html index bbcd80bb..65b3c3b6 100644 --- a/website/features/experimental/Accessors.html +++ b/website/features/experimental/Accessors.html @@ -15,7 +15,7 @@

      Since

      - @Accessors was introduced as experimental feature in lombok v0.10.10. + @Accessors was introduced as experimental feature in lombok v0.11.0.

      -- cgit