Author: julien(a)jboss.com Date: 2008-03-28 15:57:44 -0400 (Fri, 28 Mar 2008) New Revision: 10405 Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIModelImpl.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectRef.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ Removed: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/ Modified: branches/presentation/presentation/build.xml branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ChildrenVisit.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java Log: reorg new model impl Modified: branches/presentation/presentation/build.xml =================================================================== --- branches/presentation/presentation/build.xml 2008-03-28 19:54:35 UTC (rev 10404) +++ branches/presentation/presentation/build.xml 2008-03-28 19:57:44 UTC (rev 10405) @@ -315,13 +315,6 @@ <!--<test todir="${test.reports}" name="org.jboss.portal.presentation.test.model.ModelTestCase"/>--> <!--<test todir="${test.reports}" name="org.jboss.portal.presentation.test.model.EventTestCase"/>--> -<!-- - <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model2.ModelTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model2.AddChildTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model2.RemoveChildTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model2.MoveChildTestCase"/> ---> - <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model3.ModelTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model3.AddChildTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.presentation.test.model3.RemoveChildTestCase"/> Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIModelImpl.java (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/UIModelImpl.java) =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIModelImpl.java (rev 0) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIModelImpl.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.model.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.model2.UIModel; +import org.jboss.portal.presentation.model2.ViewPortContext; +import org.jboss.portal.presentation.model2.ViewPortScope; +import org.jboss.portal.presentation.model2.ViewPort; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class UIModelImpl implements UIModel +{ + + /** . */ + final NavigationalStateContext navigationalStateContext; + + /** . */ + final StructuralStateContext structuralStateContext; + + public UIModelImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext) + { + this.navigationalStateContext = navigationalStateContext; + this.structuralStateContext = structuralStateContext; + } + + public NavigationalStateContext getNavigationalStateContext() + { + return navigationalStateContext; + } + + public StructuralStateContext getStructuralStateContext() + { + return structuralStateContext; + } + + public String getRootId() + { + return structuralStateContext.getRootId(); + } + + public ViewPort createViewPort(ViewPortContext context, ViewPortScope scope) + { + return new ViewPortImpl(this, context, scope); + } +} \ No newline at end of file Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/UIObjectImpl.java) =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java (rev 0) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -0,0 +1,103 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.model.state.structural.StructuralObject; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class UIObjectImpl implements UIObject +{ + + /** . */ + public final StructuralObject structuralObject; + + /** We keep track of what was loaded by the scope. */ + public Map<String, UIObjectRef> childRefs; + + public UIObjectImpl(StructuralObject structuralObject) + { + this.structuralObject = structuralObject; + } + + public String getId() + { + return structuralObject.getId(); + } + + public String getName() + { + return structuralObject.getState().getName(); + } + + public <T> T getProperty(String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException + { + return safeCast(getProperty(propertyName), propertyType); + } + + public Object getProperty(String propertyName) throws IllegalArgumentException, StateException + { + if (propertyName == null) + { + throw new IllegalArgumentException(); + } + return structuralObject.getState().getProperties().get(propertyName); + } + + /** + * Attempt to cast the value argument to the provided type argument. If the value argument type is assignable + * to the provided type, the value is returned, otherwise if it is not or the value is null, null is returned. + * + * @param value the value to cast + * @param type the type to downcast + * @return the casted value or null + */ + private <T> T safeCast(Object value, Class<T> type) + { + if (type == null) + { + throw new IllegalArgumentException(); + } + if (value == null) + { + return null; + } + else + { + if (type.isAssignableFrom(value.getClass())) + { + return type.cast(value); + } + else + { + return null; + } + } + } +} \ No newline at end of file Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectRef.java (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/UIObjectRef.java) =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectRef.java (rev 0) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectRef.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -0,0 +1,48 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class UIObjectRef +{ + + /** The child id. */ + final String id; + + /** Whether or not the child is loaded. */ + public boolean loaded; + + public UIObjectRef(String id, boolean loaded) + { + this.id = id; + this.loaded = loaded; + } + + public String getId() + { + return id; + } +} Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/ViewPortImpl.java) =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java (rev 0) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -0,0 +1,88 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.ViewPort; +import org.jboss.portal.presentation.model2.ViewPortContext; +import org.jboss.portal.presentation.model2.ViewPortScope; +import org.jboss.portal.presentation.impl.model2.diff.CreateDiffPhase; +import org.jboss.portal.presentation.impl.model2.diff.ObjectVisit; +import org.jboss.portal.presentation.impl.model2.update.CreateUpdatePhase; +import org.jboss.portal.presentation.impl.model2.update.ObjectUpdate; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class ViewPortImpl implements ViewPort +{ + + /** . */ + final UIModelImpl model; + + /** . */ + final ViewPortContext context; + + /** . */ + final ViewPortScope scope; + + public ViewPortImpl(UIModelImpl model, ViewPortContext context, ViewPortScope scope) + { + this.model = model; + this.context = context; + this.scope = scope; + } + + public void refresh() + { + CreateDiffPhase createDiffPhase = new CreateDiffPhase(context, scope, model.structuralStateContext); + + // + createDiffPhase.perform(); + + // + ObjectVisit rootVisit = createDiffPhase.getRootVisit(); + + // + CreateUpdatePhase createUpdatePhase = new CreateUpdatePhase(context, rootVisit); + + // + createUpdatePhase.perform(); + + // + ObjectUpdate rootUpdate = createUpdatePhase.getRootUpdate(); + + // + rootUpdate.execute(context); + } + + public ViewPortContext getContext() + { + return context; + } + + public ViewPortScope getScope() + { + return scope; + } +} \ No newline at end of file Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/diff) Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ChildrenVisit.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/diff/ChildrenVisit.java 2008-03-28 19:49:52 UTC (rev 10403) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ChildrenVisit.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -20,7 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.refresh.diff; +package org.jboss.portal.presentation.impl.model2.diff; import java.util.Collection; import java.util.ArrayList; Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/diff/CreateDiffPhase.java 2008-03-28 19:49:52 UTC (rev 10403) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -20,12 +20,12 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.refresh.diff; +package org.jboss.portal.presentation.impl.model2.diff; import org.jboss.portal.presentation.model2.ViewPortScope; import org.jboss.portal.presentation.model2.ViewPortContext; import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectImpl; +import org.jboss.portal.presentation.impl.model2.UIObjectImpl; import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; import org.jboss.portal.presentation.model.state.structural.StructuralObject; Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/diff/ObjectVisit.java 2008-03-28 19:49:52 UTC (rev 10403) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -20,9 +20,9 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.refresh.diff; +package org.jboss.portal.presentation.impl.model2.diff; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectImpl; +import org.jboss.portal.presentation.impl.model2.UIObjectImpl; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update (from rev 10403, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/update) Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/update/CreateUpdatePhase.java 2008-03-28 19:49:52 UTC (rev 10403) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -20,13 +20,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.refresh.update; +package org.jboss.portal.presentation.impl.model2.update; import org.jboss.portal.presentation.model2.ViewPortContext; -import org.jboss.portal.presentation.impl.model2.refresh.diff.ObjectVisit; -import org.jboss.portal.presentation.impl.model2.refresh.diff.ChildrenVisit; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectImpl; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectRef; +import org.jboss.portal.presentation.impl.model2.diff.ObjectVisit; +import org.jboss.portal.presentation.impl.model2.diff.ChildrenVisit; +import org.jboss.portal.presentation.impl.model2.UIObjectImpl; +import org.jboss.portal.presentation.impl.model2.UIObjectRef; import java.util.List; import java.util.ArrayList; Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/refresh/update/ObjectUpdate.java 2008-03-28 19:49:52 UTC (rev 10403) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -20,10 +20,10 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.refresh.update; +package org.jboss.portal.presentation.impl.model2.update; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectImpl; -import org.jboss.portal.presentation.impl.model2.refresh.UIObjectRef; +import org.jboss.portal.presentation.impl.model2.UIObjectImpl; +import org.jboss.portal.presentation.impl.model2.UIObjectRef; import org.jboss.portal.presentation.model2.ViewPortContext; import java.util.List; Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-03-28 19:54:35 UTC (rev 10404) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -26,7 +26,7 @@ import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.impl.model2.refresh.UIModelImpl; +import org.jboss.portal.presentation.impl.model2.UIModelImpl; import org.jboss.portal.presentation.impl.model.state.navigational.NavigationalStateContextImpl; import junit.framework.TestCase; Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-03-28 19:54:35 UTC (rev 10404) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-03-28 19:57:44 UTC (rev 10405) @@ -27,7 +27,7 @@ import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.impl.model2.refresh.UIModelImpl; +import org.jboss.portal.presentation.impl.model2.UIModelImpl; import org.jboss.portal.presentation.impl.model.state.navigational.NavigationalStateContextImpl; import java.util.Collection;