[myfaces-tobago] branch master updated: remove deprecated code

[lo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new cf19a23  remove deprecated code
cf19a23 is described below

commit cf19a23b763f0288eab55af0e213b7a100a8be99
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 5 14:03:23 2019 +0200

    remove deprecated code
---
 .../tobago/internal/util/HtmlRendererUtils.java    | 68 ----------------------
 1 file changed, 68 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index 3c9eef5..cbf68ba 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -26,7 +26,6 @@ import org.apache.myfaces.tobago.component.Visual;
 import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.context.TobagoContext;
 import org.apache.myfaces.tobago.internal.component.AbstractUIStyle;
-import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterWrapper;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
@@ -43,7 +42,6 @@ import javax.el.ValueExpression;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
 import javax.faces.model.SelectItem;
 import javax.faces.model.SelectItemGroup;
 import java.io.IOException;
@@ -95,22 +93,6 @@ public final class HtmlRendererUtils {
     }
   }
 
-  /**
-   * @deprecated 4.0.0.
-   */
-  @Deprecated
-  public static void encodeIconWithLabel(
-      final TobagoResponseWriter writer, final String image, final String label) throws IOException {
-    if (image != null && image.startsWith("fa-")) { // XXX hack: should be integrated in the resource manager
-      writer.writeIcon(null, Icons.custom(image)); // todo: should not be static
-    }
-    if (label != null) {
-      writer.startElement(HtmlElements.SPAN);
-      writer.writeText(label);
-      writer.endElement(HtmlElements.SPAN);
-    }
-  }
-
   public static void encodeIconOrImage(final TobagoResponseWriter writer, final String image) throws IOException {
     if (image != null) {
       if (image.startsWith("fa-")) {
@@ -126,46 +108,6 @@ public final class HtmlRendererUtils {
     }
   }
 
-  /**
-   * @deprecated 4.0.0.
-   */
-  @Deprecated
-  public static void encodeIconWithLabel(
-      final TobagoResponseWriter writer, final FacesContext facesContext, final String image,
-      final LabelWithAccessKey label, final boolean disabled)
-      throws IOException {
-    if (image != null) {
-      if (image.startsWith("fa-")) {
-        writer.writeIcon(null, Icons.custom(image)); // todo: should not be static
-      } else {
-        writer.startElement(HtmlElements.IMG);
-        writer.writeAttribute(HtmlAttributes.SRC, image, true);
-        writer.writeAttribute(HtmlAttributes.ALT, "", false);
-        writer.endElement(HtmlElements.IMG);
-      }
-    }
-
-    if (label.getLabel() != null) {
-      writer.startElement(HtmlElements.SPAN);
-      HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
-      writer.endElement(HtmlElements.SPAN);
-    }
-  }
-
-  /**
-   * @deprecated since 3.0.0, use {@link org.apache.myfaces.tobago.renderkit.RendererBase#getResponseWriter}
-   */
-  @Deprecated
-  public static TobagoResponseWriter getTobagoResponseWriter(final FacesContext facesContext) {
-
-    final ResponseWriter writer = facesContext.getResponseWriter();
-    if (writer instanceof TobagoResponseWriter) {
-      return (TobagoResponseWriter) writer;
-    } else {
-      return new TobagoResponseWriterWrapper(writer);
-    }
-  }
-
   public static String getTitleFromTipAndMessages(final FacesContext facesContext, final UIComponent component) {
     final String messages = ComponentUtils.getFacesMessageAsString(facesContext, component);
     return HtmlRendererUtils.addTip(messages, ComponentUtils.getAttribute(component, Attributes.tip));
@@ -184,16 +126,6 @@ public final class HtmlRendererUtils {
     return result;
   }
 
-  /**
-   * @deprecated Since Tobago 2.0.7
-   */
-  @Deprecated
-  public static void renderSelectItems(final UIInput component, final TobagoClass optionClass,
-      final Iterable<SelectItem> items, final Object[] values, final TobagoResponseWriter writer,
-      final FacesContext facesContext) throws IOException {
-    renderSelectItems(component, optionClass, items, values, null, null, writer, facesContext);
-  }
-
   public static void renderSelectItems(final UIInput component, final TobagoClass optionClass,
       final Iterable<SelectItem> items, final Object[] values, final String[] submittedValues,
       final TobagoResponseWriter writer, final FacesContext facesContext) throws IOException {