Author: julien(a)jboss.com Date: 2007-03-02 15:28:32 -0500 (Fri, 02 Mar 2007) New Revision: 6491 Added: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectIdConverter.java Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java Log: improve state management of portal object manager bean Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -279,7 +279,7 @@ if (instances == null) { instances = new ArrayList(instanceContainer.getDefinitions()); - Collections.sort(instances, comparator); + Collections.sort(instances, INSTANCE_COMPARATOR); } // @@ -365,7 +365,7 @@ } /** A comparator for portlets. */ - final Comparator comparator = new Comparator() + static final Comparator INSTANCE_COMPARATOR = new Comparator() { public int compare(Object o1, Object o2) { Added: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectIdConverter.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectIdConverter.java (rev 0) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectIdConverter.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.admin.ui; + +import org.jboss.portal.core.model.portal.PortalObjectId; + +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortalObjectIdConverter implements Converter +{ + public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String string) throws ConverterException + { + return string == null ? null : PortalObjectId.parse(string, PortalObjectId.LEGACY_BASE64_FORMAT); + } + + public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object object) throws ConverterException + { + return object == null ? null : ((PortalObjectId)object).toString(PortalObjectId.LEGACY_BASE64_FORMAT); + } +} Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -26,11 +26,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -193,16 +191,9 @@ /** . */ private Logger log = Logger.getLogger(getClass()); - /** The selected id. */ - private String selectedId; + // Wired services - /** The current tab name. */ - private String selectedPlugin; - /** . */ - private RoleModule roleModule; - - /** . */ private PortalObjectContainer portalObjectContainer; /** . */ @@ -221,35 +212,58 @@ private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory; /** . */ - private AbstractAuthorizationBean auth = new PortalObjectAuthorizationBean(); + private RoleModule roleModule; - /** . */ - private ThemeBean themes = new ThemeBean(); + // Navigational state + /** The selected id. */ + private PortalObjectId selectedId; + + /** The current tab name. */ + private String selectedPlugin; + /** The selected type for content. */ private ContentType selectedContentType = ContentType.PORTLET; /** The uri value for content. */ private String selectedContentURI; - public ContentType getSelectedContentType() - { - return selectedContentType; - } + // Runtime state - public void setSelectedContentType(ContentType selectedContentType) - { - this.selectedContentType = selectedContentType; - } + /** . */ + private final ThemeBean themes = new ThemeBean(); - public String getSelectedContentURI() + /** . */ + private final AbstractAuthorizationBean auth = new PortalObjectAuthorizationBean(); + + /** . */ + private SelectItem[] instanceItems; + + /** . */ + private SelectItem[] portalPageItems; + + /** . */ + private List selectedObjectPath; + + /** . */ + private PortalObject selectedObject; + + /** . */ + private PortalObjectBean selectedObjectBean; + + /** . */ + private List selectedProperties; + + // Wired services + + public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory() { - return selectedContentURI; + return portalAuthorizationManagerFactory; } - public void setSelectedContentURI(String selectedContentURI) + public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory) { - this.selectedContentURI = selectedContentURI; + this.portalAuthorizationManagerFactory = portalAuthorizationManagerFactory; } public RoleModule getRoleModule() @@ -312,6 +326,38 @@ this.authorizationDomainRegistry = authorizationDomainRegistry; } + public ContentType getSelectedContentType() + { + return selectedContentType; + } + + public void setSelectedContentType(ContentType selectedContentType) + { + this.selectedContentType = selectedContentType; + } + + public String getSelectedContentURI() + { + return selectedContentURI; + } + + public void setSelectedContentURI(String selectedContentURI) + { + this.selectedContentURI = selectedContentURI; + } + + public String getSelectedPlugin() + { + return selectedPlugin; + } + + public void setSelectedPlugin(String selectedPlugin) + { + this.selectedPlugin = selectedPlugin; + } + + // Runtime state + public AbstractAuthorizationBean getAuth() { return auth; @@ -322,8 +368,6 @@ return themes; } - // **************************** - public DomainConfigurator getDomainConfigurator() { return authorizationDomainRegistry.getDomain("portalobject").getConfigurator(); @@ -340,86 +384,144 @@ return portalObjectContainer.getObject(id); } - public List getSelectedObjectPath() + public List getPortalNodes() { - PortalObject o = getSelectedObject(); - ArrayList path = new ArrayList(); - while (o != null) - { - path.add(new PortalObjectBean(o)); - o = o.getParent(); - } - Collections.reverse(path); - return path; + return getNodes(PortalObject.PORTAL_MASK); } - public PortalObject getSelectedObject() + public List getPageNodes() { - PortalObject result; - if (selectedId != null) - { - result = getObjectFromId(selectedId); - } - else - { - result = portalObjectContainer.getRootObject(); - } - return result; + return getNodes(PortalObject.PAGE_MASK); } - - public PortalObjectBean getSelectedObjectBean() + + public List getWindowNodes() { - return new PortalObjectBean(getSelectedObject()); + return getNodes(PortalObject.WINDOW_MASK); } - - public void setSelectedObject(PortalObject po) + + public SelectItem[] getInstanceItems() { - selectedId = po.getId().toString(PortalObjectId.LEGACY_BASE64_FORMAT); + if (instanceItems == null) + { + List tmp = new ArrayList(instanceContainer.getDefinitions()); + Collections.sort(tmp, InstanceManagerBean.INSTANCE_COMPARATOR); + for (int i = 0;i < tmp.size();i++) + { + Instance instance = (Instance)tmp.get(i); + SelectItem item = new SelectItem(instance.getId()); + tmp.set(i, item); + } + instanceItems = (SelectItem[])tmp.toArray(new SelectItem[tmp.size()]); + } + return instanceItems; } - public List getSelectedProperties() + public SelectItem[] getPortalPageItems() { - //return selectedProperties; - PortalObject object = getSelectedObject(); - List properties = new ArrayList(); - for (Iterator i = object.getDeclaredProperties().entrySet().iterator(); i.hasNext();) + if (portalPageItems == null) { - Map.Entry entry = (Map.Entry)i.next(); - properties.add(new String[]{(String)entry.getKey(), (String)entry.getValue()}); + Collection pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK); + ArrayList list = new ArrayList(pages.size() + 1); + for (Iterator iterator = pages.iterator(); iterator.hasNext();) + { + PortalObject o = (PortalObject)iterator.next(); + SelectItem item = new SelectItem(o.getName()); + list.add(item); + } + list.add(new SelectItem("", "no selection")); + portalPageItems = (SelectItem[])list.toArray(new SelectItem[list.size()]); } - return properties; + return portalPageItems; } - public String getSelectedPlugin() + public List getSelectedObjectPath() { - return selectedPlugin; + if (selectedObjectPath == null) + { + PortalObject o = getSelectedObject(); + ArrayList path = new ArrayList(); + while (o != null) + { + path.add(new PortalObjectBean(o)); + o = o.getParent(); + } + Collections.reverse(path); + selectedObjectPath = path; + } + return selectedObjectPath; } - public void selectPlugin() + public PortalObject getSelectedObject() { - // Get id - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - selectedPlugin = (String)pmap.get("plugin"); + if (selectedObject == null) + { + if (selectedId == null) + { + selectedId = new PortalObjectId(); + } + selectedObject = getObjectFromId(selectedId); + if (selectedObject instanceof Window) + { + Window window = (Window)selectedObject; + selectedContentType = window.getContentType(); + Content content = window.getContent(); + if (content != null) + { + selectedContentURI = content.getURI(); + } + } + } + return selectedObject; } - - public void selectParentObject(ActionEvent ae) + + public PortalObjectBean getSelectedObjectBean() { - selectParentObject(); + if (selectedObjectBean == null) + { + selectedObjectBean = new PortalObjectBean(getSelectedObject()); + } + return selectedObjectBean; } - public void selectParentObject() + public List getSelectedProperties() { - setSelectedObject(getSelectedObject().getParent()); + if (selectedProperties == null) + { + PortalObject object = getSelectedObject(); + List properties = new ArrayList(); + for (Iterator i = object.getDeclaredProperties().entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + properties.add(new String[]{(String)entry.getKey(), (String)entry.getValue()}); + } + selectedProperties = properties; + } + return selectedProperties; } - public void selectRootObject(ActionEvent ae) + // UI operations + + public void selectObject(PortalObject po) { - setSelectedObject(portalObjectContainer.getRootObject()); + selectObject(po.getId()); } - public void udpateContentType() + private void selectObject(PortalObjectId id) { - // Do nothing + if (id == null) + { + selectedId = null; + selectedPlugin = null; + selectedContentType = ContentType.PORTLET; + selectedContentURI = null; + } + else + { + selectedId = id; + selectedPlugin = "manager"; + selectedContentType = ContentType.PORTLET; + selectedContentURI = null; + } } public void selectObject(ActionEvent ae) @@ -427,58 +529,39 @@ selectObject(); } - /** Proceed to an object selection. */ public String selectObject() { - // Clear state - selectedId = new PortalObjectId().toString(PortalObjectId.LEGACY_BASE64_FORMAT); - selectedPlugin = null; - selectedContentType = ContentType.PORTLET; - selectedContentURI = null; - - // String next = "portals"; - try { - // Get id Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String id = (String)pmap.get("id"); // Set the state from the id - if (id != null) + PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.LEGACY_BASE64_FORMAT); + PortalObject object = portalObjectContainer.getObject(poid); + + // Update state if possible + if (object != null) { - PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.LEGACY_BASE64_FORMAT); - PortalObject object = portalObjectContainer.getObject(poid); + selectObject(poid); - // Update state if possible - if (object != null) + // + switch(object.getType()) { - selectedId = id; - selectedPlugin = "manager"; - switch(object.getType()) - { - case PortalObject.TYPE_CONTEXT: - next = "portals"; - break; - case PortalObject.TYPE_PORTAL: - next = "pages"; - break; - case PortalObject.TYPE_PAGE: - next = "pages"; - break; - case PortalObject.TYPE_WINDOW: - Window window = (Window)object; - next = "windows"; - selectedContentType = window.getContentType(); - Content content = window.getContent(); - if (content != null) - { - selectedContentURI = content.getURI(); - } - break; - } + case PortalObject.TYPE_CONTEXT: + next = "portals"; + break; + case PortalObject.TYPE_PORTAL: + next = "pages"; + break; + case PortalObject.TYPE_PAGE: + next = "pages"; + break; + case PortalObject.TYPE_WINDOW: + next = "windows"; + break; } } } @@ -491,14 +574,36 @@ return next; } - /** Proceed to object destroy. */ + public void selectPlugin() + { + // Get id + Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); + selectedPlugin = (String)pmap.get("plugin"); + } + + public void selectParentObject() + { + PortalObject current = getSelectedObject(); + PortalObject parent = current.getParent(); + selectObject(parent); + } + + public void selectRootObject(ActionEvent ae) + { + PortalObject root = portalObjectContainer.getRootObject(); + selectObject(root); + } + + public void udpateContentType() + { + // Do nothing + } + public void destroyObject(ActionEvent ae) { try { - // Clear state - selectedId = null; - selectedPlugin = null; + selectObject((PortalObjectId)null); // Get id Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); @@ -510,7 +615,7 @@ PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.LEGACY_BASE64_FORMAT); PortalObject object = portalObjectContainer.getObject(poid); - setSelectedObject(object.getParent()); + selectObject(object.getParent()); String stringMessage = object.getName() + " has successfully been destroyed"; @@ -530,8 +635,6 @@ private List getNodes(int mask) { Collection test = getSelectedObject().getChildren(mask); - // TODO: don't recreate the objects each time ! - // TODO: Use a datamodel ArrayList result = new ArrayList(); Iterator it = test.iterator(); while (it.hasNext()) @@ -542,99 +645,6 @@ return result; } - public List getPortalNodes() - { - return getNodes(PortalObject.PORTAL_MASK); - } - - public List getPageNodes() - { - return getNodes(PortalObject.PAGE_MASK); - } - - public List getWindowNodes() - { - return getNodes(PortalObject.WINDOW_MASK); - } - - public SelectItem[] getInstanceItems() - { - Collection instances = instanceContainer.getDefinitions(); - - //sort instances by id - List sortedInstances = new LinkedList(); - for (Iterator i = instances.iterator(); i.hasNext();) - { - Instance instance = (Instance)i.next(); - sortedInstances.add(instance); - } - try - { - sortInstances(sortedInstances, "id", true); - } - catch (Exception e) - { - log.warn("Error while sorting instances list"); - } - - ArrayList list = new ArrayList(instances.size()); - for (Iterator i = sortedInstances.iterator(); i.hasNext();) - { - Instance instance = (Instance)i.next(); - SelectItem item = new SelectItem(instance.getId()); - list.add(item); - } - return (SelectItem[])list.toArray(new SelectItem[list.size()]); - } - - public SelectItem[] getPortalPageItems() - { - Collection pages = getSelectedObject().getChildren(); - - ArrayList list = new ArrayList(pages.size() + 1); - for (Iterator iterator = pages.iterator(); iterator.hasNext();) - { - PortalObject o = (PortalObject)iterator.next(); - if (o.getType() == PortalObject.TYPE_PAGE) - { - SelectItem item = new SelectItem(o.getName()); - list.add(item); - } - - } - list.add(new SelectItem("", "no selection")); - - return (SelectItem[])list.toArray(new SelectItem[list.size()]); - } - - - public static void sortInstances(List instances, final String column, final boolean ascending) - { - Comparator comparator = new Comparator() - { - public int compare(Object o1, Object o2) - { - Instance i1 = (Instance)o1; - Instance i2 = (Instance)o2; - - if (column == null) - { - return 0; - } - if (column.equals("id")) - { - return ascending ? i1.getId().compareToIgnoreCase(i2.getId()) : i2.getId() - .compareToIgnoreCase(i1.getId()); - } - else - { - return 0; - } - } - }; - Collections.sort(instances, comparator); - } - /** Returns a <Region,<Window>SortedSet>Map. */ private Map getWindows(Page page) throws Exception { @@ -713,7 +723,15 @@ return windowMap; } - // **************************** + public void refresh() + { + instanceItems = null; + portalPageItems = null; + selectedObjectPath = null; + selectedObject = null; + selectedObjectBean = null; + selectedProperties = null; + } public class PortalObjectAuthorizationBean extends AbstractAuthorizationBean { @@ -755,7 +773,7 @@ // PortalObject po = getSelectedObject(); - setSelectedObject(po.getParent()); + selectObject(po.getParent()); // if (po.getType() == PortalObject.TYPE_PORTAL) @@ -923,16 +941,6 @@ } } - public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory() - { - return portalAuthorizationManagerFactory; - } - - public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory) - { - this.portalAuthorizationManagerFactory = portalAuthorizationManagerFactory; - } - public String getPreviewURL() { // try Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -50,6 +50,10 @@ FacesContext ctx = phaseEvent.getFacesContext(); // + PortalObjectManagerBean pomgr = (PortalObjectManagerBean)ctx.getApplication().createValueBinding("#{portalobjectmgr}").getValue(ctx); + pomgr.refresh(); + + // InstanceManagerBean instancemgr = (InstanceManagerBean)ctx.getApplication().createValueBinding("#{instancemgr}").getValue(ctx); instancemgr.refresh(); Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -214,7 +214,7 @@ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); FacesContext.getCurrentInstance().addMessage("status", message); } - pomgr.setSelectedObject(po.getParent()); + pomgr.selectObject(po.getParent()); return "portals"; } else if (po.getType() == PortalObject.TYPE_PAGE) @@ -225,7 +225,7 @@ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); FacesContext.getCurrentInstance().addMessage("status", message); } - pomgr.setSelectedObject(po.getParent()); + pomgr.selectObject(po.getParent()); return "pages"; } else if (po.getType() == PortalObject.TYPE_WINDOW) @@ -236,7 +236,7 @@ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); FacesContext.getCurrentInstance().addMessage("status", message); } - pomgr.setSelectedObject(po.getParent()); + pomgr.selectObject(po.getParent()); return "windows"; } Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-02 20:28:32 UTC (rev 6491) @@ -37,6 +37,11 @@ <converter-class>org.jboss.portal.core.admin.ui.ContentTypeConverter</converter-class> </converter> + <converter> + <converter-for-class>org.jboss.portal.core.model.portal.PortalObjectId</converter-for-class> + <converter-class>org.jboss.portal.core.admin.ui.PortalObjectIdConverter</converter-class> + </converter> + <!-- The portal object manager bean --> <managed-bean> <managed-bean-name>portalobjectmgr</managed-bean-name> Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java 2007-03-02 16:44:52 UTC (rev 6490) +++ trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java 2007-03-02 20:28:32 UTC (rev 6491) @@ -33,6 +33,7 @@ public abstract class AbstractCellAction { + /** . */ private String appendedValue; public String getAppendedValue() @@ -88,6 +89,10 @@ deleteRow(rowIndex); } + public void updateCell() + { + } + public abstract void deleteRow(int rowIndex); public abstract void selectRow(int rowIndex);