Author: julien(a)jboss.com Date: 2006-12-10 09:18:10 -0500 (Sun, 10 Dec 2006) New Revision: 5780 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java Log: fix CCE in configurator due to refactorings, still issues in the editpage.jsp Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-10 12:11:17 UTC (rev 5779) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-12-10 14:18:10 UTC (rev 5780) @@ -29,6 +29,7 @@ import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; @@ -108,15 +109,15 @@ op = "editPage"; } - Page page = null; + Portal portal; if (req.getParameter("editPageSelect") != null) { String editPageSelect = req.getParameter("editPageSelect"); - page = (Page)portalObjectContainer.getObject(dashboardId).getChild(editPageSelect); + portal = (Portal)portalObjectContainer.getObject(dashboardId).getChild(editPageSelect); } else { - page = (Page)portalObjectContainer.getObject(dashboardId).getChild(req.getUser().getUserName()); + portal = (Portal)portalObjectContainer.getObject(dashboardId).getChild(req.getUser().getUserName()); } List available_instances = (List)instanceContainer.getInstances(); @@ -126,7 +127,7 @@ try { - Map windowMap = getWindows(page); + Map windowMap = getWindows(portal.getDefaultPage()); List regions = new ArrayList(windowMap.keySet()); Collections.sort(regions); @@ -160,7 +161,7 @@ } List pages = new ArrayList(); - for (Iterator j = page.getPortal().getChildren().iterator(); j.hasNext();) + for (Iterator j = portal.getChildren().iterator(); j.hasNext();) { PortalObject object = (PortalObject)j.next(); if (object.getType() == PortalObject.TYPE_PAGE) @@ -175,7 +176,7 @@ req.setAttribute("center_instances", center_instances); req.setAttribute("right_instances", right_instances); req.setAttribute("pages", pages); - req.setAttribute("currentPage", page.getName()); + req.setAttribute("currentPage", portal.getName()); PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/dashboard/editpage.jsp"); rd.include(req, resp); }