Author: julien(a)jboss.com Date: 2008-06-30 13:07:44 -0400 (Mon, 30 Jun 2008) New Revision: 11218 Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java Log: - added more logging in ajax client - piggy back object state in update of ajax client Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -33,6 +33,7 @@ import org.jboss.portal.presentation.ajax.client.model.update.ObjectType; import org.jboss.portal.presentation.ajax.client.model.update.CreateChildren; import org.jboss.portal.presentation.ajax.client.model.update.AddChild; +import org.jboss.portal.presentation.ajax.client.utils.Logger; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> @@ -102,6 +103,10 @@ public static class Context { + + /** . */ + private final Logger log = Logger.getLogger(Context.class); + /** All the known objects. */ private final Map objects; @@ -130,6 +135,9 @@ ModelUpdate update = updates[i]; // + log.trace("Executing model update " + update); + + // if (update instanceof AddObject) { AddObject addObject = (AddObject)update; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -64,4 +64,9 @@ { this.childId = childId; } + + public String toString() + { + return "AddChild[parentId=" + parentId + ",childId=" + childId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -22,6 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model.update; +import java.util.Map; +import java.util.Iterator; + /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ @@ -35,14 +38,18 @@ /** . */ private int objectType; + /** . */ + private Map objectProperties; + public AddObject() { } - public AddObject(String objectId, int objectType) + public AddObject(String objectId, int objectType, Map objectProperties) { this.objectId = objectId; this.objectType = objectType; + this.objectProperties = objectProperties; } public String getObjectId() @@ -64,4 +71,45 @@ { this.objectType = objectType; } + + public Map getObjectProperties() + { + return objectProperties; + } + + public void setObjectProperties(Map objectProperties) + { + this.objectProperties = objectProperties; + } + + public String toString() + { + StringBuffer tmp = new StringBuffer("AddObject[objectId="); + tmp.append(objectId); + tmp.append(",objectType="); + tmp.append(objectType); + tmp.append(",objectProperties="); + if (objectProperties != null) + { + tmp.append('{'); + for (Iterator i = objectProperties.entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String key = (String)entry.getKey(); + Object value = entry.getValue(); + tmp.append(key).append('=').append(value); + if (i.hasNext()) + { + tmp.append(','); + } + } + tmp.append('}'); + } + else + { + tmp.append("null"); + } + tmp.append(']'); + return tmp.toString(); + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "CreaterChildren[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "DestroyChildren[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -64,5 +64,10 @@ { this.childId = childId; } + + public String toString() + { + return "RemoveChild[parentId=" + parentId + ",childId=" + childId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "RemoveObject[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -36,6 +36,9 @@ { /** . */ + private static final String PREFIX = "org.jboss.portal.presentation.ajax.client."; + + /** . */ private static final Map loggers = new HashMap(); /** . */ @@ -57,6 +60,11 @@ // String name = clazz.toString(); + name = name.substring("class ".length()); + if (name.startsWith(PREFIX)) + { + name = name.substring(PREFIX.length()); + } // Logger logger = (Logger)loggers.get(name); Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -36,6 +36,7 @@ import org.jboss.portal.presentation.ajax.client.model.update.AddChild; import org.jboss.portal.presentation.ajax.client.model.update.RemoveChild; import org.jboss.portal.presentation.ajax.client.model.update.ObjectType; +import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.common.NotYetImplemented; import java.util.ArrayList; @@ -75,8 +76,12 @@ public void addObject(UIObject object) { - objects.put(object.getId(), object); + String objectId = object.getId(); + // + objects.put(objectId, object); + + // int objectType; if (object instanceof UIContext) { @@ -100,7 +105,15 @@ } // - updates.add(new AddObject(object.getId(), objectType)); + Map objectProperties = new HashMap(); + for (String propertyName : object.getPropertyNames(StateType.STRUCTURAL)) + { + Object propertyValue = object.getPropertyValue(StateType.STRUCTURAL, propertyName, Object.class); + objectProperties.put(propertyName, propertyValue); + } + + // + updates.add(new AddObject(objectId, objectType, objectProperties)); } public void updateObject(String objectId)