You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2022/02/13 13:31:52 UTC
[myfaces-tobago] 21/32: cherrypick from 2.x: build: checkstyle enhancements
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 624f4b57512b642af1f83a292f49d2bf8e439664
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Feb 9 16:05:33 2022 +0100
cherrypick from 2.x: build: checkstyle enhancements
---
.../org/apache/myfaces/tobago/TobagoConstants.java | 14 +++++-
.../apache/myfaces/tobago/ajax/api/AjaxUtils.java | 24 +++++-----
.../apache/myfaces/tobago/bean/ResourceMap.java | 2 +-
.../myfaces/tobago/component/ComponentUtil.java | 3 +-
.../myfaces/tobago/component/UIViewRoot.java | 4 +-
.../apache/myfaces/tobago/config/ThemeConfig.java | 3 ++
.../tobago/context/ResourceManagerUtil.java | 10 +++--
.../ValueBindingResetInputActionListener.java | 2 +-
.../myfaces/tobago/internal/taglib/TagUtils.java | 6 ++-
.../myfaces/tobago/internal/util/AccessKeyMap.java | 3 +-
.../tobago/renderkit/html/HtmlRendererUtil.java | 14 ++++--
.../tobago/renderkit/html/HtmlStyleMap.java | 5 ++-
.../renderkit/html/util/CommandRendererHelper.java | 23 +++++-----
.../myfaces/tobago/renderkit/util/JQueryUtils.java | 6 +--
.../apache/myfaces/tobago/util/MessageFactory.java | 21 +++++++++
.../org/apache/myfaces/tobago/util/StringUtil.java | 9 ++++
.../myfaces/tobago/util/VariableResolverUtil.java | 2 +-
.../internal/component/AbstractUINumberSlider.java | 2 +-
.../apache/myfaces/tobago/model/AbstractCrud.java | 13 +++---
.../java/org/apache/myfaces/tobago/model/Crud.java | 30 ++++++-------
.../sandbox/standard/tag/NumberSliderRenderer.java | 52 +++++++++++-----------
.../tobago/security/AuthorizationUtils.java | 2 +-
.../html/speyside/standard/tag/BoxRenderer.java | 28 ++++++------
23 files changed, 169 insertions(+), 109 deletions(-)
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
index 5de657a..cf3b6bf 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
@@ -27,7 +27,7 @@ package org.apache.myfaces.tobago;
* @see org.apache.myfaces.tobago.component.OnComponentCreated
* @see org.apache.myfaces.tobago.renderkit.HtmlUtils
* @see org.apache.myfaces.tobago.util.ComponentUtils
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public final class TobagoConstants {
@@ -674,12 +674,24 @@ public final class TobagoConstants {
@Deprecated
public static final String RENDERER_TYPE_VERBATIM = "Verbatim";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_NAME_REFERENCE = "nameReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_DISABLED_REFERENCE = "disabledReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_ID_REFERENCE = "idReference";
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static final String ATTR_TIP_REFERENCE = "tipReference";
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
index e902f95..ecf035b 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @deprecated since 1.5.0.
+ * @deprecated since 1.5.0.
*/
@Deprecated
public class AjaxUtils {
@@ -39,31 +39,31 @@ public class AjaxUtils {
}
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
/**
- * @deprecated Please use AjaxInternalUtils.checkParamValidity()
+ * @deprecated Please use AjaxInternalUtils.checkParamValidity()
*/
@Deprecated
public static void checkParamValidity(
- final FacesContext facesContext, final UIComponent uiComponent, final Class compClass) {
+ final FacesContext facesContext, final UIComponent uiComponent, final Class compClass) {
AjaxInternalUtils.checkParamValidity(facesContext, uiComponent, compClass);
}
/**
- * @deprecated Please use AjaxInternalUtils.encodeAjaxComponent()
+ * @deprecated Please use AjaxInternalUtils.encodeAjaxComponent()
*/
@Deprecated
public static void encodeAjaxComponent(final FacesContext facesContext, final UIComponent component)
- throws IOException {
+ throws IOException {
AjaxInternalUtils.encodeAjaxComponent(facesContext, component);
}
/**
- * @deprecated Please use AjaxInternalUtils.parseAndStoreComponents()
+ * @deprecated Please use AjaxInternalUtils.parseAndStoreComponents()
*/
@Deprecated
public static Map<String, UIComponent> parseAndStoreComponents(final FacesContext facesContext) {
@@ -71,7 +71,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use AjaxInternalUtils.getAjaxComponents()
+ * @deprecated Please use AjaxInternalUtils.getAjaxComponents()
*/
@Deprecated
public static Map<String, UIComponent> getAjaxComponents(final FacesContext facesContext) {
@@ -79,7 +79,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest()
*/
@Deprecated
public static boolean isAjaxRequest(final FacesContext facesContext) {
@@ -87,7 +87,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent()
*/
@Deprecated
public static void removeAjaxComponent(final FacesContext facesContext, final String clientId) {
@@ -95,7 +95,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
public static void addAjaxComponent(final FacesContext facesContext, final String clientId) {
@@ -103,7 +103,7 @@ public class AjaxUtils {
}
/**
- * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
+ * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
public static void addAjaxComponent(final FacesContext facesContext, final UIComponent component) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
index 211207e..b0299c3 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.util.Properties;
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public class ResourceMap extends Properties {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
index b045f83..304e3db 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
@@ -500,7 +500,8 @@ public class ComponentUtil {
* @deprecated Since Tobago 1.5 please use {@link ComponentUtils}
*/
@Deprecated
- public static String getValueFromEl(String script) {
+ public static String getValueFromEl(String scriptParameter) {
+ String script = scriptParameter;
if (UIComponentTag.isValueReference(script)) {
final ValueBinding valueBinding = ComponentUtils.createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
index 97d1531..980fea9 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
@@ -119,7 +119,7 @@ public class UIViewRoot extends javax.faces.component.UIViewRoot {
clearEvents();
}
}
-
+
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
//
@@ -235,7 +235,7 @@ public class UIViewRoot extends javax.faces.component.UIViewRoot {
}
private void decodeActionComponent(final FacesContext facesContext, final AbstractUIPage page, final Map<String,
- UIComponent> ajaxComponents) {
+ UIComponent> ajaxComponents) {
final String actionId = page.getActionId();
UIComponent actionComponent = null;
if (actionId != null) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
index 1c69242..a9ac24e 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
@@ -25,6 +25,9 @@ import org.apache.myfaces.tobago.internal.util.Deprecation;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+/**
+ * @deprecated xxx
+ */
@Deprecated
public class ThemeConfig {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
index 27aa678..cff55b0 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
@@ -50,7 +50,7 @@ public class ResourceManagerUtil {
@Deprecated
public static String getPropertyNotNull(final FacesContext facesContext, final String bundle, final String key) {
final String result
- = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
+ = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
if (result == null) {
return "???" + key + "???";
} else {
@@ -60,6 +60,7 @@ public class ResourceManagerUtil {
/**
* Searches for an image and return it with the context path
+ *
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
@@ -69,11 +70,12 @@ public class ResourceManagerUtil {
/**
* Searches for an image and return it with the context path
+ *
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
public static String getImageWithPath(
- final FacesContext facesContext, final String name, final boolean ignoreMissing) {
+ final FacesContext facesContext, final String name, final boolean ignoreMissing) {
return ResourceManagerUtils.getImageWithPath(facesContext, name, ignoreMissing);
}
@@ -178,7 +180,7 @@ public class ResourceManagerUtil {
*/
@Deprecated
public static Measure getThemeMeasure(
- final FacesContext facesContext, final Configurable configurable, final String name) {
+ final FacesContext facesContext, final Configurable configurable, final String name) {
return ResourceManagerUtils.getThemeMeasure(facesContext, configurable, name);
}
@@ -189,5 +191,5 @@ public class ResourceManagerUtil {
public static boolean isAbsoluteResource(final String value) {
return ResourceManagerUtils.isAbsoluteResource(value);
}
-
+
}
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
index f7e042b..92acb35 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
@@ -54,7 +54,7 @@ public class ValueBindingResetInputActionListener extends AbstractResetInputActi
public void processAction(final ActionEvent event) {
final Object obj = clientIdsBinding.getValue(FacesContext.getCurrentInstance());
- final String [] clientIds;
+ final String[] clientIds;
if (obj instanceof String[]) {
clientIds = (String[]) obj;
} else if (obj instanceof String) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
index 64c465e..7c11e07 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
@@ -59,7 +59,8 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setIntegerProperty(final UIComponent component, final String name, String value) {
+ public static void setIntegerProperty(final UIComponent component, final String name, final String valueParameter) {
+ String value = valueParameter;
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -313,7 +314,8 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static String getValueFromEl(String script) {
+ public static String getValueFromEl(final String scriptParameter) {
+ String script = scriptParameter;
if (UIComponentTag.isValueReference(script)) {
final ValueBinding valueBinding = createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
index 7b2b66f..3c43baa 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
@@ -67,7 +67,8 @@ public final class AccessKeyMap {
duplicated = duplicated.append(key);
}
- public static boolean addAccessKey(final FacesContext facesContext, Character key) {
+ public static boolean addAccessKey(final FacesContext facesContext, final Character keyParameter) {
+ Character key = keyParameter;
key = key.toString().toLowerCase(Locale.ENGLISH).charAt(0);
final AccessKeyMap instance = getInstance(facesContext);
if (instance.getSet().contains(key)) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
index f6f596d..16b380a 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
@@ -253,8 +253,9 @@ public final class HtmlRendererUtil {
* @deprecated Please use HtmlRendererUtils
*/
@Deprecated
- public static String replaceStyleAttribute(String style, final String name,
+ public static String replaceStyleAttribute(String styleParameter, final String name,
final String value) {
+ String style = styleParameter;
style = removeStyleAttribute(style != null ? style : "", name);
return style + " " + name + ": " + value + ";";
}
@@ -287,11 +288,17 @@ public final class HtmlRendererUtil {
StyleClasses.ensureStyleClasses(component).addFullQualifiedClass(clazz);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static void createHeaderAndBodyStyles(final FacesContext facesContext, final UIComponent component) {
Deprecation.LOG.error("HtmlRendererUtils.createHeaderAndBodyStyles() no longer supported");
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static void createHeaderAndBodyStyles(
final FacesContext facesContext, final UIComponent component, final boolean width) {
@@ -327,7 +334,7 @@ public final class HtmlRendererUtil {
}
/**
- * @deprecated
+ * @deprecated xxx
*/
@Deprecated
public static void addImageSources(
@@ -434,7 +441,8 @@ public final class HtmlRendererUtil {
* @deprecated Please use HtmlRendererUtils
*/
@Deprecated
- public static String addTip(String title, final Object tip) {
+ public static String addTip(String titleParameter, final Object tip) {
+ String title = titleParameter;
if (tip != null) {
if (title != null && title.length() > 0) {
title += " :: ";
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
index 034460b..9f4d2ed 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlStyleMap.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @deprecated
+ * @deprecated xxx
* @see org.apache.myfaces.tobago.renderkit.css.Style
*/
@Deprecated
@@ -35,7 +35,8 @@ public class HtmlStyleMap extends HashMap<String, Object> {
private static final Logger LOG = LoggerFactory.getLogger(HtmlStyleMap.class);
private static final long serialVersionUID = 342607693971417143L;
- public Object put(final String s, Object o) {
+ public Object put(final String s, Object oParameter) {
+ Object o = oParameter;
if (o instanceof String && (s.equals("height") || s.equals("width"))) {
final String str = (String) o;
if (str.endsWith("px")) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
index 7105110..0b9fd08 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
@@ -107,8 +107,8 @@ public class CommandRendererHelper {
} else {
final String clientId = command.getClientId(facesContext);
- final String target = ComponentUtils.getStringAttribute(command, Attributes.TARGET);
- onclick = HtmlRendererUtils.createSubmitAction(clientId, transition, target, null);
+ final String t = ComponentUtils.getStringAttribute(command, Attributes.TARGET);
+ onclick = HtmlRendererUtils.createSubmitAction(clientId, transition, t, null);
}
if (command.getAttributes().get(Attributes.POPUP_CLOSE) != null
@@ -132,26 +132,27 @@ public class CommandRendererHelper {
return null;
}
final AbstractUICommand command = (AbstractUICommand) base;
- String onclick = command.getOnclick();
- if (onclick.contains("@autoId")) {
- onclick = StringUtils.replace(onclick, "@autoId", command.getClientId(facesContext));
+ String click = command.getOnclick();
+ if (click.contains("@autoId")) {
+ click = StringUtils.replace(click, "@autoId", command.getClientId(facesContext));
}
- return onclick;
+ return click;
}
- private String appendConfirmationScript(String onclick, final UIComponent component) {
+ private String appendConfirmationScript(String onclickParameter, final UIComponent component) {
+ String click = onclickParameter;
final ValueHolder confirmation = (ValueHolder) component.getFacet(Facets.CONFIRMATION);
if (confirmation != null) {
final StringBuilder script = new StringBuilder("return confirm('");
script.append(confirmation.getValue());
script.append("')");
- if (onclick != null) {
+ if (click != null) {
script.append(" && ");
- script.append(onclick);
+ script.append(click);
}
- onclick = script.toString();
+ click = script.toString();
}
- return onclick;
+ return click;
}
public String getOnclick() {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
index 4174a55..d23962e 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/util/JQueryUtils.java
@@ -31,7 +31,7 @@ public class JQueryUtils {
/**
* Puts two backslashes before : and . to escape them.
- * Two are needed, because of JavaScript string literals.
+ * Two are needed, because of JavaScript string literals.
*/
public static String escapeId(final String id) {
return id.replaceAll("([\\:\\.])", "\\\\\\\\$1");
@@ -39,7 +39,7 @@ public class JQueryUtils {
/**
* Puts one backslashes before \ to escape it.
- * It is needed, because of JavaScript string literals.
+ * It is needed, because of JavaScript string literals.
*/
public static String escapeValue(final String value) {
return value.replaceAll("\\\\", "\\\\\\\\");
@@ -48,7 +48,7 @@ public class JQueryUtils {
/**
* Puts two backslashes before #;&,.+*~':"!^$[]()=>|/ to escape them.
* Two are needed, because of JavaScript string literals.
- * Puts three backslashes before a \ itself, to escape it.
+ * Puts three backslashes before a \ itself, to escape it.
*/
public static String escapeSelector(final String value) {
final StringBuilder builder = new StringBuilder();
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
index b6282a1..363cab4 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
@@ -42,18 +42,27 @@ public final class MessageFactory {
private static final Map<Locale, ResourceBundle> FACES_MESSAGES_MAP = new HashMap<Locale, ResourceBundle>();
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String key, final FacesMessage.Severity severity, final Object[] args) {
return createFacesMessage(facesContext, "tobago", key, severity, args);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String key, final FacesMessage.Severity severity) {
return createFacesMessage(facesContext, key, severity, new Object[0]);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String bundle, final String key, final FacesMessage.Severity severity,
@@ -75,6 +84,9 @@ public final class MessageFactory {
return new FacesMessage(severity, summary != null ? summary : key, detail);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static Locale getLocale(final FacesContext facesContext) {
final UIViewRoot root = facesContext.getViewRoot();
@@ -87,12 +99,18 @@ public final class MessageFactory {
return locale;
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static FacesMessage createFacesMessage(
final FacesContext facesContext, final String bundle, final String key, final FacesMessage.Severity severity) {
return createFacesMessage(facesContext, bundle, key, severity, new Object[0]);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static String getMessageText(
final FacesContext facesContext, final String bundle, final String key) {
@@ -108,6 +126,9 @@ public final class MessageFactory {
return message;
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static ResourceBundle getFacesMessages(final Locale locale) {
ResourceBundle facesMessages = FACES_MESSAGES_MAP.get(locale);
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
index 9ab2102..67819f1 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
@@ -34,6 +34,9 @@ public class StringUtil {
private StringUtil() {
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static String firstToUpperCase(final String string) {
if (Deprecation.LOG.isWarnEnabled()) {
@@ -42,6 +45,9 @@ public class StringUtil {
return StringUtils.firstToUpperCase(string);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static List<Integer> parseIntegerList(final String integerList)
throws NumberFormatException {
@@ -51,6 +57,9 @@ public class StringUtil {
return StringUtils.parseIntegerList(integerList);
}
+ /**
+ * @deprecated xxx
+ */
@Deprecated
public static <T> String toString(final List<T> list) {
if (Deprecation.LOG.isWarnEnabled()) {
diff --git a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
index 5e13cd7..4a0281d 100644
--- a/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
+++ b/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
@@ -51,7 +51,7 @@ public final class VariableResolverUtil {
public static ClientProperties resolveClientProperties(final FacesContext facesContext) {
return (ClientProperties) resolveVariable(facesContext, ClientProperties.MANAGED_BEAN_NAME);
}
-
+
/**
* Clears the value of the variable.
* Useful for cleaning up e.g. a session or application variable
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
index ab8368c..24ed3d7 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
@@ -32,7 +32,7 @@ public abstract class AbstractUINumberSlider extends javax.faces.component.UIInp
public abstract Integer getMax();
public abstract boolean isReadonly();
-
+
public abstract boolean isDisabled();
public void validate(final FacesContext context) {
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
index 8b8d2cc..35c62d7 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrud.java
@@ -60,7 +60,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doDeleteItem();
@@ -90,7 +90,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doShowItem();
@@ -111,7 +111,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doCreateItem();
@@ -131,7 +131,7 @@ public abstract class AbstractCrud implements Crud {
* business logic completed successfully, the method has to return <i>true</i>.
* Otherwise the method has to return <i>false</i>.
* </p>
- *
+ *
* @return true if the method completed sucessfully, false if not
*/
protected abstract boolean doSaveItem();
@@ -163,9 +163,8 @@ public abstract class AbstractCrud implements Crud {
/**
* Set the outcome for all actions of the crud component.
- *
- * @param defaultOutcome
- * The outcome for all actions of the crud component
+ *
+ * @param defaultOutcome The outcome for all actions of the crud component
*/
public final void setDefaultOutcome(final String defaultOutcome) {
this.defaultOutcome = defaultOutcome;
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
index a20aac8..832fcf9 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
@@ -23,63 +23,63 @@ public interface Crud {
/**
* Indicates if the crud component should show the crud detail view
- * otherwise the crud master view is shown
- *
+ * otherwise the crud master view is shown
+ *
* @return True if the detail view should be shown, false if the master view
- * should be shown
+ * should be shown
*/
boolean getShowDetail();
/**
* Managed bean (controller) method to delete an selected item.
- *
+ *
* @return The outcome after the method was executed
*/
String deleteItem();
/**
* Managed bean (controller) method to show an selected item on the CRUD
- * detail view.
- *
+ * detail view.
+ *
* @return The outcome after the method was executed
*/
String showItem();
/**
* Managed bean (controller) method to show and edit an selected item on the
- * CRUD detail view.
- *
+ * CRUD detail view.
+ *
* @return The outcome after the method was executed
*/
String editItem();
/**
* Managed bean (controller) method to create a new item on the CRUD detail
- * view.
- *
+ * view.
+ *
* @return The outcome after the method was executed
*/
String createItem();
/**
* Managed bean (controller) method to save changes to a existing item or
- * save a newly created item on the crud detail view.
- *
+ * save a newly created item on the crud detail view.
+ *
* @return The outcome after the method was executed
*/
String saveItem();
/**
* Managed bean (controller) method to exit the crud detail view without
- * saving.
- *
+ * saving.
+ *
* @return The outcome after the method was executed
*/
String cancelItem();
/**
* Indicates wether an item shown in the CRUD detail view is editable.
- *
+ *
* @return true if the shown item is editable, false if not
*/
boolean isItemEditable();
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
index 63fa4ee..1c8326a 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
@@ -56,7 +56,7 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
final AbstractUINumberSlider slider = (AbstractUINumberSlider) component;
-
+
final String id = slider.getClientId(facesContext);
final String currentValue = getCurrentValue(facesContext, slider);
final boolean readonly = slider.isReadonly();
@@ -67,14 +67,14 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
final Style style = new Style(facesContext, slider);
final int width = -1;
- int sliderWidthPerc
- = getResourceManager().getThemeMeasure(facesContext, slider, SLIDER_WIDTH_PERCENT).getPixel();
- if (sliderWidthPerc <= 25) {
- sliderWidthPerc = 25;
- }
- if (sliderWidthPerc >= 75) {
- sliderWidthPerc = 75;
- }
+ int sliderWidthPerc
+ = getResourceManager().getThemeMeasure(facesContext, slider, SLIDER_WIDTH_PERCENT).getPixel();
+ if (sliderWidthPerc <= 25) {
+ sliderWidthPerc = 25;
+ }
+ if (sliderWidthPerc >= 75) {
+ sliderWidthPerc = 75;
+ }
int sliderWidth = 100; // fixme
int inputWidth = 50; // fixme;
if (style.getWidth() != null && style.getWidth().getPixel() >= 0) {
@@ -182,7 +182,7 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
private String getAbsoluteImagePath(final FacesContext facesContext, final String relativeImagePath) {
return facesContext.getExternalContext().getRequestContextPath()
- + ResourceManagerUtils.getImage(facesContext, relativeImagePath);
+ + ResourceManagerUtils.getImage(facesContext, relativeImagePath);
}
private String getIdForInputField(final FacesContext context, final UIComponent component) {
@@ -201,8 +201,8 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
}
private void writeSliderJavaScript(
- final FacesContext context, final UIComponent component, final TobagoResponseWriter writer)
- throws IOException {
+ final FacesContext context, final UIComponent component, final TobagoResponseWriter writer)
+ throws IOException {
final String trackId = getIdForSliderTrack(context, component);
final String handleId = getIdForSliderHandle(context, component);
final String inputId = getIdForInputField(context, component);
@@ -210,20 +210,20 @@ public class NumberSliderRenderer extends LayoutComponentRendererBase {
final Integer min = ComponentUtils.getIntAttribute(component, "min");
final Integer max = ComponentUtils.getIntAttribute(component, "max");
final String script = " var slider_" + jsId + " = new Control.Slider('" + handleId + "', '" + trackId + "', {\n"
- + " sliderValue:$('" + inputId + "').value,\n"
- + " range : $R(" + min + ", " + max + "),\n"
- + " values: $R(" + min + ", " + max + ").toArray(),\n"
- + " onSlide:function(v) {\n"
- + " $('" + inputId + "').value = v;\n"
- + " },\n"
- + " onChange:function(v) {\n"
- + " $('" + inputId + "').value = v;\n"
- + " }\n"
- + " });\n"
- + "\n"
- + " Event.observe('value', 'change', function() {\n"
- + " slider_" + jsId + ".setValue($('" + inputId + "').value);\n"
- + " });\n";
+ + " sliderValue:$('" + inputId + "').value,\n"
+ + " range : $R(" + min + ", " + max + "),\n"
+ + " values: $R(" + min + ", " + max + ").toArray(),\n"
+ + " onSlide:function(v) {\n"
+ + " $('" + inputId + "').value = v;\n"
+ + " },\n"
+ + " onChange:function(v) {\n"
+ + " $('" + inputId + "').value = v;\n"
+ + " }\n"
+ + " });\n"
+ + "\n"
+ + " Event.observe('value', 'change', function() {\n"
+ + " slider_" + jsId + ".setValue($('" + inputId + "').value);\n"
+ + " });\n";
writer.writeJavascript(script);
}
diff --git a/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java b/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
index b0dd3ed..b11830e 100644
--- a/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
+++ b/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/AuthorizationUtils.java
@@ -62,7 +62,7 @@ public class AuthorizationUtils {
return false;
}
if (securityAnnotation instanceof RolesAllowed) {
- final String [] roles = ((RolesAllowed) securityAnnotation).value();
+ final String[] roles = ((RolesAllowed) securityAnnotation).value();
if (LOG.isDebugEnabled()) {
LOG.debug("RolesAllowed " + Arrays.asList(((RolesAllowed) securityAnnotation).value()));
}
diff --git a/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java b/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
index 807f63e..9c2691b 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
+++ b/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
@@ -43,9 +43,9 @@ import java.io.IOException;
public class BoxRenderer extends BoxRendererBase {
/*
-
+
with shadow
-
+
<div class="tobago-box" style="width: 100px; height: 100px">
<div class="tobago-box-shadow" style="width: 99px; height: 99px">
<div class="tobago-box-border" style="width: 97px; height: 97px">
@@ -89,10 +89,10 @@ without shadow
}
private void encodeBox(final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box)
- throws IOException {
+ throws IOException {
// todo: shadow = 0px means, that shadow is disabled, but it may be better, if we can set a boolean in the config.
- // todo: this is possible after fixing
+ // todo: this is possible after fixing
final Measure measure = getResourceManager().getThemeMeasure(facesContext, box, "shadow");
final boolean hasShadow = measure.greaterThan(Measure.ZERO);
@@ -103,11 +103,11 @@ without shadow
final Style shadow = new Style();
Measure boxCurrentWidth = box.getCurrentWidth();
- if (boxCurrentWidth!=null) {
+ if (boxCurrentWidth != null) {
shadow.setWidth(boxCurrentWidth.subtract(1));
}
Measure boxCurrentHeight = box.getCurrentHeight();
- if (boxCurrentHeight!=null) {
+ if (boxCurrentHeight != null) {
shadow.setHeight(boxCurrentHeight.subtract(1));
}
writer.writeStyleAttribute(shadow);
@@ -117,10 +117,10 @@ without shadow
writer.writeClassAttribute(Classes.create(box, "border"));
final Style border = new Style();
- if (boxCurrentWidth!=null) {
+ if (boxCurrentWidth != null) {
border.setWidth(boxCurrentWidth.subtract(3));
}
- if (boxCurrentHeight!=null) {
+ if (boxCurrentHeight != null) {
border.setHeight(boxCurrentHeight.subtract(3));
}
writer.writeStyleAttribute(border);
@@ -137,7 +137,7 @@ without shadow
if (toolbar != null) {
renderToolbar(facesContext, writer, box, toolbar);
}
-
+
if (hasShadow) {
// border end
writer.endElement(HtmlElements.DIV);
@@ -152,10 +152,10 @@ without shadow
final Measure borderRight = box.getBorderRight();
final Measure borderTop = box.getBorderTop();
final Measure borderBottom = box.getBorderBottom();
- if (style.getWidth()!=null) {
+ if (style.getWidth() != null) {
style.setWidth(style.getWidth().subtract(borderLeft).subtract(borderRight));
}
- if (style.getHeight()!=null) {
+ if (style.getHeight() != null) {
style.setHeight(style.getHeight().subtract(borderTop).subtract(borderBottom));
}
style.setLeft(borderLeft);
@@ -164,7 +164,7 @@ without shadow
}
protected void renderBoxHeader(FacesContext facesContext, TobagoResponseWriter writer, UIComponent box)
- throws IOException {
+ throws IOException {
final UIComponent label = box.getFacet(Facets.LABEL);
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "header"));
@@ -185,8 +185,8 @@ without shadow
}
protected void renderToolbar(
- final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box, final UIPanel toolbar)
- throws IOException {
+ final FacesContext facesContext, final TobagoResponseWriter writer, final UIBox box, final UIPanel toolbar)
+ throws IOException {
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "headerToolBar"));
toolbar.setRendererType(RendererTypes.BOX_TOOL_BAR);