diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 6c8c8212a2..17fb9eac6f 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -300,7 +300,7 @@ * * * - * + * Deprecated since 7.0.1 *
- * tooltipConfig is deprecated, use individual tooltip configuration attributes instead + * tooltipConfig is deprecated, use individual tooltip configuration attributes instead *
* *@@ -380,7 +380,7 @@ * *
* - * + * Deprecated since 7.0.1 * <!-- Example 1: --> * <s:form * tooltipDelay="500" @@ -968,6 +968,7 @@ protected void enableAncestorFormCustomOnsubmit() { } } + @Deprecated(since = "7.0.1", forRemoval = true) protected MapgetTooltipConfig(UIBean component) { Object tooltipConfigObj = component.getAttributes().get("tooltipConfig"); Map result = new LinkedHashMap<>(); @@ -1237,11 +1238,13 @@ public void setAccesskey(String accesskey) { } @StrutsTagAttribute(description="Set the tooltip of this particular component") + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltip(String tooltip) { this.tooltip = tooltip; } @StrutsTagAttribute(description="Deprecated. Use individual tooltip configuration attributes instead.") + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipConfig(String tooltipConfig) { this.tooltipConfig = tooltipConfig; } @@ -1252,22 +1255,26 @@ public void setKey(String key) { } @StrutsTagAttribute(description="Use JavaScript to generate tooltips", type="Boolean", defaultValue="false") + @Deprecated(since = "7.0.1", forRemoval = true) public void setJavascriptTooltip(String javascriptTooltip) { this.javascriptTooltip = javascriptTooltip; } @StrutsTagAttribute(description="CSS class applied to JavaScrip tooltips", defaultValue="StrutsTTClassic") + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipCssClass(String tooltipCssClass) { this.tooltipCssClass = tooltipCssClass; } @StrutsTagAttribute(description="Delay in milliseconds, before showing JavaScript tooltips ", defaultValue="Classic") + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipDelay(String tooltipDelay) { this.tooltipDelay = tooltipDelay; } @StrutsTagAttribute(description="Icon path used for image that will have the tooltip") + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipIconPath(String tooltipIconPath) { this.tooltipIconPath = tooltipIconPath; } diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index 9a26c3326a..e02631feb6 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -261,10 +261,12 @@ public void setOnchange(String onchange) { this.onchange = onchange; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltip(String tooltip) { this.tooltip = tooltip; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipConfig(String tooltipConfig) { this.tooltipConfig = tooltipConfig; } @@ -277,18 +279,22 @@ public void setKey(String key) { this.key = key; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setJavascriptTooltip(String javascriptTooltip) { this.javascriptTooltip = javascriptTooltip; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipCssClass(String tooltipCssClass) { this.tooltipCssClass = tooltipCssClass; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipDelay(String tooltipDelay) { this.tooltipDelay = tooltipDelay; } + @Deprecated(since = "7.0.1", forRemoval = true) public void setTooltipIconPath(String tooltipIconPath) { this.tooltipIconPath = tooltipIconPath; }