[portal-commits] JBoss Portal SVN: r11324 - in modules/presentation/trunk/presentation/src: main/java/org/jboss/portal/presentation/impl/model/pull and 3 other directories.

Author: julien(a)jboss.com Date: 2008-07-07 13:04:19 -0400 (Mon, 07 Jul 2008) New Revision: 11324 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/InternalObjectContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java Log: make the creation of the ui object impl the responsibility of the viewport context instead of the viewport impl Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/InternalObjectContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/InternalObjectContext.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/InternalObjectContext.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.structural.StructuralObject; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -24,7 +24,7 @@ import org.jboss.portal.presentation.model.ui.UIObject; import org.jboss.portal.presentation.model.UINode; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import java.util.Collection; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -24,7 +24,7 @@ import org.jboss.portal.presentation.model.ui.UIObject; import org.jboss.portal.presentation.model.ViewPortContext; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl; import java.util.HashMap; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/UINodeImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -27,7 +27,7 @@ import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl; import java.util.Collection; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.impl.model.ui; import org.jboss.portal.presentation.model.ui.UIContext; -import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.model.UIObjectContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.impl.model.ui; import org.jboss.portal.presentation.model.ui.UILayout; -import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.model.UIObjectContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -29,6 +29,7 @@ import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.model.ui.UIPane; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.structural.StructuralObject; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.impl.model.ui; import org.jboss.portal.presentation.model.ui.UIPage; -import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.model.UIObjectContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.ui; -import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.model.UIObjectContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -25,8 +25,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.presentation.model.ui.UIWindow; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.state.StateType; -import org.jboss.portal.presentation.state.structural.StructuralObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java (from rev 11321, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectContext.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -0,0 +1,40 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.model; + +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.structural.StructuralObject; + +/** + * Just some context data for a uiobject that can be used by different concerns. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface UIObjectContext +{ + + NavigationalStateContext getNavigationalStateContext(); + + StructuralObject getStructuralObject(); +} Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.model; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import java.util.Set; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -23,8 +23,8 @@ package org.jboss.portal.presentation.test.model; import org.jboss.portal.presentation.model.ui.UIObject; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.state.StateType; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; import java.util.HashMap; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java 2008-07-07 17:03:35 UTC (rev 11323) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java 2008-07-07 17:04:19 UTC (rev 11324) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.jboss.portal.presentation.model.ui.UIObject; import org.jboss.portal.presentation.model.ViewPortContext; -import org.jboss.portal.presentation.impl.model.ui.UIObjectContext; +import org.jboss.portal.presentation.model.UIObjectContext; import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl; import java.util.ArrayList;