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 20:11:03 UTC
[myfaces-tobago] branch TOBAGO-1999_Select2 updated: fic checkstyle
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
The following commit(s) were added to refs/heads/TOBAGO-1999_Select2 by this push:
new d9a9d0d fic checkstyle
d9a9d0d is described below
commit d9a9d0d1b16aa0b4169bc4e92e2c08a1da357246
Author: Volker Weber <we...@apache.org>
AuthorDate: Sun Feb 13 21:10:55 2022 +0100
fic checkstyle
---
.../myfaces/tobago/facelets/SelectManyBoxRule.java | 2 +-
.../apache/myfaces/tobago/util/SelectItemUtils.java | 4 ++--
.../tobago/example/demo/Select2Controller.java | 20 ++++++++++----------
.../standard/tag/SelectOneChoiceRenderer.java | 2 +-
.../renderkit/html/util/HtmlRendererUtils.java | 5 +++--
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SelectManyBoxRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SelectManyBoxRule.java
index 5f38c37..ad8459d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SelectManyBoxRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SelectManyBoxRule.java
@@ -48,7 +48,7 @@ public class SelectManyBoxRule extends MetaRule {
private final TagAttribute attribute;
- public TokenSeparatorsMapper(TagAttribute attribute) {
+ TokenSeparatorsMapper(TagAttribute attribute) {
this.attribute = attribute;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/SelectItemUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/SelectItemUtils.java
index 874a18a..7da70e6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/SelectItemUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/SelectItemUtils.java
@@ -156,7 +156,7 @@ public class SelectItemUtils {
nextItem = (SelectItem) item;
return true;
} else { // UISelectItems
- currentUISelectItems = ((UISelectItems) child);
+ currentUISelectItems = (UISelectItems) child;
final Object value = currentUISelectItems.getValue();
if (value instanceof SelectItem) {
@@ -177,7 +177,7 @@ public class SelectItemUtils {
nestedItems = ((Iterable<?>) value).iterator();
return hasNext();
} else if (value instanceof Map) {
- final Map<Object, Object> map = ((Map<Object, Object>) value);
+ final Map<Object, Object> map = (Map<Object, Object>) value;
final Collection<SelectItem> items = new ArrayList<SelectItem>(map.size());
for (Map.Entry<Object, Object> entry : map.entrySet()) {
items.add(new org.apache.myfaces.tobago.model.SelectItem(entry.getValue(), entry.getKey().toString()));
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Select2Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Select2Controller.java
index ac4202e..959c004 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Select2Controller.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Select2Controller.java
@@ -135,11 +135,11 @@ public class Select2Controller implements Serializable {
public List<SelectItem> getMany7CountryItems() {
if (many7Countries != null && !many7Countries.isEmpty()) {
- List<SelectItem> items = new ArrayList<SelectItem>();
+ List<SelectItem> selectItems = new ArrayList<SelectItem>();
for (String locale : many7Countries) {
- items.add(new SelectItem(locale));
+ selectItems.add(new SelectItem(locale));
}
- return items;
+ return selectItems;
} else {
return Collections.emptyList();
}
@@ -158,11 +158,11 @@ public class Select2Controller implements Serializable {
public List<SelectItem> getMany8LocaleItems() {
if (many8Locales != null && !many8Locales.isEmpty()) {
Locale displayLocale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
- List<SelectItem> items = new ArrayList<SelectItem>();
+ List<SelectItem> selectItems = new ArrayList<SelectItem>();
for (Locale locale : many8Locales) {
- items.add(new SelectItem(locale, locale.getDisplayName(displayLocale)));
+ selectItems.add(new SelectItem(locale, locale.getDisplayName(displayLocale)));
}
- return items;
+ return selectItems;
} else {
return Collections.emptyList();
}
@@ -180,11 +180,11 @@ public class Select2Controller implements Serializable {
public List<SelectItem> getMany9NumbersItems() {
if (many9Numbers != null && !many9Numbers.isEmpty()) {
- List<SelectItem> items = new ArrayList<SelectItem>();
+ List<SelectItem> selectItems = new ArrayList<SelectItem>();
for (Integer number : many9Numbers) {
- items.add(new SelectItem(number, Integer.toString(number)));
+ selectItems.add(new SelectItem(number, Integer.toString(number)));
}
- return items;
+ return selectItems;
} else {
return Collections.emptyList();
}
@@ -217,7 +217,7 @@ public class Select2Controller implements Serializable {
private Map<String, Locale> localeMap;
- public LocaleConverter() {
+ private LocaleConverter() {
localeMap = new HashMap<String, Locale>();
for (final Locale locale : Locale.getAvailableLocales()) {
localeMap.put(locale.toString(), locale);
diff --git a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
index 8035747..7874276 100644
--- a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
+++ b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
@@ -118,7 +118,7 @@ public class SelectOneChoiceRenderer extends SelectOneRendererBase {
writer.writeAttribute(DataAttributes.SUGGEST_ID, suggest.getClientId(facesContext), false);
}
- HtmlRendererUtils.renderCommandFacet(select, facesContext , writer);
+ HtmlRendererUtils.renderCommandFacet(select, facesContext, writer);
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
if (renderAsSelect2 && select.getPlaceholder() != null && select.getPlaceholder().length() > 0) {
writer.startElement(HtmlElements.OPTION, null);
diff --git a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
index 5f04f66..34097ec 100644
--- a/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
+++ b/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
@@ -414,8 +414,9 @@ public final class HtmlRendererUtils {
LOG.debug("values = '{}'", Arrays.toString(values));
LOG.debug("submittedValues = '{}'", Arrays.toString(submittedValues));
}
- items = UISelect2ComponentUtil.ensureSubmittedValues(facesContext, component, items, submittedValues);
- for (final SelectItem item : items) {
+ Iterable<SelectItem> iterableItems
+ = UISelect2ComponentUtil.ensureSubmittedValues(facesContext, component, items, submittedValues);
+ for (final SelectItem item : iterableItems) {
if (item instanceof SelectItemGroup) {
writer.startElement(HtmlElements.OPTGROUP, null);
writer.writeAttribute(HtmlAttributes.LABEL, item.getLabel(), true);