Author: thomas.heute(a)jboss.com Date: 2008-04-16 09:13:50 -0400 (Wed, 16 Apr 2008) New Revision: 10606 Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java Log: Fixed a content selector bug Fixed a JSFInvocation issue when no portlet mode or window state was explicitly defined Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-04-16 11:03:11 UTC (rev 10605) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-04-16 13:13:50 UTC (rev 10606) @@ -12,12 +12,13 @@ Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); %> <%@page import="org.jboss.portal.portlet.info.PortletInfo"%> -<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%> <%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%> <%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%> <%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%> <%@ page import="javax.portlet.PortletURL" %> <%@ page import="java.net.URLEncoder" %> +<%@page import="org.jboss.portal.portlet.impl.info.ContainerPortletInfo"%> +<%@page import="org.jboss.portal.core.metadata.portlet.PortletInfoMetaData"%> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> @@ -182,11 +183,12 @@ private String getIcon(PortletInfo info) { String iconLocation = null; - if (info instanceof CorePortletInfo) + if (info instanceof ContainerPortletInfo) { - CorePortletInfo cInfo = (CorePortletInfo)info; - PortletInfoInfo portletInfo = cInfo.getPortletInfo(); - if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null) + ContainerPortletInfo cInfo = (ContainerPortletInfo)info; + PortletInfoInfo portletInfo = cInfo.getAttachment(PortletInfoInfo.class); + if (portletInfo != null && portletInfo.getPortletIconInfo() != null + && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null) { iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL); } Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 11:03:11 UTC (rev 10605) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-04-16 13:13:50 UTC (rev 10606) @@ -163,6 +163,24 @@ // PortletInvocation action = new ActionInvocation(portletInvocationContext); + if (mode != null) + { + action.setMode(mode); + } + else + { + action.setMode(Mode.VIEW); + } + + if (windowState != null) + { + action.setWindowState(windowState); + } + else + { + action.setWindowState(WindowState.NORMAL); + } + // return invoke(portlet, action); } @@ -178,7 +196,25 @@ // PortletInvocation render = new RenderInvocation(portletInvocationContext); + + if (mode != null) + { + render.setMode(mode); + } + else + { + render.setMode(Mode.VIEW); + } + if (windowState != null) + { + render.setWindowState(windowState); + } + else + { + render.setWindowState(WindowState.NORMAL); + } + // return invoke(portlet, render); } @@ -225,6 +261,7 @@ this.invocation = invocation; this.navigationalState = navigationalState; + // addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); // addResolver(PortletInvocation.REQUEST_SCOPE, controllerContext);