[portal-commits] JBoss Portal SVN: r5775 - trunk/core/src/main/org/jboss/portal/core/portlet/management

Author: chris.laprun(a)jboss.com Date: 2006-12-09 12:58:29 -0500 (Sat, 09 Dec 2006) New Revision: 5775 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java Log: Fixed incorrect refactoring (improper id was used) that was breaking the Management portlet. Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-12-09 17:55:16 UTC (rev 5774) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-12-09 17:58:29 UTC (rev 5775) @@ -38,8 +38,8 @@ import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.faces.el.DelegatingPropertyResolver; import org.jboss.portal.faces.el.PropertyDef; import org.jboss.portal.faces.el.TypeDef; @@ -356,7 +356,7 @@ // Set the state from the id if (id != null) { - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); PortalObject object = portalObjectContainer.getObject(poid); // @@ -399,7 +399,7 @@ // Destroy the object if (id != null) { - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); PortalObject object = portalObjectContainer.getObject(poid); // @@ -516,7 +516,7 @@ { Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); Window target = (Window)portalObjectContainer.getObject(poid); move(target, MOVE_UP); } @@ -532,7 +532,7 @@ { Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); Window target = (Window)portalObjectContainer.getObject(poid); move(target, MOVE_DOWN); } @@ -548,7 +548,7 @@ { Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); Window target = (Window)portalObjectContainer.getObject(poid); move(target, MOVE_RIGHT); } @@ -564,7 +564,7 @@ { Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(selectedId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); Window target = (Window)portalObjectContainer.getObject(poid); move(target, MOVE_LEFT); }