Author: sohil.shah(a)jboss.com Date: 2008-04-17 20:31:55 -0400 (Thu, 17 Apr 2008) New Revision: 10628 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ObjectTraversalType.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIModel.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPort.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/PageViewPortScope.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateDiffPhase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateUpdatePhase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ObjectUpdate.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIPageImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIWindowImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/ContextNode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/PageNode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/WindowNode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIAction.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContainer.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/MoveChildTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/RemoveChildTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UpdateObjectTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java Log: refactoring model2 package to model Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -26,14 +26,14 @@ import java.util.Collection; import org.jboss.portal.presentation.impl.model2.UIModelImpl; +import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.model2.UIModel; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ViewPort; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.protocol.ProtocolResponse; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -35,15 +35,15 @@ import org.jboss.portal.presentation.server2.PresentationServerException; import org.jboss.portal.presentation.server2.PresentationRequest; import org.jboss.portal.presentation.server2.PresentationResponse; -import org.jboss.portal.presentation.model2.UIModel; -import org.jboss.portal.presentation.model2.ViewPort; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; import org.jboss.portal.presentation.impl.model2.UIModelImpl; +import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; import org.jboss.portal.presentation.model.content.WindowContent; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.protocol.ViewUIObjectAction; import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.protocol.ProtocolResponse; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.model; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.Map; import java.util.HashMap; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.model; -import org.jboss.portal.presentation.model2.ViewPortContext; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPortContext; import java.util.Map; import java.util.HashMap; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.model; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/PageViewPortScope.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/PageViewPortScope.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/PageViewPortScope.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.model; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateDiffPhase.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateDiffPhase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateDiffPhase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2; -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.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPortContext; +import org.jboss.portal.presentation.model.ViewPortScope; import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateUpdatePhase.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateUpdatePhase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/CreateUpdatePhase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2; -import org.jboss.portal.presentation.model2.ViewPortContext; +import org.jboss.portal.presentation.model.ViewPortContext; import java.util.List; import java.util.ArrayList; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ObjectUpdate.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ObjectUpdate.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ObjectUpdate.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2; -import org.jboss.portal.presentation.model2.ViewPortContext; +import org.jboss.portal.presentation.model.ViewPortContext; import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.List; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIModelImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -24,10 +24,10 @@ import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.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; +import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortContext; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ViewPortImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,9 +22,9 @@ ******************************************************************************/ 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.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortContext; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIContextImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIContextImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2.ui; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.impl.model2.UIObjectImpl; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIPageImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIPageImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIPageImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2.ui; -import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.impl.model2.UIObjectImpl; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIWindowImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIWindowImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model2.ui; -import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/ContextNode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/ContextNode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/ContextNode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/PageNode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/PageNode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/PageNode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIPage; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -24,7 +24,7 @@ import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.StaleStateException; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.Map; import java.util.HashMap; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.impl.state.structural; import org.jboss.portal.presentation.state.structural.StructuralState; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/WindowNode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/WindowNode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/WindowNode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIWindow; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ObjectTraversalType.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ObjectTraversalType.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ObjectTraversalType.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ObjectTraversalType.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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.model; + +/** + * A type that describe the different ways to traverse an object. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public enum ObjectTraversalType +{ + + /** + * The object should be visited and its children. + */ + RECURSIVE, + + /** + * The object should be visited but not its children. + */ + SINGLE, + + + /** + * The object should not be visited. + */ + SKIP +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIModel.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/UIModel.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIModel.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIModel.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,50 @@ +/****************************************************************************** + * 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.model; + +/** + * The user interface model + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface UIModel +{ + + /** + * The root id of the model. + * + * @return the root id + */ + String getRootId(); + + /** + * Creates a viewport from the specified context and scope. + * + * @param context the context + * @param scope the scope + * @return the viewport + */ + ViewPort createViewPort(ViewPortContext context, ViewPortScope scope); + +} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -1,208 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.model; - -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.ConstraintViolationException; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIObject -{ - - /** - * The status of a user interface object. - */ - public enum Status - { - /** - * It can be used. - */ - VALID, - - /** - * It cannot be used. - */ - INVALID, - - /** - * It cannot be used as is but a recovery is possible to either become valid or invalid. - */ - STALE - } - - public interface Visitor - { - - /** - * Returns true if the provided object should be visited. - * - * @param object the object - * @return true if it should be visited - */ - boolean enterObject(UIObject object); - - /** - * Callback to signal that an object visit is terminated - * - * @param object the object - */ - void leaveObject(UIObject object); - - /** - * Returns true if the children should be visited - * - * @param object the parent of the children - * @param loaded if the relationship is already loaded - * @return true if the children should be visited - */ - boolean enterChildren(UIObject object, boolean loaded); - - } - - /** - * Updates the status of the object by comparing validating it against the structural state context. - */ - void validate(); - - void validate(Visitor scope); - - /** - * Attempt a resolution of the current conflict. The behavior of the method will change according to the - * current status of the object: - * <ul> - * <li><code>STALE</code> status leads to resolve the conflict to a new status with <code>INVALID</code> or <code>VALID</code> - * as possible values</li> - * <li><code>VALID</code> status leads to a non operation</li> - * <li><code>INVALID</code> status leads to throw an <code>IllegalStateException</code></li> - * </ul> - */ - void refresh(); - - void refresh(Visitor scope); - - /** - * Return the current status. - * - * @return the status - */ - Status getStatus(); - - /** - * Returns the id. - * - * @return the id - */ - String getId(); - - /** - * Returns the name. - * - * @return the name - */ - String getName(); - - /** - * Returns the parent or null if the object does not have a parent. - * - * @return the parent - */ - UIObject getParent(); - - /** - * Returns a named child or null if it does not exist. - * - * @param name the name of the child - * @return the named child - */ - UIObject getChild(String name); - - /** - * Returns a property value or null if it does not exist. - * - * @param stateType the scope where to get the value from - * @param propertyName the property name - * @param propertyType the expected property type - * @return the property value - * @throws IllegalArgumentException if any argument is null or not valid - * @throws StateException any state exception - */ - <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; - - /** - * Equivalent to call <code>getPropertyValue(StateScopeType,String,Class)</code> with the <code>Object.class</code> - * literal. - * - * @param stateType the scope where to get the value from - * @param propertyName the property name - * @return the property value - * @throws IllegalArgumentException if any argument is null or not valid - * @throws StateException any state exception - */ - Object getProperty(StateType stateType, String propertyName) throws IllegalArgumentException, StateException; - - <T> void setProperty(StateType stateType, String propertyName, T propertyValue) throws IllegalArgumentException, StateException; - - /** - * Create a named child with a specified type. - * - * @param name the child name - * @param type the child type - * @return the newly created child - * @throws IllegalArgumentException if the name is null, already exists or this kind of object does not accept children of the specified type - * @throws StateException any state exception - */ - <T extends UIObject> T createChild(String name, Class<T> type) throws IllegalArgumentException, StateException; - - /** - * Returns the children of this object. - * - * @return the list of children - */ - Collection<? extends UIObject> getChildren(); - - /** - * Destroy a named child. - * - * @param name the name of the child to destroy - * @throws IllegalArgumentException if the name is null or the child does not exist - * @throws StateException any state exception - */ - void destroyChild(String name) throws IllegalArgumentException, StateException; - - /** - * Move the specified object to a new parent. A constraint violation will be detected if the destination - * is a descendant of the current object. - * - * @param destination the new parent - * @throws IllegalArgumentException if the destination is null - * @throws StateException any state exception - * @throws ConstraintViolationException if the destination is not valid - */ - void move(UIObject destination) throws IllegalArgumentException, StateException; - -} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/UIObject.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,73 @@ +/****************************************************************************** + * 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.model; + +import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.state.StateType; + +import java.util.Set; + +/** + * A wrapper of a structural object. The main goal of this object is to let the viewport add custom payload + * in addition of the structural state. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface UIObject +{ + + /** + * Returns the id. + * + * @return the id + */ + String getId(); + + /** + * Returns the name. + * + * @return the name + */ + String getName(); + + /** + * Returns a property value or null if it does not exist. + * + * @param stateType the state type + * @param propertyName the property name + * @param propertyType the expected property type @return the property value @return the property value + * @return the property value + * @throws IllegalArgumentException if any argument is null or not valid + * @throws StateException any state exception + */ + <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; + + /** + * Returns the set of property names of this object + * + * @param stateType the state type + * @return the property names + */ + Set<String> getPropertyNames(StateType stateType); +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPort.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ViewPort.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPort.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPort.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,60 @@ +/****************************************************************************** + * 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.model; + +/** + * A viewport is a view of a subset of the structural state presented by the structural state context. + * It does not provide access to the information but rather provides a way to populate a viewport context + * using a viewport scope because the presentation client implementation is the party responsible for + * defining the scope of the view port as well as the storage of the viewport informations. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ViewPort +{ + + /** + * Performs a refresh operation. The viewport uses the viewport scope object to navigate the structural + * state and perform updates to the viewport scope. If the viewport context is not yet populated, the + * refresh operation populates the context with the viewport defined the viewport scope. If the viewport + * already contains structural information then the viewport proceeds to a merge of the actual state held + * by the viewport context and the refreshed state provided by the structural state context. + */ + void refresh(); + + /** + * Returns the context associated with this viewport. + * + * @return the context + */ + ViewPortContext getContext(); + + /** + * Returns the scope associated with this viewport. + * + * @return the scope + */ + ViewPortScope getScope(); + +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ViewPortContext.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,97 @@ +/****************************************************************************** + * 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.model; + +import org.jboss.portal.presentation.model.UIObject; + +/** + * This interface defines read-write access to the structural information of a viewport. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ViewPortContext +{ + + /** + * Returns the specified object or null if it does not exist + * + * @param objectId the object id + * @return the specified object + */ + UIObject getObject(String objectId); + + /** + * Populate the context with the specified object. + * + * @param object the object + */ + void addObject(UIObject object); + + /** + * Signals the context that the object state has been updated. + * + * @param objectId the object id + */ + void updateObject(String objectId); + + /** + * Removes the specified object from the context. + * + * @param objectId the object id + */ + void removeObject(String objectId); + + /** + * Initialize the children of a specified object. + * + * @param parentId the object id + */ + void createChildren(String parentId); + + /** + * Destroys the children of a specified object. + * + * @param parentId the object id + */ + void destroyChildren(String parentId); + + /** + * Create a relationship between a parent and one of its children. When this callback occurs the context + * should already be populated with the specified parent object and child object. + * + * @param parentId the parent id + * @param childId the child id + */ + void addChild(String parentId, String childId); + + /** + * Destroys a relationship between a parent and one of its children. When this callback occurs the context + * should be populated with the specified parent object and child object. + * + * @param parentId the parent id + * @param childId the child id + */ + void removeChild(String parentId, String childId); + +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ViewPortScope.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,59 @@ +/****************************************************************************** + * 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.model; + +import org.jboss.portal.presentation.model.UIObject; + +/** + * Defines the scope of a viewport. This interface is separated from the viewport context in order to + * really affirm the split between the concern between the scope implementation that is used by the viewport + * to populate the viewport context during a refresh operation. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ViewPortScope +{ + /** + * Returns the id of the root of the scope. + * + * @return the root id + */ + String getRootId(); + + /** + * Returns how the object should be traversed. + * + * @param object the object + * @return true if it should be visited + */ + ObjectTraversalType enterObject(UIObject object); + + /** + * Callback to signal that an object visit is terminated. It can be used by the scope to maintain a data + * structure of the traversed model. + * + * @param object the object + */ + void leaveObject(UIObject object); +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIAction.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIAction.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIAction.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -20,9 +20,8 @@ * 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.model2.ui; +package org.jboss.portal.presentation.model.ui; -import org.jboss.portal.presentation.model.UIObject; /** * An action that can be triggered. Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContainer.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIContainer.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContainer.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -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.model2.ui; +package org.jboss.portal.presentation.model.ui; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIContext.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -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.model2.ui; +package org.jboss.portal.presentation.model.ui; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java (from rev 10627, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -0,0 +1,209 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.model.ui; + +import org.jboss.portal.presentation.model.StateType; +import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.model.state.ConstraintViolationException; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIObject +{ + + /** + * The status of a user interface object. + */ + public enum Status + { + /** + * It can be used. + */ + VALID, + + /** + * It cannot be used. + */ + INVALID, + + /** + * It cannot be used as is but a recovery is possible to either become valid or invalid. + */ + STALE + } + + public interface Visitor + { + + /** + * Returns true if the provided object should be visited. + * + * @param object the object + * @return true if it should be visited + */ + boolean enterObject(UIObject object); + + /** + * Callback to signal that an object visit is terminated + * + * @param object the object + */ + void leaveObject(UIObject object); + + /** + * Returns true if the children should be visited + * + * @param object the parent of the children + * @param loaded if the relationship is already loaded + * @return true if the children should be visited + */ + boolean enterChildren(UIObject object, boolean loaded); + + } + + /** + * Updates the status of the object by comparing validating it against the structural state context. + */ + void validate(); + + void validate(Visitor scope); + + /** + * Attempt a resolution of the current conflict. The behavior of the method will change according to the + * current status of the object: + * <ul> + * <li><code>STALE</code> status leads to resolve the conflict to a new status with <code>INVALID</code> or <code>VALID</code> + * as possible values</li> + * <li><code>VALID</code> status leads to a non operation</li> + * <li><code>INVALID</code> status leads to throw an <code>IllegalStateException</code></li> + * </ul> + */ + void refresh(); + + void refresh(Visitor scope); + + /** + * Return the current status. + * + * @return the status + */ + Status getStatus(); + + /** + * Returns the id. + * + * @return the id + */ + String getId(); + + /** + * Returns the name. + * + * @return the name + */ + String getName(); + + /** + * Returns the parent or null if the object does not have a parent. + * + * @return the parent + */ + UIObject getParent(); + + /** + * Returns a named child or null if it does not exist. + * + * @param name the name of the child + * @return the named child + */ + UIObject getChild(String name); + + /** + * Returns a property value or null if it does not exist. + * + * @param stateType the scope where to get the value from + * @param propertyName the property name + * @param propertyType the expected property type + * @return the property value + * @throws IllegalArgumentException if any argument is null or not valid + * @throws StateException any state exception + */ + <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; + + /** + * Equivalent to call <code>getPropertyValue(StateScopeType,String,Class)</code> with the <code>Object.class</code> + * literal. + * + * @param stateType the scope where to get the value from + * @param propertyName the property name + * @return the property value + * @throws IllegalArgumentException if any argument is null or not valid + * @throws StateException any state exception + */ + Object getProperty(StateType stateType, String propertyName) throws IllegalArgumentException, StateException; + + <T> void setProperty(StateType stateType, String propertyName, T propertyValue) throws IllegalArgumentException, StateException; + + /** + * Create a named child with a specified type. + * + * @param name the child name + * @param type the child type + * @return the newly created child + * @throws IllegalArgumentException if the name is null, already exists or this kind of object does not accept children of the specified type + * @throws StateException any state exception + */ + <T extends UIObject> T createChild(String name, Class<T> type) throws IllegalArgumentException, StateException; + + /** + * Returns the children of this object. + * + * @return the list of children + */ + Collection<? extends UIObject> getChildren(); + + /** + * Destroy a named child. + * + * @param name the name of the child to destroy + * @throws IllegalArgumentException if the name is null or the child does not exist + * @throws StateException any state exception + */ + void destroyChild(String name) throws IllegalArgumentException, StateException; + + /** + * Move the specified object to a new parent. A constraint violation will be detected if the destination + * is a descendant of the current object. + * + * @param destination the new parent + * @throws IllegalArgumentException if the destination is null + * @throws StateException any state exception + * @throws ConstraintViolationException if the destination is not valid + */ + void move(UIObject destination) throws IllegalArgumentException, StateException; + +} Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIPage.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -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.model2.ui; +package org.jboss.portal.presentation.model.ui; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIWindow.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -20,11 +20,11 @@ * 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.model2.ui; +package org.jboss.portal.presentation.model.ui; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.protocol; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.state.structural; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -23,9 +23,10 @@ package org.jboss.portal.presentation.test.model; import junit.framework.TestCase; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.ui.UIPage; + +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralState; import org.jboss.portal.presentation.state.structural.StructuralStateContext; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.state.NoSuchStateException; import org.jboss.portal.presentation.state.StaleStateException; import org.jboss.portal.presentation.state.StateException; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.List; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.ArrayList; import java.util.Collections; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.test.model.state.structural; import org.jboss.portal.presentation.state.structural.StructuralState; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.UIModel; +import org.jboss.portal.presentation.model.UIModel; 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.impl.state.navigational.NavigationalStateContextImpl; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.UIModel; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/MoveChildTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/MoveChildTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/MoveChildTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.test.model.state.structural.MockObject; import org.jboss.portal.presentation.test.model.state.structural.MockModel; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/RemoveChildTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/RemoveChildTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/RemoveChildTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; -import org.jboss.portal.presentation.model2.ObjectTraversalType; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.UIModel; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.UIModel; 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.impl.state.navigational.NavigationalStateContextImpl; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.state.StateType; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ViewPortContext; -import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ViewPortContext; import java.util.Map; import java.util.HashMap; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UpdateObjectTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UpdateObjectTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UpdateObjectTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; -import org.jboss.portal.presentation.model2.ObjectTraversalType; -import org.jboss.portal.presentation.model2.ViewPortScope; -import org.jboss.portal.presentation.model2.ViewPort; +import org.jboss.portal.presentation.model.ObjectTraversalType; +import org.jboss.portal.presentation.model.ViewPort; +import org.jboss.portal.presentation.model.ViewPortScope; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-04-17 21:52:02 UTC (rev 10627) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-04-18 00:31:55 UTC (rev 10628) @@ -28,10 +28,10 @@ import org.jboss.portal.presentation.impl.state.structural.PageNode; import org.jboss.portal.presentation.impl.state.structural.WindowNode; import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.model2.ui.UIContext; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.test.model.AbstractModelTestCase; import java.util.ArrayList;