Author: julien(a)jboss.com Date: 2008-04-17 09:26:47 -0400 (Thu, 17 Apr 2008) New Revision: 10620 Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/ Removed: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/content/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client/PresentationContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContainerImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContextImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIObjectImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPageImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPortalImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIWindowImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ManagedObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ObjectContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/RelationshipContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/UIObjectContainer.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIContainerObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectFactory.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/state/navigational/NavigationalStateContextImpl.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/LifeCycleEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectAddedEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectLifeCycleEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectRemovedEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipAddedEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipLifeCycleEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipRemovedEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChange.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChangeEvent.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateModification.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/navigational/NavigationalStateModification.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/structural/StructuralStateModification.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/ConstraintViolationException.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/NoSuchStateException.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StaleStateException.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateChangeVetoException.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateException.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/navigational/NavigationalStateContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/AbstractStructuralStateContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralState.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralStateContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server/PresentationServer.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralObjectImpl.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateContextImpl.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateImpl.java 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/model2/ui/UIAction.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java Log: move previous model package to ajax where it is still used Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client/PresentationContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client/PresentationContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client/PresentationContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.client; import org.jboss.portal.presentation.protocol.ProtocolAction; -import org.jboss.portal.presentation.model.UIContext; +import org.jboss.portal.presentation.toremove.model.UIContext; import org.jboss.portal.web.ServletContextDispatcher; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContainerImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContainerImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContainerImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.model.UIContainer; +import org.jboss.portal.presentation.toremove.model.UIContainer; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContextImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContextImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIContextImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.ModelListener; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIContext; +import org.jboss.portal.presentation.toremove.model.ModelListener; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIObjectImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIObjectImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.StateType; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.StateChangeVetoException; import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; import org.jboss.portal.presentation.impl.model.container.spi.UIObjectContext; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPageImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPageImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPageImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.model.UIPage; +import org.jboss.portal.presentation.toremove.model.UIPage; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPortalImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPortalImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIPortalImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.model.UIPortal; +import org.jboss.portal.presentation.toremove.model.UIPortal; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIWindowImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/UIWindowImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -24,8 +24,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.StateType; +import org.jboss.portal.presentation.toremove.model.UIWindow; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ManagedObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ManagedObject.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ManagedObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,23 +22,21 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.event.state.StateChange; -import org.jboss.portal.presentation.model.event.state.StateChangeEvent; -import org.jboss.portal.presentation.model.event.state.navigational.NavigationalStateModification; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; -import org.jboss.portal.presentation.model.state.structural.StructuralState; +import org.jboss.portal.presentation.toremove.model.StateType; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.event.state.StateChange; +import org.jboss.portal.presentation.toremove.model.event.state.StateChangeEvent; +import org.jboss.portal.presentation.toremove.model.event.state.navigational.NavigationalStateModification; +import org.jboss.portal.presentation.toremove.model.state.StateChangeVetoException; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralState; import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Collection; -import java.io.StringWriter; -import java.io.PrintWriter; /** * Implement base fonctionnality of the <code>UIObject</code> interface. Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ObjectContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ObjectContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/ObjectContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; -import org.jboss.portal.presentation.model.state.structural.StructuralState; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.NoSuchStateException; -import org.jboss.portal.presentation.model.state.StaleStateException; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.ModelListener; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralState; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.NoSuchStateException; +import org.jboss.portal.presentation.toremove.model.state.StaleStateException; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIContext; +import org.jboss.portal.presentation.toremove.model.ModelListener; import org.jboss.portal.presentation.impl.model.container.spi.UIObjectContext; import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/RelationshipContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/RelationshipContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/RelationshipContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -23,11 +23,11 @@ package org.jboss.portal.presentation.impl.model.container; import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.event.lifecycle.RelationshipAddedEvent; -import org.jboss.portal.presentation.model.event.lifecycle.RelationshipRemovedEvent; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.event.lifecycle.RelationshipAddedEvent; +import org.jboss.portal.presentation.toremove.model.event.lifecycle.RelationshipRemovedEvent; import java.util.Iterator; import java.util.Set; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/UIObjectContainer.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/UIObjectContainer.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/UIObjectContainer.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container; -import org.jboss.portal.presentation.model.ModelEvent; -import org.jboss.portal.presentation.model.ModelListener; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.event.state.structural.StructuralStateModification; -import org.jboss.portal.presentation.model.event.state.StateChange; -import org.jboss.portal.presentation.model.event.state.StateChangeEvent; -import org.jboss.portal.presentation.model.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; -import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.model.state.structural.StructuralState; -import org.jboss.portal.presentation.model.state.NoSuchStateException; -import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.ModelEvent; +import org.jboss.portal.presentation.toremove.model.ModelListener; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIContext; +import org.jboss.portal.presentation.toremove.model.event.state.structural.StructuralStateModification; +import org.jboss.portal.presentation.toremove.model.event.state.StateChange; +import org.jboss.portal.presentation.toremove.model.event.state.StateChangeEvent; +import org.jboss.portal.presentation.toremove.model.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralState; +import org.jboss.portal.presentation.toremove.model.state.NoSuchStateException; +import org.jboss.portal.presentation.toremove.model.state.StateException; import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; import org.jboss.portal.presentation.impl.model.container.spi.UIObjectFactory; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIContainerObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIContainerObject.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIContainerObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container.spi; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIObject; import org.jboss.portal.presentation.impl.model.container.spi.UIObjectContext; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container.spi; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.ModelListener; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.ModelListener; /** * Encapsulate internal of an object. Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectFactory.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectFactory.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/container/spi/UIObjectFactory.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.container.spi; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.UIPortal; -import org.jboss.portal.presentation.model.UIPage; -import org.jboss.portal.presentation.model.UIContainer; -import org.jboss.portal.presentation.model.UIWindow; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIContext; +import org.jboss.portal.presentation.toremove.model.UIPortal; +import org.jboss.portal.presentation.toremove.model.UIPage; +import org.jboss.portal.presentation.toremove.model.UIContainer; +import org.jboss.portal.presentation.toremove.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.UIObject; import org.jboss.portal.presentation.impl.model.UIContextImpl; import org.jboss.portal.presentation.impl.model.UIPortalImpl; import org.jboss.portal.presentation.impl.model.UIPageImpl; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/state/navigational/NavigationalStateContextImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/state/navigational/NavigationalStateContextImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/state/navigational/NavigationalStateContextImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.state.navigational; -import org.jboss.portal.presentation.model.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; -import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.toremove.model.state.StateChangeVetoException; +import org.jboss.portal.presentation.toremove.model.state.StateException; import java.util.Map; import java.util.HashMap; Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model (from rev 10617, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model) Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ModelEvent.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,31 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public abstract class ModelEvent -{ -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ModelEvent.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public abstract class ModelEvent +{ +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ModelListener.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,32 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface ModelListener -{ - void onEvent(ModelEvent event); -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ModelListener.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/ModelListener.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,32 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ModelListener +{ + void onEvent(ModelEvent event); +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,42 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public enum StateType -{ - /** - * The navigational state type. The navigational state type describe sthe a kind of change done at runtime by the user when it - * interacts with the model (i.e not all interactions with the model are automatically navigational state changes). - */ - NAVIGATIONAL, - - /** - * The structural state type. The structural state type describes the structure of the model, i.e it defines an enduring - * state managed by the presentation server. - */ - STRUCTURAL -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/StateType.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,42 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public enum StateType +{ + /** + * The navigational state type. The navigational state type describe sthe a kind of change done at runtime by the user when it + * interacts with the model (i.e not all interactions with the model are automatically navigational state changes). + */ + NAVIGATIONAL, + + /** + * The structural state type. The structural state type describes the structure of the model, i.e it defines an enduring + * state managed by the presentation server. + */ + STRUCTURAL +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIAction.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,55 +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; - -/** - * An action that can be triggered. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface UIAction extends UIObject -{ - - /** - * Returns the action display name. - * - * @return the display name - */ - String getDisplayName(); - - /** - * Returns the action icon URL. - * - * @return the icon URL - */ - String getIconURL(); - - /** - * Returns the action URL. - * - * @return the url - */ - String getURL(); - -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIAction.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIAction.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,55 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * An action that can be triggered. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface UIAction extends UIObject +{ + + /** + * Returns the action display name. + * + * @return the display name + */ + String getDisplayName(); + + /** + * Returns the action icon URL. + * + * @return the icon URL + */ + String getIconURL(); + + /** + * Returns the action URL. + * + * @return the url + */ + String getURL(); + +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIContainer.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,31 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIContainer extends UIObject -{ -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIContainer.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContainer.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIContainer extends UIObject +{ +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIContext.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,43 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIContext extends UIObject -{ - /** - * - * @param id the object id - * @return the object for the specified id or null if it cannot be found - */ - UIObject getObject(String id); - - /** - * - * @param listener the listener - */ - void addModelListener(ModelListener listener); -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIContext.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,43 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIContext extends UIObject +{ + /** + * + * @param id the object id + * @return the object for the specified id or null if it cannot be found + */ + UIObject getObject(String id); + + /** + * + * @param listener the listener + */ + void addModelListener(ModelListener listener); +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,208 @@ +/****************************************************************************** + * 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.toremove.model; + +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.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; + +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIPage.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,31 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIPage extends UIObject -{ -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIPage.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPage.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIPage extends UIObject +{ +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIPortal.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,31 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIPortal extends UIObject -{ -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIPortal.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIPortal.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.toremove.model; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIPortal extends UIObject +{ +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIWindow.java 2008-04-17 12:48:35 UTC (rev 10617) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -1,61 +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.WindowState; -import org.jboss.portal.Mode; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface UIWindow extends UIObject -{ - /** - * Returns the window state of the window or null if it does not exist. - * - * @return the window state - */ - WindowState getWindowState(); - - /** - * Update the window state of the window. - * - * @param windowState the new window state - */ - void setWindowState(WindowState windowState); - - /** - * Returns the mode of the window or null if it does not exist. - * - * @return the mode - */ - Mode getMode(); - - /** - * Update the mode of the window. - * - * @param mode the new mode - */ - void setMode(Mode mode); -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIWindow.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/UIWindow.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -0,0 +1,61 @@ +/****************************************************************************** + * 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.toremove.model; + +import org.jboss.portal.WindowState; +import org.jboss.portal.Mode; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface UIWindow extends UIObject +{ + /** + * Returns the window state of the window or null if it does not exist. + * + * @return the window state + */ + WindowState getWindowState(); + + /** + * Update the window state of the window. + * + * @param windowState the new window state + */ + void setWindowState(WindowState windowState); + + /** + * Returns the mode of the window or null if it does not exist. + * + * @return the mode + */ + Mode getMode(); + + /** + * Update the mode of the window. + * + * @param mode the new mode + */ + void setMode(Mode mode); +} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event) Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/LifeCycleEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/LifeCycleEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/LifeCycleEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; -import org.jboss.portal.presentation.model.ModelEvent; +import org.jboss.portal.presentation.toremove.model.ModelEvent; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectAddedEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/ObjectAddedEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectAddedEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectLifeCycleEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/ObjectLifeCycleEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectLifeCycleEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectRemovedEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/ObjectRemovedEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/ObjectRemovedEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipAddedEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/RelationshipAddedEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipAddedEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipLifeCycleEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/RelationshipLifeCycleEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipLifeCycleEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipRemovedEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/RelationshipRemovedEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/lifecycle/RelationshipRemovedEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.lifecycle; +package org.jboss.portal.presentation.toremove.model.event.lifecycle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChange.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChange.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChange.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.state; +package org.jboss.portal.presentation.toremove.model.event.state; /** * A change in the state of the model. The change is the association of a target id and a modification. Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChangeEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChangeEvent.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateChangeEvent.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.state; +package org.jboss.portal.presentation.toremove.model.event.state; -import org.jboss.portal.presentation.model.ModelEvent; -import org.jboss.portal.presentation.model.event.state.StateChange; +import org.jboss.portal.presentation.toremove.model.ModelEvent; +import org.jboss.portal.presentation.toremove.model.event.state.StateChange; /** * Signals a state change occured. Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateModification.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateModification.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/StateModification.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.state; +package org.jboss.portal.presentation.toremove.model.event.state; /** * An abstract class for the modification of state. Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/navigational/NavigationalStateModification.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/navigational/NavigationalStateModification.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/navigational/NavigationalStateModification.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.state.navigational; +package org.jboss.portal.presentation.toremove.model.event.state.navigational; -import org.jboss.portal.presentation.model.event.state.StateModification; +import org.jboss.portal.presentation.toremove.model.event.state.StateModification; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/structural/StructuralStateModification.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/structural/StructuralStateModification.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/event/state/structural/StructuralStateModification.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.event.state.structural; +package org.jboss.portal.presentation.toremove.model.event.state.structural; -import org.jboss.portal.presentation.model.event.state.StateModification; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.event.state.StateModification; +import org.jboss.portal.presentation.toremove.model.UIObject; import java.util.Map; Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state (from rev 10619, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state) Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/ConstraintViolationException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/ConstraintViolationException.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/ConstraintViolationException.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state; +package org.jboss.portal.presentation.toremove.model.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/NoSuchStateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/NoSuchStateException.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/NoSuchStateException.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state; +package org.jboss.portal.presentation.toremove.model.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StaleStateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/StaleStateException.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StaleStateException.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state; +package org.jboss.portal.presentation.toremove.model.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateChangeVetoException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/StateChangeVetoException.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateChangeVetoException.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state; +package org.jboss.portal.presentation.toremove.model.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateException.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/StateException.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/StateException.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state; +package org.jboss.portal.presentation.toremove.model.state; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/navigational/NavigationalStateContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/navigational/NavigationalStateContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/navigational/NavigationalStateContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state.navigational; +package org.jboss.portal.presentation.toremove.model.state.navigational; -import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.StateException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/AbstractStructuralStateContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/structural/AbstractStructuralStateContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/AbstractStructuralStateContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state.structural; +package org.jboss.portal.presentation.toremove.model.state.structural; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.state.StateChangeVetoException; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/structural/StructuralObject.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state.structural; +package org.jboss.portal.presentation.toremove.model.state.structural; import java.util.List; import java.util.Set; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralState.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/structural/StructuralState.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralState.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state.structural; +package org.jboss.portal.presentation.toremove.model.state.structural; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralStateContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/structural/StructuralStateContext.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/model/state/structural/StructuralStateContext.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -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.model.state.structural; +package org.jboss.portal.presentation.toremove.model.state.structural; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; -import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.state.StateChangeVetoException; +import org.jboss.portal.presentation.toremove.model.state.StateException; import java.util.Map; import java.util.Collection; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server/PresentationServer.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server/PresentationServer.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server/PresentationServer.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -23,9 +23,9 @@ package org.jboss.portal.presentation.server; import org.jboss.portal.presentation.client.PresentationContext; -import org.jboss.portal.presentation.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.UIWindow; import org.jboss.portal.presentation.content.WindowContent; -import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralStateContext; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -37,8 +37,8 @@ import org.jboss.portal.presentation.toremove.client.PresentationContext; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.StateType; +import org.jboss.portal.presentation.toremove.model.UIWindow; import org.jboss.portal.presentation.protocol.LinkActivation; import org.jboss.portal.presentation.protocol.PostActivation; Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -25,9 +25,9 @@ import org.jboss.portal.presentation.toremove.client.PresentationContext; import org.jboss.portal.presentation.toremove.server.Processor; import org.jboss.portal.presentation.toremove.server.PresentationServer; -import org.jboss.portal.presentation.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.UIWindow; import org.jboss.portal.presentation.content.WindowContent; -import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.portal.MockPortalServer; import org.jboss.portal.presentation.test.portal.MockWindow; Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralObjectImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralObjectImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralObjectImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.portal.plugin; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; -import org.jboss.portal.presentation.model.state.structural.StructuralState; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralState; import org.jboss.portal.presentation.test.portal.MockPortalObject; Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateContextImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateContextImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateContextImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -23,9 +23,9 @@ package org.jboss.portal.presentation.test.portal.plugin; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.structural.AbstractStructuralStateContext; -import org.jboss.portal.presentation.model.state.structural.StructuralObject; +import org.jboss.portal.presentation.toremove.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.structural.AbstractStructuralStateContext; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralObject; import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.presentation.test.portal.MockPortalServer; Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateImpl.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/StructuralStateImpl.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.portal.plugin; -import org.jboss.portal.presentation.model.state.structural.StructuralState; -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.UIPortal; -import org.jboss.portal.presentation.model.UIPage; -import org.jboss.portal.presentation.model.UIWindow; +import org.jboss.portal.presentation.toremove.model.state.structural.StructuralState; +import org.jboss.portal.presentation.toremove.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIContext; +import org.jboss.portal.presentation.toremove.model.UIPortal; +import org.jboss.portal.presentation.toremove.model.UIPage; +import org.jboss.portal.presentation.toremove.model.UIWindow; import org.jboss.portal.presentation.test.portal.MockPortalObject; import org.jboss.portal.presentation.test.portal.MockContext; Modified: 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/model2/UIObject.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/UIObject.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.model2; -import org.jboss.portal.presentation.model.state.StateException; +import org.jboss.portal.presentation.toremove.model.state.StateException; import org.jboss.portal.presentation.state.StateType; import java.util.Set; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIAction.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIAction.java 2008-04-17 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIAction.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.model2.ui; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIObject; /** * An action that can be triggered. 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 13:23:31 UTC (rev 10619) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/MoveUIObjectAction.java 2008-04-17 13:26:47 UTC (rev 10620) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.protocol; -import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.toremove.model.UIObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a>