You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/09/23 15:22:28 UTC
[myfaces-tobago] branch master updated (eeb209b -> d2c69d1)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from eeb209b demo: Enhancements for Tobago 5.x
new f75fd7c refactor: generics
new d2c69d1 Update AbstractUIMessages.java
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tobago/event/AbstractResetInputActionListener.java | 4 ++--
.../tobago/internal/component/AbstractUICommandBase.java | 4 ++--
.../tobago/internal/component/AbstractUIFormBase.java | 12 ++++++------
.../tobago/internal/component/AbstractUIMessages.java | 8 ++++----
.../myfaces/tobago/internal/component/AbstractUIPage.java | 4 ++--
.../java/org/apache/myfaces/tobago/util/ComponentUtils.java | 9 ++++-----
.../org/apache/myfaces/tobago/util/DebugPhaseListener.java | 9 +++++----
.../apache/myfaces/tobago/example/demo/LocaleController.java | 2 +-
.../tobago/example/demo/nonfacesrequest/FishPond.java | 2 +-
.../myfaces/tobago/apt/processor/FacesConfigGenerator.java | 3 ++-
10 files changed, 29 insertions(+), 28 deletions(-)
[myfaces-tobago] 02/02: Update AbstractUIMessages.java
Posted by 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
commit d2c69d1761cd22e027df6e96917156432dde4966
Author: Udo Schnurpfeil <gi...@schnurpfeil.de>
AuthorDate: Thu Sep 23 17:07:44 2021 +0200
Update AbstractUIMessages.java
---
.../apache/myfaces/tobago/internal/component/AbstractUIMessages.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index 553fbea..3ce7a35 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -39,7 +39,7 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
final Iterator<String> clientIds;
if (isGlobalOnly()) {
- clientIds = Collections.singleton((String)null).iterator();
+ clientIds = Collections.singleton((String) null).iterator();
} else if (getFor() != null) {
clientIds = Collections.singleton(getFor()).iterator();
} else {
[myfaces-tobago] 01/02: refactor: generics
Posted by 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
commit f75fd7c2a00ee9089ad70e9c1c15dd88eaf313d9
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Sep 23 16:43:53 2021 +0200
refactor: generics
issue: TOBAGO-2045
---
.../tobago/event/AbstractResetInputActionListener.java | 4 ++--
.../tobago/internal/component/AbstractUICommandBase.java | 4 ++--
.../tobago/internal/component/AbstractUIFormBase.java | 12 ++++++------
.../tobago/internal/component/AbstractUIMessages.java | 8 ++++----
.../myfaces/tobago/internal/component/AbstractUIPage.java | 4 ++--
.../java/org/apache/myfaces/tobago/util/ComponentUtils.java | 9 ++++-----
.../org/apache/myfaces/tobago/util/DebugPhaseListener.java | 9 +++++----
.../apache/myfaces/tobago/example/demo/LocaleController.java | 2 +-
.../tobago/example/demo/nonfacesrequest/FishPond.java | 2 +-
.../myfaces/tobago/apt/processor/FacesConfigGenerator.java | 3 ++-
10 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
index 96c5eca..ccf6e93 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
@@ -27,9 +27,9 @@ import java.util.Iterator;
public abstract class AbstractResetInputActionListener implements ActionListener {
protected void resetChildren(final UIComponent component) {
- final Iterator it = component.getFacetsAndChildren();
+ final Iterator<UIComponent> it = component.getFacetsAndChildren();
while (it.hasNext()) {
- final UIComponent child = (UIComponent) it.next();
+ final UIComponent child = it.next();
if (child instanceof EditableValueHolder) {
reset((EditableValueHolder) child);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
index bb7d1f7..9acc787 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
@@ -73,9 +73,9 @@ public abstract class AbstractUICommandBase extends UICommand
throw e;
}
- final Iterator kids = getFacetsAndChildren();
+ final Iterator<UIComponent> kids = getFacetsAndChildren();
while (kids.hasNext()) {
- final UIComponent kid = (UIComponent) kids.next();
+ final UIComponent kid = kids.next();
kid.processDecodes(context);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
index 798c7d3..d6b12cd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
@@ -46,9 +46,9 @@ public abstract class AbstractUIFormBase extends UIForm implements Visual {
// for the following children
decode(facesContext);
- final Iterator kids = getFacetsAndChildren();
+ final Iterator<UIComponent> kids = getFacetsAndChildren();
while (kids.hasNext()) {
- final UIComponent kid = (UIComponent) kids.next();
+ final UIComponent kid = kids.next();
kid.processDecodes(facesContext);
}
}
@@ -71,9 +71,9 @@ public abstract class AbstractUIFormBase extends UIForm implements Visual {
}
if (isSubmitted() || AjaxUtils.isAjaxRequest(facesContext)) {
// Process all facets and children of this component
- final Iterator kids = getFacetsAndChildren();
+ final Iterator<UIComponent> kids = getFacetsAndChildren();
while (kids.hasNext()) {
- final UIComponent kid = (UIComponent) kids.next();
+ final UIComponent kid = kids.next();
kid.processValidators(facesContext);
}
} else {
@@ -91,9 +91,9 @@ public abstract class AbstractUIFormBase extends UIForm implements Visual {
}
if (isSubmitted() || AjaxUtils.isAjaxRequest(facesContext)) {
// Process all facets and children of this component
- final Iterator kids = getFacetsAndChildren();
+ final Iterator<UIComponent> kids = getFacetsAndChildren();
while (kids.hasNext()) {
- final UIComponent kid = (UIComponent) kids.next();
+ final UIComponent kid = kids.next();
kid.processUpdates(facesContext);
}
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index f811915..553fbea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -37,9 +37,9 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
public List<Item> createMessageList(final FacesContext facesContext) {
- final Iterator clientIds;
+ final Iterator<String> clientIds;
if (isGlobalOnly()) {
- clientIds = Collections.singleton(null).iterator();
+ clientIds = Collections.singleton((String)null).iterator();
} else if (getFor() != null) {
clientIds = Collections.singleton(getFor()).iterator();
} else {
@@ -56,10 +56,10 @@ public abstract class AbstractUIMessages extends javax.faces.component.UIMessage
return messages;
}
- private List<Item> collectMessageList(final FacesContext facesContext, final Iterator clientIds) {
+ private List<Item> collectMessageList(final FacesContext facesContext, final Iterator<String> clientIds) {
final List<Item> messages = new ArrayList<>();
while (clientIds.hasNext()) {
- final String clientId = (String) clientIds.next();
+ final String clientId = clientIds.next();
final Iterator<FacesMessage> i = facesContext.getMessages(clientId);
while (i.hasNext()) {
final FacesMessage facesMessage = i.next();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index 14593eb..e2a0c29 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -70,8 +70,8 @@ public abstract class AbstractUIPage extends AbstractUIFormBase implements Clien
markSubmittedForm(context);
// invoke processDecodes() on children
- for (final Iterator kids = getFacetsAndChildren(); kids.hasNext();) {
- final UIComponent kid = (UIComponent) kids.next();
+ for (final Iterator<UIComponent> kids = getFacetsAndChildren(); kids.hasNext();) {
+ final UIComponent kid = kids.next();
kid.processDecodes(context);
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index 2a0172f..8771768 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -107,11 +107,10 @@ public final class ComponentUtils {
}
public static String getFacesMessageAsString(final FacesContext facesContext, final UIComponent component) {
- final Iterator messages = facesContext.getMessages(
- component.getClientId(facesContext));
+ final Iterator<FacesMessage> messages = facesContext.getMessages(component.getClientId(facesContext));
final StringBuilder stringBuffer = new StringBuilder();
while (messages.hasNext()) {
- final FacesMessage message = (FacesMessage) messages.next();
+ final FacesMessage message = messages.next();
stringBuffer.append(message.getDetail());
}
if (stringBuffer.length() > 0) {
@@ -791,9 +790,9 @@ public final class ComponentUtils {
FacesMessage.Severity max = null;
for (final String id : (Iterable<String>) facesContext::getClientIdsWithMessages) {
if (id != null && id.startsWith(clientId)) {
- final Iterator messages = facesContext.getMessages(id);
+ final Iterator<FacesMessage> messages = facesContext.getMessages(id);
while (messages.hasNext()) {
- final FacesMessage message = (FacesMessage) messages.next();
+ final FacesMessage message = messages.next();
if (max == null || message.getSeverity().getOrdinal() > max.getOrdinal()) {
max = message.getSeverity();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
index 464fa90..2ff1d80 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
@@ -77,11 +77,12 @@ public class DebugPhaseListener implements PhaseListener {
LOG.info("Total response time : " + (end - start + " milliseconds"));
}
}
- for (final Iterator iterator = facesContext.getClientIdsWithMessages(); iterator.hasNext();) {
- final String clientId = (String) iterator.next();
+ for (final Iterator<String> iterator = facesContext.getClientIdsWithMessages(); iterator.hasNext();) {
+ final String clientId = iterator.next();
- for (final Iterator messageIterator = facesContext.getMessages(clientId); messageIterator.hasNext();) {
- final FacesMessage msg = (FacesMessage) messageIterator.next();
+ for (final Iterator<FacesMessage> messageIterator
+ = facesContext.getMessages(clientId); messageIterator.hasNext();) {
+ final FacesMessage msg = messageIterator.next();
LOG.info(MessageFormat.format("Faces message found."
+ "\n Component: {0} \n Severity : {1}"
+ "\n Summary : {2} \n Detail : {3}",
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
index 78d3451..763a885 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
@@ -89,7 +89,7 @@ public class LocaleController implements Serializable {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final Application application = facesContext.getApplication();
final Locale defaultLocale = application.getDefaultLocale();
- final Iterator supportedLocales = application.getSupportedLocales();
+ final Iterator<Locale> supportedLocales = application.getSupportedLocales();
boolean defaultInList = false;
final List<SelectItem> localeItems = new ArrayList<>();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
index b8ad51f..20f085e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
@@ -36,7 +36,7 @@ public class FishPond implements Serializable {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private Map<Integer, String> fishes;
+ private final Map<Integer, String> fishes;
private Integer selectedFishId = null;
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
index a94cf8c..d08c727 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
@@ -29,6 +29,7 @@ import org.apache.myfaces.tobago.apt.annotation.Validator;
import org.apache.myfaces.tobago.apt.generate.ComponentInfo;
import org.jdom2.Attribute;
import org.jdom2.Comment;
+import org.jdom2.Content;
import org.jdom2.Document;
import org.jdom2.Namespace;
import org.jdom2.filter.ContentFilter;
@@ -623,7 +624,7 @@ public class FacesConfigGenerator extends AbstractGenerator {
}
private void normaliseLineEndings(final Document document) {
- final Iterator i = document.getDescendants(new ContentFilter(ContentFilter.COMMENT));
+ final Iterator<Content> i = document.getDescendants(new ContentFilter(ContentFilter.COMMENT));
while (i.hasNext()) {
final Comment c = (Comment) i.next();
c.setText(c.getText().replaceAll("\n", SEPARATOR));