Author: julien(a)jboss.com Date: 2008-04-18 03:24:55 -0400 (Fri, 18 Apr 2008) New Revision: 10635 Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/AsyncPages.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/MyGWTPrototype.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PartialRefresh.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Portal.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortalLayout.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletService.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletWindowPanel.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Session.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Util.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/layout/LayoutManager.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/AnchorListener.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/SubmitListener.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIPage.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIWindow.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxUpdateWindowStateAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxViewUIObjectAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncGetAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncPostAction.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPC.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPCAsync.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/widget/PortletWindow.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/PortletServiceImpl.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalServer.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationServlet.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionDecoder.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionEncoder.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ChildrenVisit.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateUpdatePhase.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectUpdate.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIModelImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.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/UIPageImpl.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/impl/state/navigational/NavigationalStateContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/GetActivation.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/PostActivation.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java Log: dilonization Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/AjaxPresentationClient.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,9 +22,13 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax; -import java.io.IOException; -import java.util.Collection; - +import org.jboss.portal.presentation.ajax.client.model.AjaxUIPage; +import org.jboss.portal.presentation.ajax.client.model.AjaxUIWindow; +import org.jboss.portal.presentation.classic.ClassicPresentationClient; +import org.jboss.portal.presentation.classic.model.ClassicUINode; +import org.jboss.portal.presentation.classic.model.ClassicViewPortContext; +import org.jboss.portal.presentation.classic.model.DefaultPageViewPortScope; +import org.jboss.portal.presentation.classic.model.PageViewPortScope; import org.jboss.portal.presentation.impl.model.UIModelImpl; import org.jboss.portal.presentation.model.UIModel; import org.jboss.portal.presentation.model.UIObject; @@ -42,16 +46,12 @@ import org.jboss.portal.presentation.server.PresentationServer; import org.jboss.portal.presentation.server.PresentationServerException; import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.classic.ClassicPresentationClient; -import org.jboss.portal.presentation.classic.model.ClassicUINode; -import org.jboss.portal.presentation.classic.model.ClassicViewPortContext; -import org.jboss.portal.presentation.classic.model.DefaultPageViewPortScope; -import org.jboss.portal.presentation.classic.model.PageViewPortScope; -import org.jboss.portal.presentation.ajax.client.model.*; - import org.jboss.portal.web.WebRequest; import org.jboss.portal.web.WebResponse; +import java.io.IOException; +import java.util.Collection; + /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/AsyncPages.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/AsyncPages.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/AsyncPages.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,33 +23,31 @@ package org.jboss.portal.presentation.ajax.client; -import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.EntryPoint; - +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.HTTPRequest; import com.google.gwt.user.client.ResponseTextHandler; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.SourcesTabEvents; import com.google.gwt.user.client.ui.TabBar; import com.google.gwt.user.client.ui.TabListener; -import com.google.gwt.user.client.ui.SourcesTabEvents; - -import com.google.gwt.user.client.rpc.ServiceDefTarget; -import com.google.gwt.user.client.rpc.AsyncCallback; - +import com.google.gwt.user.client.ui.Widget; +import net.mygwt.ui.client.Style; +import net.mygwt.ui.client.event.BaseEvent; +import net.mygwt.ui.client.event.Listener; import net.mygwt.ui.client.widget.ContentPanel; import net.mygwt.ui.client.widget.IconButton; -import net.mygwt.ui.client.widget.WidgetContainer; import net.mygwt.ui.client.widget.Viewport; -import net.mygwt.ui.client.widget.layout.*; -import net.mygwt.ui.client.Style; -import net.mygwt.ui.client.event.Listener; -import net.mygwt.ui.client.event.BaseEvent; - +import net.mygwt.ui.client.widget.WidgetContainer; +import net.mygwt.ui.client.widget.layout.BorderLayout; +import net.mygwt.ui.client.widget.layout.BorderLayoutData; +import net.mygwt.ui.client.widget.layout.FlowLayout; import org.jboss.portal.presentation.ajax.client.model.Page; import org.jboss.portal.presentation.ajax.client.model.Window; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/MyGWTPrototype.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/MyGWTPrototype.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/MyGWTPrototype.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,24 +23,21 @@ package org.jboss.portal.presentation.ajax.client; import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.core.client.JavaScriptObject; - +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.VerticalPanel; import net.mygwt.ui.client.Style; -import net.mygwt.ui.client.event.BaseEvent; -import net.mygwt.ui.client.event.SelectionListener; +import net.mygwt.ui.client.event.BaseEvent; +import net.mygwt.ui.client.event.SelectionListener; import net.mygwt.ui.client.widget.Button; +import net.mygwt.ui.client.widget.ButtonBar; +import net.mygwt.ui.client.widget.ContentPanel; import net.mygwt.ui.client.widget.IconButton; -import net.mygwt.ui.client.widget.ButtonBar; import net.mygwt.ui.client.widget.Info; -import net.mygwt.ui.client.widget.ContentPanel; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PartialRefresh.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PartialRefresh.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PartialRefresh.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,26 +22,23 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client; -import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.EntryPoint; - +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.HTTPRequest; import com.google.gwt.user.client.ResponseTextHandler; -import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Panel; - -import com.google.gwt.user.client.rpc.ServiceDefTarget; -import com.google.gwt.user.client.rpc.AsyncCallback; - +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; import org.jboss.portal.presentation.ajax.client.model.Page; import org.jboss.portal.presentation.ajax.client.model.Window; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Portal.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Portal.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Portal.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,11 +23,10 @@ package org.jboss.portal.presentation.ajax.client; import com.google.gwt.core.client.EntryPoint; - -import org.jboss.portal.presentation.ajax.client.protocol.Caller; -import org.jboss.portal.presentation.ajax.client.protocol.AjaxViewUIObjectAction; -import org.jboss.portal.presentation.ajax.client.listener.SubmitListener; import org.jboss.portal.presentation.ajax.client.listener.AnchorListener; +import org.jboss.portal.presentation.ajax.client.listener.SubmitListener; +import org.jboss.portal.presentation.ajax.client.protocol.AjaxViewUIObjectAction; +import org.jboss.portal.presentation.ajax.client.protocol.Caller; /** * This is the Entry Point of the client-side Ajax agent of the Presentation Framework Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortalLayout.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortalLayout.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortalLayout.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,20 +22,18 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client; -import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.EntryPoint; - -import com.google.gwt.user.client.ui.RootPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.HTMLPanel; -import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.rpc.ServiceDefTarget; -import com.google.gwt.user.client.rpc.AsyncCallback; - /** * Prototyping some client side layout concepts * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletService.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletService.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletService.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,7 +23,6 @@ package org.jboss.portal.presentation.ajax.client; import com.google.gwt.user.client.rpc.RemoteService; - import org.jboss.portal.presentation.ajax.client.model.Page; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletWindowPanel.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletWindowPanel.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/PortletWindowPanel.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client; +import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HTMLPanel; -import com.google.gwt.user.client.Event; public class PortletWindowPanel extends HTMLPanel { Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Session.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Session.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Session.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client; +import org.jboss.portal.presentation.ajax.client.listener.AnchorListener; +import org.jboss.portal.presentation.ajax.client.listener.SubmitListener; +import org.jboss.portal.presentation.ajax.client.model.AjaxUIContext; + +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import org.jboss.portal.presentation.ajax.client.model.AjaxUIContext; -import org.jboss.portal.presentation.ajax.client.listener.SubmitListener; -import org.jboss.portal.presentation.ajax.client.listener.AnchorListener; - /** * This is the client side Session. This is a singleton since there should only be one session for each client * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Util.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Util.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/Util.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client; -import java.util.ArrayList; -import java.util.List; - import org.jboss.portal.presentation.ajax.client.layout.LayoutManager; import org.jboss.portal.presentation.ajax.client.model.AjaxUIPage; import org.jboss.portal.presentation.ajax.client.model.AjaxUIWindow; import org.jboss.portal.presentation.ajax.client.widget.PortletWindow; +import java.util.ArrayList; +import java.util.List; + /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/layout/LayoutManager.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/layout/LayoutManager.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/layout/LayoutManager.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,24 +22,22 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.layout; -import java.util.List; -import java.util.Map; -import java.util.Iterator; -import java.util.HashMap; -import java.util.ArrayList; - import com.google.gwt.user.client.ui.Widget; +import net.mygwt.ui.client.Style; import net.mygwt.ui.client.widget.ContentPanel; - import net.mygwt.ui.client.widget.Viewport; import net.mygwt.ui.client.widget.WidgetContainer; import net.mygwt.ui.client.widget.layout.BorderLayout; import net.mygwt.ui.client.widget.layout.BorderLayoutData; import net.mygwt.ui.client.widget.layout.FlowLayout; -import net.mygwt.ui.client.Style; - import org.jboss.portal.presentation.ajax.client.widget.PortletWindow; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + /** * This layout manager provides a Flexible Grid for laying out the UI components (which would be Portlet Windows) * inside a flexible coordinates based Grid Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/AnchorListener.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/AnchorListener.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/AnchorListener.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,9 +25,8 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.ClickListener; - +import com.google.gwt.user.client.ui.Widget; import org.jboss.portal.presentation.ajax.client.Util; import org.jboss.portal.presentation.ajax.client.protocol.AsyncGetAction; import org.jboss.portal.presentation.ajax.client.protocol.Caller; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/SubmitListener.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/SubmitListener.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/listener/SubmitListener.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -26,9 +26,8 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; - -import org.jboss.portal.presentation.ajax.client.Util; import org.jboss.portal.presentation.ajax.client.Session; +import org.jboss.portal.presentation.ajax.client.Util; import org.jboss.portal.presentation.ajax.client.protocol.AsyncPostAction; import org.jboss.portal.presentation.ajax.client.protocol.Caller; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIObject.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIObject.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model; +import com.google.gwt.user.client.rpc.IsSerializable; + +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; -import com.google.gwt.user.client.rpc.IsSerializable; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIPage.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIPage.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIPage.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model; -import java.util.List; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIWindow.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIWindow.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxUIWindow.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model; -import java.util.List; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxUpdateWindowStateAction.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxUpdateWindowStateAction.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxUpdateWindowStateAction.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,15 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.protocol; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import org.jboss.portal.presentation.ajax.client.Session; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; import org.jboss.portal.presentation.ajax.client.model.AjaxUIPage; import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.service.PortalRPCAsync; -import java.util.Map; -import java.util.HashMap; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.rpc.ServiceDefTarget; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxViewUIObjectAction.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxViewUIObjectAction.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AjaxViewUIObjectAction.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,15 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.protocol; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import org.jboss.portal.presentation.ajax.client.Session; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.service.PortalRPCAsync; -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.rpc.ServiceDefTarget; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncGetAction.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncGetAction.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncGetAction.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,15 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.protocol; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import org.jboss.portal.presentation.ajax.client.Session; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; import org.jboss.portal.presentation.ajax.client.model.AjaxUIPage; import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.service.PortalRPCAsync; -import java.util.Map; -import java.util.HashMap; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.rpc.ServiceDefTarget; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncPostAction.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncPostAction.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/protocol/AsyncPostAction.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,15 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.protocol; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.rpc.ServiceDefTarget; import org.jboss.portal.presentation.ajax.client.Session; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; import org.jboss.portal.presentation.ajax.client.model.AjaxUIPage; import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.service.PortalRPCAsync; -import java.util.Map; -import java.util.HashMap; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.rpc.ServiceDefTarget; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPC.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPC.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPC.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,9 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.service; -import java.util.Map; import com.google.gwt.user.client.rpc.RemoteService; - import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPCAsync.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPCAsync.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/service/PortalRPCAsync.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.service; -import java.util.Map; - import com.google.gwt.user.client.rpc.AsyncCallback; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/widget/PortletWindow.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/widget/PortletWindow.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/widget/PortletWindow.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,16 +23,14 @@ package org.jboss.portal.presentation.ajax.client.widget; import com.google.gwt.user.client.ui.HTML; - -import net.mygwt.ui.client.widget.ContentPanel; import net.mygwt.ui.client.Style; +import net.mygwt.ui.client.event.BaseEvent; +import net.mygwt.ui.client.event.Listener; +import net.mygwt.ui.client.widget.ContentPanel; import net.mygwt.ui.client.widget.IconButton; import net.mygwt.ui.client.widget.Info; -import net.mygwt.ui.client.event.Listener; -import net.mygwt.ui.client.event.BaseEvent; - -import org.jboss.portal.presentation.ajax.client.Util; import org.jboss.portal.presentation.ajax.client.Session; +import org.jboss.portal.presentation.ajax.client.Util; import org.jboss.portal.presentation.ajax.client.model.AjaxUIWindow; import org.jboss.portal.presentation.ajax.client.protocol.AjaxUpdateWindowStateAction; import org.jboss.portal.presentation.ajax.client.protocol.Caller; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,12 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.ajax.entry; -import java.util.Map; -import java.util.Enumeration; -import java.util.HashMap; -import java.io.IOException; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; +import org.jboss.portal.presentation.protocol.GetActivation; +import org.jboss.portal.presentation.protocol.PostActivation; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -37,10 +33,13 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; -import org.jboss.portal.presentation.protocol.GetActivation; -import org.jboss.portal.presentation.protocol.PostActivation; - /** * This filter is activated or deactivated depending on whether the Portal needs to runs in Ajax mode or Classic Html mode * Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -1,39 +1,32 @@ package org.jboss.portal.presentation.impl.ajax.entry; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.HashMap; -import java.io.InputStream; -import java.net.URLDecoder; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; import org.apache.log4j.Logger; - -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.WebResponse; - import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.presentation.PresentationServerImpl; -import org.jboss.portal.presentation.invocation.AjaxRequest; -import org.jboss.portal.presentation.invocation.AjaxResponse; -import org.jboss.portal.presentation.ajax.client.service.PortalRPC; +import org.jboss.portal.presentation.ajax.AjaxPresentationClient; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; -import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; import org.jboss.portal.presentation.ajax.client.protocol.AjaxShowUIObjectResponse; -import org.jboss.portal.presentation.ajax.AjaxPresentationClient; -import org.jboss.portal.presentation.protocol.GetActivation; -import org.jboss.portal.presentation.protocol.PostActivation; -import org.jboss.portal.presentation.server.PresentationServer; +import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; +import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.impl.state.structural.ContextNode; import org.jboss.portal.presentation.impl.state.structural.NodeImporter; import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; +import org.jboss.portal.presentation.invocation.AjaxRequest; +import org.jboss.portal.presentation.invocation.AjaxResponse; +import org.jboss.portal.presentation.protocol.GetActivation; +import org.jboss.portal.presentation.protocol.PostActivation; +import org.jboss.portal.presentation.server.PresentationServer; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.invocation; +import org.jboss.portal.common.net.media.MediaType; +import org.jboss.portal.web.Body; import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.Body; -import org.jboss.portal.common.net.media.MediaType; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletRequest; import java.util.Map; /** Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.invocation; +import org.jboss.portal.common.servlet.URLFormat; import org.jboss.portal.web.WebResponse; -import org.jboss.portal.common.servlet.URLFormat; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.Writer; import java.util.Map; -import java.io.Writer; -import java.io.IOException; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,17 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.ajax; -import java.io.ByteArrayInputStream; - -import javax.servlet.http.HttpServletRequest; - import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.server.rpc.RemoteServiceServlet; - -import com.meterware.httpunit.WebConversation; import com.meterware.httpunit.PostMethodWebRequest; +import com.meterware.httpunit.WebConversation; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; + /** * This is a RPC Proxy Service that is used only during development. This lets the GWT client-side agent integrate with the Portal server while running in * Hosted Mode. It is very efficient to debug/develop client side GWT code in Hosted Mode. Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/PortletServiceImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/PortletServiceImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/ajax/PortletServiceImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -1,14 +1,12 @@ package org.jboss.portal.presentation.test.ajax; -import java.io.InputStream; - -import javax.servlet.http.HttpServletRequest; - +import com.google.gwt.user.server.rpc.RemoteServiceServlet; import org.jboss.portal.presentation.ajax.client.PortletService; import org.jboss.portal.presentation.ajax.client.model.Page; import org.jboss.portal.presentation.ajax.client.model.Window; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import javax.servlet.http.HttpServletRequest; +import java.io.InputStream; /** * This is just a STUB server side component to test the client side components Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -1,33 +1,26 @@ package org.jboss.portal.presentation.test.portal; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.HashMap; -import java.net.URLDecoder; - -import javax.management.MBeanServer; - -import javax.servlet.ServletException; -import javax.servlet.UnavailableException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; import org.apache.log4j.Logger; import org.jboss.mx.util.MBeanServerLocator; - - -import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; -import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; import org.jboss.portal.presentation.ajax.client.protocol.AjaxShowUIObjectResponse; +import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; +import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.protocol.GetActivation; import org.jboss.portal.presentation.protocol.PostActivation; -import org.jboss.portal.presentation.invocation.AjaxRequest; -import org.jboss.portal.presentation.invocation.AjaxResponse; -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import javax.management.MBeanServer; +import javax.servlet.ServletException; +import javax.servlet.UnavailableException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; /** * This serves as the Portal Entry Point for AJAX (Asynchronous) RPC calls being made by the Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalServer.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalServer.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalServer.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.portal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; -import java.util.List; -import java.util.HashMap; -import java.util.ArrayList; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,21 +22,21 @@ ******************************************************************************/ package org.jboss.portal.presentation; +import org.jboss.portal.presentation.client.PresentationClient; +import org.jboss.portal.presentation.impl.state.structural.StructuralNode; +import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; +import org.jboss.portal.presentation.impl.state.structural.WindowNode; +import org.jboss.portal.presentation.model.content.WindowContent; +import org.jboss.portal.presentation.protocol.ErrorResponse; +import org.jboss.portal.presentation.protocol.ProtocolAction; +import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; +import org.jboss.portal.presentation.protocol.UIObjectAction; +import org.jboss.portal.presentation.protocol.ViewUIObjectAction; import org.jboss.portal.presentation.server.PresentationRequest; import org.jboss.portal.presentation.server.PresentationResponse; import org.jboss.portal.presentation.server.PresentationServer; import org.jboss.portal.presentation.server.PresentationServerException; import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.protocol.ProtocolAction; -import org.jboss.portal.presentation.protocol.ViewUIObjectAction; -import org.jboss.portal.presentation.protocol.UIObjectAction; -import org.jboss.portal.presentation.protocol.ErrorResponse; -import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; -import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.client.PresentationClient; -import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; -import org.jboss.portal.presentation.impl.state.structural.StructuralNode; -import org.jboss.portal.presentation.impl.state.structural.WindowNode; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic; -import org.jboss.portal.presentation.client.PresentationClient; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; +import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.presentation.classic.model.ClassicUINode; +import org.jboss.portal.presentation.classic.model.ClassicViewPortContext; import org.jboss.portal.presentation.classic.model.DefaultPageViewPortScope; -import org.jboss.portal.presentation.classic.model.ClassicViewPortContext; -import org.jboss.portal.presentation.classic.model.ClassicUINode; import org.jboss.portal.presentation.classic.model.PageViewPortScope; import org.jboss.portal.presentation.classic.protocol.ActionDecoder; import org.jboss.portal.presentation.classic.protocol.ActionEncoder; -import org.jboss.portal.presentation.server.PresentationRequest; -import org.jboss.portal.presentation.server.PresentationResponse; -import org.jboss.portal.presentation.server.PresentationServer; -import org.jboss.portal.presentation.server.PresentationServerException; +import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.impl.model.UIModelImpl; import org.jboss.portal.presentation.model.UIModel; import org.jboss.portal.presentation.model.UIObject; @@ -44,19 +39,24 @@ import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.protocol.ViewUIObjectAction; import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.protocol.ProtocolResponse; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; +import org.jboss.portal.presentation.protocol.ViewUIObjectAction; +import org.jboss.portal.presentation.server.PresentationRequest; +import org.jboss.portal.presentation.server.PresentationResponse; +import org.jboss.portal.presentation.server.PresentationServer; +import org.jboss.portal.presentation.server.PresentationServerException; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; +import org.jboss.portal.web.ServletContainer; +import org.jboss.portal.web.ServletContextDispatcher; import org.jboss.portal.web.WebRequest; import org.jboss.portal.web.WebResponse; -import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.impl.DefaultServletContainerFactory; -import org.jboss.portal.portlet.URLFormat; +import java.io.IOException; import java.io.PrintWriter; -import java.io.IOException; import java.io.Writer; import java.util.Collection; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationServlet.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationServlet.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationServlet.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,20 +22,17 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic; -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.WebResponse; -import org.jboss.portal.web.endpoint.EndPointServlet; -import org.jboss.portal.presentation.server.PresentationServer; -import org.jboss.portal.presentation.server.PresentationServerException; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.presentation.PresentationServerImpl; import org.jboss.portal.presentation.impl.state.structural.ContextNode; import org.jboss.portal.presentation.impl.state.structural.NodeImporter; import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; -import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.presentation.server.PresentationServer; +import org.jboss.portal.presentation.server.PresentationServerException; +import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.WebResponse; +import org.jboss.portal.web.endpoint.EndPointServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; import java.io.IOException; import java.io.InputStream; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -24,9 +24,8 @@ import org.jboss.portal.presentation.model.UIObject; -import java.util.Map; -import java.util.HashMap; import java.util.Collection; +import java.util.Map; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,8 +25,8 @@ import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ViewPortContext; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionDecoder.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionDecoder.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionDecoder.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.protocol; +import org.jboss.portal.presentation.protocol.GetActivation; +import org.jboss.portal.presentation.protocol.PostActivation; import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.protocol.ViewUIObjectAction; -import org.jboss.portal.presentation.protocol.GetActivation; -import org.jboss.portal.presentation.protocol.PostActivation; import org.jboss.portal.web.WebRequest; /** Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionEncoder.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionEncoder.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/protocol/ActionEncoder.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.presentation.classic.protocol; +import org.jboss.portal.common.text.FastURLEncoder; +import org.jboss.portal.presentation.protocol.LinkActivation; import org.jboss.portal.presentation.protocol.ProtocolAction; +import org.jboss.portal.presentation.protocol.UIObjectAction; import org.jboss.portal.presentation.protocol.ViewUIObjectAction; -import org.jboss.portal.presentation.protocol.LinkActivation; -import org.jboss.portal.presentation.protocol.UIObjectAction; -import org.jboss.portal.common.text.FastURLEncoder; import org.jboss.portal.web.WebResponse; /** Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.presentation.portlet; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.presentation.impl.state.structural.PageNode; import javax.servlet.http.Cookie; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.presentation.portlet.spi; -import org.jboss.portal.portlet.spi.ClientContext; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; +import org.jboss.portal.portlet.spi.ClientContext; +import org.jboss.portal.presentation.protocol.GetActivation; import org.jboss.portal.presentation.protocol.LinkActivation; -import org.jboss.portal.presentation.protocol.GetActivation; import javax.servlet.http.Cookie; +import java.util.Collections; import java.util.List; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.portlet.spi; +import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.presentation.impl.state.structural.WindowNode; /** Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.portlet.spi; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.portlet.spi.PortalContext; +import java.util.Collections; +import java.util.Map; import java.util.Set; -import java.util.Map; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,10 +23,10 @@ package org.jboss.portal.presentation.portlet.spi; import org.jboss.portal.portlet.spi.ServerContext; +import org.jboss.portal.presentation.client.PresentationClient; +import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContainer; -import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.presentation.client.PresentationClient; import javax.servlet.ServletContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.client; +import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.presentation.protocol.ProtocolAction; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.protocol.ProtocolAction; -import org.jboss.portal.portlet.URLFormat; import org.jboss.portal.web.ServletContextDispatcher; import java.io.IOException; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -24,9 +24,8 @@ import org.jboss.portal.presentation.layout.LayoutManager; - -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * This layout manager provides a Flexible Grid for laying out the UI components (which would be Portlet Windows) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.classic.layout; +import org.jboss.portal.presentation.layout.LayoutManager; + +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; -import org.jboss.portal.presentation.layout.LayoutManager; - /** * This layout manager splits the page up into Regions. Containers which contain the Portlet Windows * are then laid out vertically inside each Region. Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ChildrenVisit.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ChildrenVisit.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ChildrenVisit.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; +import java.util.ArrayList; import java.util.Collection; -import java.util.ArrayList; /** * @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/CreateDiffPhase.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,9 +25,9 @@ import org.jboss.portal.presentation.model.ObjectTraversalType; import org.jboss.portal.presentation.model.ViewPortContext; import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; /** * @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/CreateUpdatePhase.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateUpdatePhase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateUpdatePhase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -24,12 +24,12 @@ import org.jboss.portal.presentation.model.ViewPortContext; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; import java.util.Set; -import java.util.HashSet; /** * @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/ObjectUpdate.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectUpdate.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectUpdate.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,8 +25,8 @@ import org.jboss.portal.presentation.model.ViewPortContext; import org.jboss.portal.presentation.state.structural.StructuralObject; +import java.util.HashMap; import java.util.List; -import java.util.HashMap; import java.util.Map; /** Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIModelImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIModelImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.model.UIModel; import org.jboss.portal.presentation.model.ViewPort; import org.jboss.portal.presentation.model.ViewPortContext; import org.jboss.portal.presentation.model.ViewPortScope; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; /** * @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/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,6 +22,11 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model; +import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.reflect.Reflection; +import org.jboss.portal.presentation.impl.model.ui.UIContextImpl; +import org.jboss.portal.presentation.impl.model.ui.UIPageImpl; +import org.jboss.portal.presentation.impl.model.ui.UIWindowImpl; import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; @@ -30,11 +35,6 @@ import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.impl.model.ui.UIContextImpl; -import org.jboss.portal.presentation.impl.model.ui.UIPageImpl; -import org.jboss.portal.presentation.impl.model.ui.UIWindowImpl; -import org.jboss.portal.common.reflect.Reflection; -import org.jboss.portal.common.NotYetImplemented; import java.util.Map; import java.util.Set; 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-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.ui; +import org.jboss.portal.presentation.impl.model.UIObjectImpl; import org.jboss.portal.presentation.model.ui.UIContext; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.impl.model.UIObjectImpl; /** * @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/UIPageImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.ui; +import org.jboss.portal.presentation.impl.model.UIObjectImpl; import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.impl.model.UIObjectImpl; /** * @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-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.model.ui; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.presentation.impl.model.UIObjectImpl; import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; -import org.jboss.portal.presentation.impl.model.UIObjectImpl; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; +import org.jboss.portal.presentation.state.structural.StructuralObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/navigational/NavigationalStateContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/navigational/NavigationalStateContextImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/navigational/NavigationalStateContextImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.navigational; -import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; import org.jboss.portal.presentation.state.StateChangeVetoException; import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.navigational.NavigationalStateContext; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; import java.util.Set; /** Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,22 +22,21 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.xml.XMLTools; +import static org.jboss.portal.common.xml.XMLTools.*; import org.w3c.dom.Document; import org.w3c.dom.Element; - -import static org.jboss.portal.common.xml.XMLTools.*; -import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.io.IOTools; import org.xml.sax.SAXException; -import javax.xml.parsers.ParserConfigurationException; +import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; -import javax.xml.XMLConstants; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; /** Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; +import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.state.StaleStateException; import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.state.StaleStateException; -import org.jboss.portal.presentation.model.UIObject; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; -import java.util.HashMap; -import java.util.Collections; import java.util.Set; -import java.util.HashSet; -import java.util.Collection; -import java.util.ArrayList; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateContextImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateContextImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,18 +22,16 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; -import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.NoSuchStateException; import org.jboss.portal.presentation.state.StaleStateException; +import org.jboss.portal.presentation.state.StateException; +import org.jboss.portal.presentation.state.structural.StructuralObject; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import java.util.Collection; -import java.util.Map; -import java.util.HashMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.impl.state.structural; +import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.state.structural.StructuralState; -import org.jboss.portal.presentation.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObject.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.model; +import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.StateType; -import org.jboss.portal.presentation.state.StateException; import java.util.Set; 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-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortContext.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.presentation.model; -import org.jboss.portal.presentation.model.UIObject; - /** * This interface defines read-write access to the structural information of a viewport. * Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.presentation.model; -import org.jboss.portal.presentation.model.UIObject; - /** * Defines the scope of a viewport. This interface is separated from the viewport context in order to * really affirm the split between the concern between the scope implementation that is used by the viewport Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIWindow.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.model.ui; +import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.presentation.model.UIObject; /** Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/GetActivation.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/GetActivation.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/GetActivation.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,7 +23,6 @@ package org.jboss.portal.presentation.protocol; import java.util.Map; -import java.util.Iterator; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/PostActivation.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/PostActivation.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/PostActivation.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -24,7 +24,6 @@ import org.jboss.portal.web.Body; -import java.util.Iterator; import java.util.Map; /** Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/PresentationServer.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.presentation.server; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; +import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.protocol.ProtocolAction; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.state.structural; +import java.util.Map; import java.util.Set; -import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,15 +23,8 @@ package org.jboss.portal.presentation.test.layout; import junit.framework.TestCase; - import org.apache.log4j.Logger; -import java.io.FileOutputStream; - -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGrid; -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridConstraints; -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridLayoutManager; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,14 +23,8 @@ package org.jboss.portal.presentation.test.layout; import junit.framework.TestCase; - import org.apache.log4j.Logger; -import java.io.FileOutputStream; - -import org.jboss.portal.presentation.impl.classic.layout.RegionConstraints; -import org.jboss.portal.presentation.impl.classic.layout.RegionLayoutManager; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,23 +23,22 @@ package org.jboss.portal.presentation.test.model; import junit.framework.TestCase; - import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; +import org.jboss.portal.presentation.state.NoSuchStateException; +import org.jboss.portal.presentation.state.StaleStateException; +import org.jboss.portal.presentation.state.StateException; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralState; import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.state.StateException; -import org.jboss.portal.presentation.state.StaleStateException; -import org.jboss.portal.presentation.state.NoSuchStateException; import org.jboss.portal.presentation.test.model.state.structural.MockException; -import java.util.Set; -import java.util.List; -import java.util.Collections; import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.Map; +import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -31,12 +31,12 @@ import org.jboss.portal.presentation.state.structural.StructuralStateContext; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.HashSet; import java.util.Set; -import java.util.Collection; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -23,9 +23,6 @@ package org.jboss.portal.presentation.test.model.state.structural; import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.ui.UIContext; -import org.jboss.portal.presentation.model.ui.UIPage; -import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.state.structural.StructuralObject; import java.util.List; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; +import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.state.structural.StructuralState; -import org.jboss.portal.presentation.model.UIObject; import java.util.Map; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AbstractModelTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,15 +22,14 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; +import junit.framework.TestCase; +import org.jboss.portal.presentation.impl.model.UIModelImpl; +import org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl; import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; -import org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.impl.model.UIModelImpl; -import junit.framework.TestCase; - /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -26,7 +26,6 @@ import org.jboss.portal.presentation.model.ViewPort; import org.jboss.portal.presentation.model.ViewPortScope; import org.jboss.portal.presentation.model.ui.UIPage; -import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,10 +25,6 @@ import org.jboss.portal.presentation.model.ObjectTraversalType; import org.jboss.portal.presentation.model.ViewPort; import org.jboss.portal.presentation.model.ViewPortScope; -import org.jboss.portal.presentation.model.ui.UIContext; -import org.jboss.portal.presentation.model.ui.UIPage; -import org.jboss.portal.presentation.model.ui.UIWindow; -import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,20 +22,19 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; +import junit.framework.Assert; import org.jboss.portal.presentation.model.ObjectTraversalType; import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; -import org.jboss.portal.presentation.test.model.state.structural.MockObject; import org.jboss.portal.presentation.test.model.state.structural.MockModel; +import org.jboss.portal.presentation.test.model.state.structural.MockObject; -import java.util.Map; import java.util.HashMap; -import java.util.Set; import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import junit.framework.Assert; - /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,22 +22,21 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.jboss.portal.presentation.impl.model.UIModelImpl; +import org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl; import org.jboss.portal.presentation.model.ObjectTraversalType; import org.jboss.portal.presentation.model.UIModel; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.model.state.structural.MockModel; import org.jboss.portal.presentation.test.model.state.structural.MockModelImpl; -import org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; -import org.jboss.portal.presentation.impl.model.UIModelImpl; -import java.util.Collection; -import java.util.Collections; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; -import junit.framework.Assert; -import junit.framework.TestCase; - /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -25,8 +25,8 @@ import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.state.StateType; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,16 +22,15 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model3; +import junit.framework.Assert; import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ViewPortContext; -import java.util.Map; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; -import junit.framework.Assert; - /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-04-18 07:19:12 UTC (rev 10634) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-04-18 07:24:55 UTC (rev 10635) @@ -22,21 +22,21 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.state.structural; -import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; import org.jboss.portal.presentation.impl.state.structural.ContextNode; +import org.jboss.portal.presentation.impl.state.structural.PageNode; import org.jboss.portal.presentation.impl.state.structural.StructuralNode; -import org.jboss.portal.presentation.impl.state.structural.PageNode; +import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; import org.jboss.portal.presentation.impl.state.structural.WindowNode; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.model.UIObject; import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; +import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.test.model.AbstractModelTestCase; import java.util.ArrayList; +import java.util.List; import java.util.Set; -import java.util.List; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>