You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/03/12 03:15:18 UTC
cvs commit: incubator-myfaces/src/jsfapi/javax/faces/webapp UIComponentTag.java
mmarinschek 2005/03/11 18:15:18
Modified: src/components/org/apache/myfaces/custom/jsvalueset
HtmlJsValueSetRenderer.java
src/jsfapi/javax/faces/webapp UIComponentTag.java
Log:
jsvalueset now supports maps of maps; ui component logging enhanced
Revision Changes Path
1.3 +23 -2 incubator-myfaces/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java
Index: HtmlJsValueSetRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HtmlJsValueSetRenderer.java 27 Dec 2004 04:11:11 -0000 1.2
+++ HtmlJsValueSetRenderer.java 12 Mar 2005 02:15:18 -0000 1.3
@@ -30,6 +30,9 @@
/**
* $Log$
+ * Revision 1.3 2005/03/12 02:15:18 mmarinschek
+ * jsvalueset now supports maps of maps; ui component logging enhanced
+ *
* Revision 1.2 2004/12/27 04:11:11 mmarinschek
* Data Table stores the state of facets of children; script tag is rendered with type attribute instead of language attribute, popup works better as a column in a data table
*
@@ -114,7 +117,25 @@
private void writeArrayElement(ResponseWriter writer, String name, Object key, Object obj)
throws IOException
{
- writer.writeText(name+"["+getValueString(key)+"]="+getValueString(obj)+";",null);
+ String prefix = name+"["+getValueString(key)+"]";
+
+ if(obj instanceof Map)
+ {
+ writer.writeText(prefix + "= new Array();",null);
+
+ Iterator it = ((Map) obj).entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Map.Entry) it.next();
+
+ writeArrayElement(writer,prefix,entry.getKey(),entry.getValue());
+ }
+ }
+ else
+ {
+ writer.writeText(prefix + "="+getValueString(obj)+";",null);
+ }
}
private void writeArrayElement(ResponseWriter writer, String name, int i, Object obj)
1.24 +10 -3 incubator-myfaces/src/jsfapi/javax/faces/webapp/UIComponentTag.java
Index: UIComponentTag.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/jsfapi/javax/faces/webapp/UIComponentTag.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- UIComponentTag.java 27 Aug 2004 12:47:52 -0000 1.23
+++ UIComponentTag.java 12 Mar 2005 02:15:18 -0000 1.24
@@ -15,6 +15,8 @@
*/
package javax.faces.webapp;
+import org.apache.myfaces.renderkit.RendererUtils;
+
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
@@ -35,6 +37,9 @@
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.24 2005/03/12 02:15:18 mmarinschek
+ * jsvalueset now supports maps of maps; ui component logging enhanced
+ *
* Revision 1.23 2004/08/27 12:47:52 manolito
* automatically assign IDs to facets and children of components that where created by binding
*
@@ -425,7 +430,9 @@
}
else
{
- throw new FacesException("cannot add component '" + _componentInstance.getId() + "'");
+ throw new FacesException("cannot add component with id '" +
+ _componentInstance.getId() + "' and path : "
+ +RendererUtils.getPathToComponent(_componentInstance)+" to its parent component. This might be a problem due to duplicate ids.");
}
}
addChildIdToParentTag(parentTag, id);