[richfaces-svn-commits] JBoss Rich Faces SVN: r18811 - in branches/RF-9112: cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/reflections and 11 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Thu Aug 19 08:49:30 EDT 2010


Author: jbalunas at redhat.com
Date: 2010-08-19 08:49:29 -0400 (Thu, 19 Aug 2010)
New Revision: 18811

Modified:
   branches/RF-9112/
   branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/reflections/ReflectionsExt.java
   branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java
   branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/MavenLogErrorReporter.java
   branches/RF-9112/examples/iteration-demo/src/main/webapp/list.xhtml
   branches/RF-9112/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SelectsBean.java
   branches/RF-9112/examples/richfaces-showcase/src/main/webapp/richfaces/autocomplete/samples/cachedAjax-sample.xhtml
   branches/RF-9112/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java
   branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java
   branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/renderkit/LogRendererBase.java
   branches/RF-9112/ui/input/ui/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
   branches/RF-9112/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
   branches/RF-9112/ui/input/ui/src/main/templates/inplaceInput.template.xml
   branches/RF-9112/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
Log:
Merged revisions 18794-18795,18797-18800,18805-18807 via svnmerge from 
https://svn.jboss.org/repos/richfaces/trunk

.......
  r18794 | ilya_shaikovsky | 2010-08-19 03:44:52 -0400 (Thu, 19 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9113
.......
  r18795 | nbelaevski | 2010-08-19 05:14:23 -0400 (Thu, 19 Aug 2010) | 3 lines
  
  Maven resources plugin:
  - fixed CNFE
  - improved JavaScript compressor logging better in multi-threded envs.
.......
  r18797 | abelevich | 2010-08-19 06:42:19 -0400 (Thu, 19 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9095
.......
  r18798 | ilya_shaikovsky | 2010-08-19 07:28:57 -0400 (Thu, 19 Aug 2010) | 1 line
  
  syntax error in attribute name corrected.
.......
  r18799 | nbelaevski | 2010-08-19 07:49:08 -0400 (Thu, 19 Aug 2010) | 1 line
  
  logMode attribute default value set via CDK
.......
  r18800 | nbelaevski | 2010-08-19 07:49:41 -0400 (Thu, 19 Aug 2010) | 1 line
  
  Removed unnecessary null check in inputNumberSlider
.......
  r18805 | nbelaevski | 2010-08-19 07:55:53 -0400 (Thu, 19 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9075
.......
  r18806 | nbelaevski | 2010-08-19 07:56:09 -0400 (Thu, 19 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9075
.......
  r18807 | abelevich | 2010-08-19 07:59:59 -0400 (Thu, 19 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9065
.......



Property changes on: branches/RF-9112
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-18778 /branches/RF-9023:1-18690 /branches/RF-9040_build_updated_m2:1-18626
   + /trunk:1-18810 /branches/RF-9023:1-18690 /branches/RF-9040_build_updated_m2:1-18626

Modified: branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/reflections/ReflectionsExt.java
===================================================================
--- branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/reflections/ReflectionsExt.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/reflections/ReflectionsExt.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -30,6 +30,9 @@
 import org.reflections.scanners.Scanner;
 import org.reflections.util.Utils;
 
+import com.google.common.base.Function;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Multimap;
 
 /**
@@ -38,6 +41,22 @@
  */
 public class ReflectionsExt extends Reflections {
 
+    private static final Function<String, Class<?>> CLASS_FOR_NAME = new Function<String, Class<?>>() {
+        public java.lang.Class<?> apply(String from) {
+            try {
+                return Class.forName(from, true, Utils.getContextClassLoader());
+            } catch (ClassNotFoundException e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            } catch (LinkageError e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+            
+            return null;
+        };
+    };
+
     public ReflectionsExt() {
         super();
     }
@@ -56,7 +75,9 @@
         if (scannerMMap == null) {
             return Collections.emptySet();
         }
-        return Utils.forNames(scannerMMap.get(MarkerResourcesScanner.STORE_KEY));
+
+        return Collections2.filter(Collections2.transform(scannerMMap.get(MarkerResourcesScanner.STORE_KEY), CLASS_FOR_NAME), 
+            Predicates.notNull());
     }
 
 }

Modified: branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java
===================================================================
--- branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -49,8 +49,16 @@
 
     @Override
     protected void doActualProcess(String resourceName, Reader in, Writer out) throws IOException {
-        MavenLogErrorReporter reporter = new MavenLogErrorReporter(log, resourceName);
+        MavenLogErrorReporter reporter = new MavenLogErrorReporter(resourceName);
         new JavaScriptCompressor(in, reporter).compress(out, 0, true, true, false, false);
+        
+        if (reporter.hasErrors()) {
+            log.error(reporter.getErrorsLog());
+        }
+        
+        if (reporter.hasWarnings()) {
+            log.warn(reporter.getWarningsLog());
+        }
     }
     
 }

Modified: branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/MavenLogErrorReporter.java
===================================================================
--- branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/MavenLogErrorReporter.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/MavenLogErrorReporter.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -24,7 +24,6 @@
 
 import java.text.MessageFormat;
 
-import org.apache.maven.plugin.logging.Log;
 import org.mozilla.javascript.ErrorReporter;
 import org.mozilla.javascript.EvaluatorException;
 
@@ -38,11 +37,12 @@
     
     private String resourceName;
     
-    private Log log;
+    private StringBuilder errorMessages = new StringBuilder();
     
-    public MavenLogErrorReporter(Log log, String resourceName) {
+    private StringBuilder warningMessages = new StringBuilder();
+    
+    public MavenLogErrorReporter(String resourceName) {
         super();
-        this.log = log;
         this.resourceName = resourceName;
     }
 
@@ -55,7 +55,8 @@
     
     @Override
     public void warning(String message, String sourceName, int line, String lineSource, int lineOffset) {
-        log.warn(formatMessage(message, sourceName, line, lineSource, lineOffset));
+        warningMessages.append(formatMessage(message, sourceName, line, lineSource, lineOffset));
+        warningMessages.append('\n');
     }
 
     @Override
@@ -65,6 +66,23 @@
 
     @Override
     public void error(String message, String sourceName, int line, String lineSource, int lineOffset) {
-        log.error(formatMessage(message, sourceName, line, lineSource, lineOffset));
+        errorMessages.append(formatMessage(message, sourceName, line, lineSource, lineOffset));
+        errorMessages.append('\n');
     }
+    
+    public boolean hasErrors() {
+        return errorMessages.length() > 0;
+    }
+    
+    public String getErrorsLog() {
+        return errorMessages.toString();
+    }
+    
+    public boolean hasWarnings() {
+        return warningMessages.length() > 0;
+    }
+    
+    public String getWarningsLog() {
+        return warningMessages.toString();
+    }
 }
\ No newline at end of file

Modified: branches/RF-9112/examples/iteration-demo/src/main/webapp/list.xhtml
===================================================================
--- branches/RF-9112/examples/iteration-demo/src/main/webapp/list.xhtml	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/examples/iteration-demo/src/main/webapp/list.xhtml	2010-08-19 12:49:29 UTC (rev 18811)
@@ -22,10 +22,10 @@
 	<h:form id="form1">
 		<it:list id="list" var="item" value="#{dataBean.employeeList}" rows="20" type="#{listBean.listType}">
 			<f:facet name="term">
-				#{item.EMail}
+				E-mail: #{item.EMail}
 			</f:facet>
 
-			#{item.name}
+			Name: #{item.name}
 		</it:list>
 
 		<it:dataScroller for="list" />

Modified: branches/RF-9112/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SelectsBean.java
===================================================================
--- branches/RF-9112/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SelectsBean.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SelectsBean.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -10,13 +10,13 @@
 
 /**
  * @author Ilya Shaikovsky
- *
+ * 
  */
 @ManagedBean(name = "selectsBean")
 @RequestScoped
 public class SelectsBean {
-    private static final String[] FRUITS = {"", "Banana", "Cranberry", "Blueberry", "Orange"};
-    private static final String[] VEGETABLES = {"", "Potatoes", "Broccoli", "Garlic", "Carrot"};
+    private static final String[] FRUITS = { "", "Banana", "Cranberry", "Blueberry", "Orange" };
+    private static final String[] VEGETABLES = { "", "Potatoes", "Broccoli", "Garlic", "Carrot" };
     private String currentItem = "";
     private String currentType = "";
     private List<SelectItem> firstList = new ArrayList<SelectItem>();
@@ -54,19 +54,20 @@
 
     public void valueChanged(ValueChangeEvent event) {
         secondList.clear();
+        if (null != event.getNewValue()) {
+            String[] currentItems;
 
-        String[] currentItems;
+            if (((String) event.getNewValue()).equals("fruits")) {
+                currentItems = FRUITS;
+            } else {
+                currentItems = VEGETABLES;
+            }
 
-        if (((String) event.getNewValue()).equals("fruits")) {
-            currentItems = FRUITS;
-        } else {
-            currentItems = VEGETABLES;
-        }
+            for (int i = 0; i < currentItems.length; i++) {
+                SelectItem item = new SelectItem(currentItems[i]);
 
-        for (int i = 0; i < currentItems.length; i++) {
-            SelectItem item = new SelectItem(currentItems[i]);
-
-            secondList.add(item);
+                secondList.add(item);
+            }
         }
     }
 

Modified: branches/RF-9112/examples/richfaces-showcase/src/main/webapp/richfaces/autocomplete/samples/cachedAjax-sample.xhtml
===================================================================
--- branches/RF-9112/examples/richfaces-showcase/src/main/webapp/richfaces/autocomplete/samples/cachedAjax-sample.xhtml	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/examples/richfaces-showcase/src/main/webapp/richfaces/autocomplete/samples/cachedAjax-sample.xhtml	2010-08-19 12:49:29 UTC (rev 18811)
@@ -13,7 +13,7 @@
 	<p>Autocomplete without direct suggestions to input(<b>autoFill="false"</b>). Also in the sample comma and space are input <b>tokens</b>, so separate
 	autocompletion requests will be fired for different parts in input</p>
 	<h:form>
-		<rich:autocomplete mode="cachedAjax" tokens=", " autoFill="false"
+		<rich:autocomplete mode="cachedAjax" tokens=", " autofill="false"
 			autocompleteMethod="#{autocompleteBean.autocomplete}" />
 	</h:form>
 	<p>In that sample <b>selectFirst</b> set to false so pressing enter will not choose the value from list

Modified: branches/RF-9112/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java
===================================================================
--- branches/RF-9112/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -23,7 +23,6 @@
 package org.ajax4jsf.component.behavior;
 
 import javax.el.ELContext;
-import javax.el.ELException;
 import javax.el.MethodExpression;
 import javax.el.MethodNotFoundException;
 import javax.faces.component.StateHolder;
@@ -67,36 +66,14 @@
 
     public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException {
 
-        Throwable cause = null;
-        Throwable thrown = null;
-
-        if (event == null) {
-            throw new NullPointerException();
-        }
-
         FacesContext context = FacesContext.getCurrentInstance();
         ELContext elContext = context.getELContext();
+        
         try {
             methodExpressionZeroArg.invoke(elContext, new Object[] {});
         } catch (MethodNotFoundException mnfe) {
-            if (null != methodExpressionOneArg) {
-
-                try {
-                    methodExpressionOneArg.invoke(elContext, new Object[] { event});
-                } catch (ELException ee) {
-                    cause = ee.getCause();
-                    thrown = ee;
-                }
-            }
-        } catch (ELException ee) {
-            cause = ee.getCause();
-            thrown = ee;
-        }
-
-        if (null != thrown) {
-            throw cause == null ? new AbortProcessingException(thrown.getMessage(), thrown)
-                : new AbortProcessingException(thrown.getMessage(), cause);
-        }
+            methodExpressionOneArg.invoke(elContext, new Object[] { event});
+        } 
     }
 
     public boolean isTransient() {

Modified: branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java
===================================================================
--- branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -63,6 +63,7 @@
     @Attribute(defaultValue = "")
     public abstract String getStyleClass();
     
+    @Attribute(defaultValue = "LogMode.DEFAULT")
     public abstract LogMode getMode();
 
 //  public abstract String getHotkey();

Modified: branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/renderkit/LogRendererBase.java
===================================================================
--- branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/renderkit/LogRendererBase.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/core/ui/src/main/java/org/richfaces/renderkit/LogRendererBase.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -32,10 +32,6 @@
 
     protected boolean isInline(Object attributeValue) {
         LogMode mode = (LogMode) attributeValue;
-        if (mode == null) {
-            mode = LogMode.DEFAULT;
-        }
-        
         return mode == LogMode.inline;
     }
     

Modified: branches/RF-9112/ui/input/ui/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
===================================================================
--- branches/RF-9112/ui/input/ui/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/input/ui/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -33,10 +33,6 @@
 
     protected boolean isInputPosition(UIComponent component, String name) {
         InputNumberSliderInputPosition type = (InputNumberSliderInputPosition) component.getAttributes().get("inputPosition");
-        if (type == null) {
-            type = InputNumberSliderInputPosition.DEFAULT;
-        }
-        
         return type == InputNumberSliderInputPosition.valueOf(name);
     }
     

Modified: branches/RF-9112/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
===================================================================
--- branches/RF-9112/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss	2010-08-19 12:49:29 UTC (rev 18811)
@@ -13,6 +13,10 @@
 	font-size : inherit;
 }
 
+.rf-ii-lbl {
+	white-space : nowrap; 
+}
+
 .rf-ii-d-s { 
 	display : inline-block; 
 	white-space : nowrap; 
@@ -38,6 +42,7 @@
 	top : 0px; 
 	left : 0px; 
 	display : inline-block;
+	width: 100%;
 }
 
 .rf-ii-f {
@@ -59,13 +64,14 @@
 
 .rf-ii-btn {
 	background-image : "url(#{resource['org.richfaces.renderkit.html.images.InplaceComponentButtonGradientImage']})";
-	background-position: top;
+	background-attachment: scroll;
+	background-position: center top;
 	background-repeat: repeat-x;
 	background-color: '#{richSkin.tabBackgroundColor}';
 	border-width : 1px;
 	border-style: outset;
 	border-color: '#{richSkin.panelBorderColor}';
-	padding : 0px; 
+	padding : 3px; 
 	margin : 0px;
 }
 
@@ -104,6 +110,7 @@
 }
 
 .rf-ii-btn-shadow {
+	display: inline-block;
 	position: relative; 
 	padding : 6px 6px 6px 6px; 
 	top : -6px; 
@@ -111,8 +118,11 @@
 }
 
 .rf-ii-btn-shadow-t {
-	background-position : top left;
+	background-position : left top;
 	background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); 
+	background-attachment: scroll;
+	background-color: transparent;
+	background-repeat: repeat;
 	position : absolute; 
 	width : 6px; 
 	top : 0px; 
@@ -121,8 +131,11 @@
 }
 
 .rf-ii-btn-shadow-l {
-	background-position : bottom left;
-	background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); 
+	background-position : left bottom;
+	background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
+	background-attachment: scroll;
+	background-color: transparent;
+	background-repeat: repeat;
 	position : absolute; 
 	height : 6px; 
 	bottom : 0px; 
@@ -131,8 +144,11 @@
 }
 
 .rf-ii-btn-shadow-r {
-	background-position : bottom right;
+	background-position : right bottom;
 	background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
+	background-attachment: scroll;
+	background-color: transparent;
+	background-repeat: repeat;
 	position: absolute; 
 	width: 6px; 
 	top: 6px; 
@@ -143,6 +159,9 @@
 .rf-ii-btn-shadow-b {
 	background-position : right top;
 	background-image : url("#{resource['org.richfaces:bg_shadow.png']}");  
+	background-attachment: scroll;
+	background-color: transparent;
+	background-repeat: repeat;
 	position: absolute; 
 	height: 6px; 
 	top: 0px; 

Modified: branches/RF-9112/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- branches/RF-9112/ui/input/ui/src/main/templates/inplaceInput.template.xml	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/input/ui/src/main/templates/inplaceInput.template.xml	2010-08-19 12:49:29 UTC (rev 18811)
@@ -19,23 +19,23 @@
 		<cdk:object type="org.richfaces.component.InplaceState" name="inplaceState" value="#{getInplaceState(component)}" />
 		<cdk:object type="java.lang.String" name="inplaceValue" value="#{getValue(facesContext, component)}" />
 
-		<div id="#{clientId}" class="#{getReadyStyleClass(component, inplaceState)}" cdk:passThroughWithExclusions="id class">
-			<span id="#{clientId}:label">
+		<span id="#{clientId}" class="#{getReadyStyleClass(component, inplaceState)}" cdk:passThroughWithExclusions="id class">
+			<span id="#{clientId}:label" class="rf-ii-lbl">
 				#{inplaceValue}
 			</span>
-			<div id="#{clientId}:edit" class="#{getEditStyleClass(component, inplaceState)}">
+			<span id="#{clientId}:edit" class="#{getEditStyleClass(component, inplaceState)}">
 				<input id="#{clientId}:input" autocomplete="off" name="#{clientId}:input" type="text" value="#{inplaceValue}" class="rf-ii-f" cdk:passThrough="tabIndex"/>
 				
 				<c:if test="#{component.attributes['showControls']}">
-					<div class="rf-ii-btn-prepos">
-						<div class="rf-ii_btn_pos">
-							<div id="#{clientId}:btnshadow" class="rf-ii-btn-shadow">
-								<div class="rf-ii-btn-shadow-t"></div>
-								<div class="rf-ii-btn-shadow-l"></div>
-								<div class="rf-ii-btn-shadow-r"></div>
-								<div class="rf-ii-btn-shadow-b"></div>
+					<span class="rf-ii-btn-prepos">
+						<span class="rf-ii-btn-pos">
+							<span id="#{clientId}:btnshadow" class="rf-ii-btn-shadow">
+								<span class="rf-ii-btn-shadow-t"></span>
+								<span class="rf-ii-btn-shadow-l"></span>
+								<span class="rf-ii-btn-shadow-r"></span>
+								<span class="rf-ii-btn-shadow-b"></span>
 		
-								<div id="#{clientId}:btn" style="position : relative">
+								<span id="#{clientId}:btn" style="position : relative">
 									<input type="image"
 										id="#{clientId}:okbtn"
 										src="#{getResourcePath(facesContext, 'org.richfaces/ico_ok.gif')}"
@@ -47,15 +47,15 @@
 										class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-press'"
 										onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" />
 									<br />
-								</div>
-							</div>
-						</div>
-					</div>
+								</span>
+							</span>
+						</span>
+					</span>
 				</c:if>
-			</div>
+			</span>
 			<script type="text/javascript">	
 				<cdk:call expression="buildScript(responseWriter, facesContext, component);"/>
 			</script>
-		</div>
+		</span>
 	</cc:implementation>
 </cdk:root>
\ No newline at end of file

Modified: branches/RF-9112/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
===================================================================
--- branches/RF-9112/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java	2010-08-19 12:31:45 UTC (rev 18810)
+++ branches/RF-9112/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java	2010-08-19 12:49:29 UTC (rev 18811)
@@ -269,4 +269,14 @@
             }
         }
     }
+    
+    @Override
+    public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
+        //do nothing
+    }
+    
+    @Override
+    public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
+        //do nothing
+    }
 }



More information about the richfaces-svn-commits mailing list