Bug 463277 - Convenience for building HTML with encoded text binds

https://bugs.eclipse.org/bugs/show_bug.cgi?id=463277

Adjusted return type of clazz, style and appLink methods. (alternative)

Change-Id: Iff8062a10832cff3c0c3e14142af876069475011
Signed-off-by: Rainer Niedermayr <rainer.niedermayr@bsiag.com>
Reviewed-on: https://git.eclipse.org/r/45458
Reviewed-by: Judith Gull <jgu@bsiag.com>
Tested-by: Judith Gull <jgu@bsiag.com>

2 files changed, 12 insertions, 9 deletions

diff --git a/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/IHtmlElement.java b/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/IHtmlElement.java
index 4a6bf38ba1..53f118e86e 100644
--- a/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/IHtmlElement.java
+++ b/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/IHtmlElement.java
@@ -18,12 +18,12 @@ public interface IHtmlElement extends CharSequence, IHtmlContent {
   /**
    * Add a css class
    */
-  IHtmlElement clazz(CharSequence clazz);
+  <T extends IHtmlElement> T clazz(CharSequence clazz);
 
   /**
    * Add a css style
    */
-  IHtmlElement style(CharSequence style);
+  <T extends IHtmlElement> T style(CharSequence style);
 
   /**
    * Add an application local link
@@ -31,6 +31,6 @@ public interface IHtmlElement extends CharSequence, IHtmlContent {
    * @param path
    *          path to identify what is the link referring to.
    */
-  IHtmlElement appLink(CharSequence path);
+  <T extends IHtmlElement> T appLink(CharSequence path);
 
 }
diff --git a/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/internal/HtmlNodeBuilder.java b/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/internal/HtmlNodeBuilder.java
index 762c8e2049..b4d13f93d9 100644
--- a/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/internal/HtmlNodeBuilder.java
+++ b/org.eclipse.scout.commons/src/main/java/org/eclipse/scout/commons/html/internal/HtmlNodeBuilder.java
@@ -86,23 +86,26 @@ public class HtmlNodeBuilder extends AbstractExpressionBuilder implements IHtmlE
   }
 
   /// GLOBAL ATTRIBUTES
+  @SuppressWarnings("unchecked")
   @Override
-  public IHtmlElement style(CharSequence value) {
+  public <T extends IHtmlElement> T style(CharSequence value) {
     addAttribute("style", value);
-    return this;
+    return (T) this;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public IHtmlElement clazz(CharSequence clazz) {
+  public <T extends IHtmlElement> T clazz(CharSequence clazz) {
     addAttribute("class", clazz);
-    return this;
+    return (T) this;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
-  public IHtmlElement appLink(CharSequence path) {
+  public <T extends IHtmlElement> T appLink(CharSequence path) {
     clazz("hyperlink");
     addAttribute("data-hyperlink", path);
-    return this;
+    return (T) this;
   }
 
 }