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 2017/06/07 20:28:49 UTC
svn commit: r1797997 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myfaces/tobago/util/ tob...
Author: lofwyr
Date: Wed Jun 7 20:28:49 2017
New Revision: 1797997
URL: http://svn.apache.org/viewvc?rev=1797997&view=rev
Log:
quality: sonarqube
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/trunk/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CategoryTree.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java?rev=1797997&r1=1797996&r2=1797997&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java Wed Jun 7 20:28:49 2017
@@ -322,8 +322,8 @@ public final class Markup implements Ser
if (value != null) {
return value.equals(markup);
}
- for (final String value : values) {
- if (value.equals(markup)) {
+ for (final String v : values) {
+ if (v.equals(markup)) {
return true;
}
}
@@ -341,8 +341,8 @@ public final class Markup implements Ser
if (value != null) {
return value.equals(markup.value);
} else {
- for (final String value : values) {
- if (value.equals(markup.value)) {
+ for (final String v : values) {
+ if (v.equals(markup.value)) {
return true;
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java?rev=1797997&r1=1797996&r2=1797997&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java Wed Jun 7 20:28:49 2017
@@ -54,7 +54,7 @@ public abstract class MessageLayoutRende
final List<FacesMessage> messages = facesContext.getMessageList(clientId);
final TobagoResponseWriter writer = getResponseWriter(facesContext);
- if (messages.size() > 0) {
+ if (!messages.isEmpty()) {
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.MESSAGES__CONTAINER, TobagoClass.FLEX_LAYOUT);
}
@@ -66,8 +66,8 @@ public abstract class MessageLayoutRende
final List<FacesMessage> messages = facesContext.getMessageList(clientId);
final TobagoResponseWriter writer = getResponseWriter(facesContext);
- if (messages.size() > 0) {
- encodeMessages(facesContext, writer, messages, clientId);
+ if (!messages.isEmpty()) {
+ encodeMessages(writer, messages);
writer.endElement(HtmlElements.DIV);
}
}
@@ -76,8 +76,8 @@ public abstract class MessageLayoutRende
protected abstract void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException;
- private void encodeMessages(final FacesContext facesContext, final TobagoResponseWriter writer,
- final List<FacesMessage> messages, final String clientId) throws IOException {
+ private void encodeMessages(
+ final TobagoResponseWriter writer, final List<FacesMessage> messages) throws IOException {
writer.startElement(HtmlElements.A);
writer.writeAttribute(HtmlAttributes.TABINDEX, "0", false);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlButtonTypes.BUTTON);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=1797997&r1=1797996&r2=1797997&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Wed Jun 7 20:28:49 2017
@@ -610,10 +610,10 @@ public final class ComponentUtils {
UIComponent from1 = from;
String relativeId1 = relativeId;
final int idLength = relativeId1.length();
- if (idLength > 0 && relativeId1.charAt(0) == '@') {
- if (relativeId1.equals("@this")) {
- return from1;
- }
+ if (idLength > 0
+ && relativeId1.charAt(0) == '@'
+ && "@this".equals(relativeId1)) {
+ return from1;
}
// Figure out how many colons
@@ -680,8 +680,8 @@ public final class ComponentUtils {
}
return clientId;
}
- LOG.error("No component found for id='" + componentId + "', "
- + "search base component is '" + component.getClientId(context) + "'");
+ LOG.error("No component found for id='{}', search base component is '{}'",
+ component != null ? component.getClientId(context) : "<null>");
return null;
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CategoryTree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CategoryTree.java?rev=1797997&r1=1797996&r2=1797997&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CategoryTree.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-data/src/main/java/org/apache/myfaces/tobago/example/data/CategoryTree.java Wed Jun 7 20:28:49 2017
@@ -25,6 +25,9 @@ import javax.swing.tree.DefaultMutableTr
public class CategoryTree {
+ private CategoryTree() {
+ }
+
public static DefaultMutableTreeNode createSample() {
final DefaultMutableTreeNode tree = createNode("Root Node", "root");
tree.insert(createNode("Sports", "sports"), 0);
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java?rev=1797997&r1=1797996&r2=1797997&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java Wed Jun 7 20:28:49 2017
@@ -88,7 +88,7 @@ public class ForEachController implement
discharge = null;
}
- public class River {
+ public class River implements Serializable {
private String name;
private int length;
private int discharge;