Author: julien(a)jboss.com Date: 2008-04-13 19:22:15 -0400 (Sun, 13 Apr 2008) New Revision: 10563 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java Log: remove unnecessary stuff Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-13 23:11:33 UTC (rev 10562) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-04-13 23:22:15 UTC (rev 10563) @@ -28,7 +28,6 @@ import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.core.aspects.portlet.AjaxInterceptor; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.portlet.ControllerPortletControllerContext; import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; import org.jboss.portal.core.model.content.Content; Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-04-13 23:11:33 UTC (rev 10562) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-04-13 23:22:15 UTC (rev 10563) @@ -35,7 +35,6 @@ import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.content.WindowRendition; @@ -50,7 +49,6 @@ import org.jboss.portal.portlet.info.ParameterInfo; import org.apache.log4j.Logger; -import javax.xml.namespace.QName; import java.util.Map; import java.util.Collections; @@ -174,46 +172,6 @@ } // - - // Initialize the navigational state with the URI when needed - WindowNavigationalState navigationalState = rendererContext.getNavigationalState(); - - // -// boolean update = true; -// if (navigationalState != null && navigationalState.getState() instanceof PortletParametersStateString) -// { -// PortletParametersStateString state = (PortletParametersStateString)navigationalState.getState(); -// if (content.getURI().equals(state.getValue("uri"))) -// { -// update = false; -// } -// } - - // -/* - if (navigationalState == null) - { - ParametersStateString state = ParametersStateString.create(); - - // - for (Iterator i = content.getParameterNames(); i.hasNext();) - { - String paramName = (String)i.next(); - String paramValue = content.getParameter(paramName); - state.setValue(paramName, paramValue); - } - - // - String uri = content.getURI(); - state.setValue("uri", uri); - - rendererContext - - // Julien : to redo!!!! - // rendererContext.setNavigationalState(WindowNavigationalState.bilto(navigationalState, null, null, state)); - } -*/ - ContentRendererContext rendererContext2 = new ContentRendererContext() { public Window getWindow() @@ -226,11 +184,6 @@ return rendererContext.getNavigationalState(); } - public Map<String, String[]> getPublicNavigationalState() - { - return rendererContext.getPublicNavigationalState(); - } - public User getUser() { return rendererContext.getUser(); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java 2008-04-13 23:11:33 UTC (rev 10562) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java 2008-04-13 23:22:15 UTC (rev 10563) @@ -27,9 +27,6 @@ import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import javax.xml.namespace.QName; -import java.util.Map; - /** * Abstract the services provided to a content renderer for the render phase. * @@ -43,8 +40,6 @@ WindowNavigationalState getNavigationalState(); - Map<String, String[]> getPublicNavigationalState(); - User getUser(); RenderInvocation createRenderInvocation(WindowNavigationalState navigationalState);