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 2011/05/19 14:07:03 UTC

svn commit: r1124700 - in /myfaces/tobago/branches/tobago-1.0.x: core/src/main/java/org/apache/myfaces/tobago/component/UIData.java sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java

Author: lofwyr
Date: Thu May 19 12:07:03 2011
New Revision: 1124700

URL: http://svn.apache.org/viewvc?rev=1124700&view=rev
Log:
TOBAGO-1000 SimpleSheetState throws NPE if selectable="none" is set
 - using empty list instead of null
 - removing useless code

Modified:
    myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
    myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java

Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java?rev=1124700&r1=1124699&r2=1124700&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java Thu May 19 12:07:03 2011
@@ -48,6 +48,7 @@ import javax.faces.event.PhaseId;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -514,7 +515,8 @@ public class UIData extends javax.faces.
 //      state.setAscending(sortActionListener != null && sortActionListener.isAscending());
       Map attributes = getAttributes();
       //noinspection unchecked
-      state.setSelectedRows((List<Integer>) attributes.get(ATTR_SELECTED_LIST_STRING));
+      final List<Integer> list = (List<Integer>) attributes.get(ATTR_SELECTED_LIST_STRING);
+      state.setSelectedRows(list != null ? list : Collections.<Integer>emptyList());
       state.setColumnWidths((String) attributes.get(ATTR_WIDTH_LIST_STRING));
       state.setScrollPosition((Integer[]) attributes.get(ATTR_SCROLL_POSITION));
       attributes.remove(ATTR_SELECTED_LIST_STRING);

Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java?rev=1124700&r1=1124699&r2=1124700&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SimpleSheetRenderer.java Thu May 19 12:07:03 2011
@@ -234,7 +234,6 @@ public class SimpleSheetRenderer extends
       writer.writeIdAttribute(sheetId + "_data_tr_" + row);
       writer.writeAttribute(HtmlAttributes.STYLE, "top: "+ top+ "px; left: 0px;", false);
       writer.flush();
-      boolean rowSelected = selectedRows.contains(row);
 
       int columnIndex = -1;
       int currentLeft = 0;