[portal-commits] JBoss Portal SVN: r11224 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic and 4 other directories.

Author: julien(a)jboss.com Date: 2008-06-30 16:59:30 -0400 (Mon, 30 Jun 2008) New Revision: 11224 Added: 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/model/ui/UILayout.java Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.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/model/ui/UIPage.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java Log: rename UIPane -> UILayout : makes more sense but gonna reuse the UIPane concept sooooon Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -27,7 +27,7 @@ import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.model.ui.UIPane; +import org.jboss.portal.presentation.model.ui.UILayout; import org.jboss.portal.presentation.ajax.client.model.update.ModelUpdate; import org.jboss.portal.presentation.ajax.client.model.update.AddObject; import org.jboss.portal.presentation.ajax.client.model.update.RemoveObject; @@ -95,7 +95,7 @@ { objectType = ObjectType.WINDOW; } - else if (object instanceof UIPane) + else if (object instanceof UILayout) { objectType = ObjectType.PANE; } Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -49,7 +49,7 @@ import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.model.ui.UIPane; +import org.jboss.portal.presentation.model.ui.UILayout; import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.protocol.ProtocolResponse; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; @@ -274,7 +274,7 @@ { renderChildren(node, writer); } - else if (object instanceof UIPane) + else if (object instanceof UILayout) { if (node.getChildren() != null) { Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -34,7 +34,7 @@ import org.jboss.portal.presentation.portal.model.node.PageNode; import org.jboss.portal.presentation.portal.model.node.WindowNode; import org.jboss.portal.presentation.model.ui.UIObject; -import org.jboss.portal.presentation.model.ui.UIPane; +import org.jboss.portal.presentation.model.ui.UILayout; import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.structural.StructuralState; import org.jboss.portal.common.NotYetImplemented; @@ -220,7 +220,7 @@ { if (o instanceof NestedStructure) { - return UIPane.class; + return UILayout.class; } else if (o instanceof SimpleElement) { Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java (from rev 11193, 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/UILayoutImpl.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UILayoutImpl.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model.ui; + +import org.jboss.portal.presentation.model.ui.UILayout; +import org.jboss.portal.presentation.state.structural.StructuralObject; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class UILayoutImpl extends UIObjectImpl implements UILayout +{ + + public UILayoutImpl(StructuralObject structuralObject, UIObjectContext context) + { + super(structuralObject, context); + } +} 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-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -28,7 +28,7 @@ import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.model.ui.UIPane; +import org.jboss.portal.presentation.model.ui.UILayout; import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.structural.StructuralObject; @@ -66,9 +66,9 @@ { object = new UIPageImpl(structuralObject, objectContext); } - else if (type == UIPane.class) + else if (type == UILayout.class) { - object = new UIPaneImpl(structuralObject, objectContext); + object = new UILayoutImpl(structuralObject, objectContext); } else if (type == UIContext.class) { 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-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -29,7 +29,7 @@ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ */ -public class UIPageImpl extends UIPaneImpl implements UIPage +public class UIPageImpl extends UILayoutImpl implements UIPage { public UIPageImpl( StructuralObject structuralObject, Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java (from rev 11193, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UILayout.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.ui; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface UILayout extends UIObject +{ +} Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -26,6 +26,6 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public interface UIPage extends UIPane +public interface UIPage extends UILayout { } \ No newline at end of file Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 19:03:54 UTC (rev 11223) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 20:59:30 UTC (rev 11224) @@ -27,7 +27,7 @@ import org.jboss.portal.presentation.model.ViewPortScope; 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.ui.UILayout; /** * A view scope that retrieves a page and its visible content. @@ -69,7 +69,7 @@ public ObjectTraversalType enterObject(UIObject object) { - if (object instanceof UIPane) + if (object instanceof UILayout) { if (object instanceof UIPage) {