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 2016/08/05 13:40:44 UTC
svn commit: r1755321 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/
tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/
Author: lofwyr
Date: Fri Aug 5 13:40:44 2016
New Revision: 1755321
URL: http://svn.apache.org/viewvc?rev=1755321&view=rev
Log:
suppress warning, if no rendered partially ids
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java?rev=1755321&r1=1755320&r2=1755321&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java Fri Aug 5 13:40:44 2016
@@ -289,7 +289,7 @@ public abstract class TobagoResponseWrit
protected final String getCallingClassStackTraceElementString() {
final StackTraceElement[] stackTrace = new Exception().getStackTrace();
int i = 1;
- while (stackTrace[i].getClassName().contains("TobagoResponseWriter")) {
+ while (stackTrace[i].getClassName().contains("ResponseWriter")) {
i++;
}
return stackTrace[i].toString();
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1755321&r1=1755320&r2=1755321&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Fri Aug 5 13:40:44 2016
@@ -197,8 +197,10 @@ public class SheetRenderer extends Rende
final UIReload update = (UIReload) facetReload;
writer.writeAttribute(DataAttributes.RELOAD, update.getFrequency());
}
- writer.writeAttribute(DataAttributes.PARTIAL_IDS,
- ComponentUtils.evaluateClientIds(facesContext, sheet, sheet.getRenderedPartially()), false);
+ final String partialIds = ComponentUtils.evaluateClientIds(facesContext, sheet, sheet.getRenderedPartially());
+ if (partialIds != null) {
+ writer.writeAttribute(DataAttributes.PARTIAL_IDS, partialIds, false);
+ }
writer.writeAttribute(DataAttributes.SELECTION_MODE, sheet.getSelectable().name(), false);
writer.writeAttribute(DataAttributes.FIRST, Integer.toString(sheet.getFirst()), false);
final StringBuilder builder = new StringBuilder();