Author: julien(a)jboss.com Date: 2007-02-27 11:53:55 -0500 (Tue, 27 Feb 2007) New Revision: 6429 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java Log: removed obsolete code for moving windows in portal object manager bean Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 16:46:32 UTC (rev 6428) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 16:53:55 UTC (rev 6429) @@ -57,6 +57,7 @@ import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.portlet.management.actions.WindowComparator; import org.jboss.portal.faces.el.DelegatingPropertyResolver; import org.jboss.portal.faces.el.decorator.SimpleBeanDecorator; import org.jboss.portal.faces.el.decorator.AbstractPropertyDecorator; @@ -82,18 +83,6 @@ public class PortalObjectManagerBean implements Serializable { - /** . */ - private static final int MOVE_UP = 0; - - /** . */ - private static final int MOVE_DOWN = 1; - - /** . */ - private static final int MOVE_LEFT = 2; - - /** . */ - private static final int MOVE_RIGHT = 3; - /** The serialVersionUID */ private static final long serialVersionUID = -8923517554726982622L; @@ -203,24 +192,6 @@ /** The uri value for content. */ private String selectedContentURI; - /** Compares two windows according to their order. */ - private static final Comparator comparator = new Comparator() - { - public int compare(Object o1, Object o2) - { - Window w1 = (Window)o1; - Window w2 = (Window)o2; - int sign = getOrder(w1) - getOrder(w2); - if (sign == 0) - { - sign = 1; - // sign = w1.getId().compareTo(w2.getId()); - } - - return sign; - } - }; - public ContentType getSelectedContentType() { return selectedContentType; @@ -384,26 +355,6 @@ return selectedPlugin; } - - public String goBack() - { - PortalObject po = getSelectedObject(); - selectParentObject(); - if (po.getType() == PortalObject.TYPE_PORTAL) - { - return "portals"; - } - else if (po.getType() == PortalObject.TYPE_PAGE) - { - return "pages"; - } - else if (po.getType() == PortalObject.TYPE_WINDOW) - { - return "windows"; - } - return ""; - } - public String modifySecurity() { // Update is made by JSF @@ -664,197 +615,6 @@ Collections.sort(instances, comparator); } - private static int getOrder(Window w) - { - try - { - return Integer.parseInt(w.getDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER)); - } - catch (NumberFormatException e) - { - return Integer.MAX_VALUE; - } - } - - public void moveUp() - { - try - { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); - Window target = (Window)portalObjectContainer.getObject(poid); - move(target, MOVE_UP); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public void moveDown() - { - try - { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); - Window target = (Window)portalObjectContainer.getObject(poid); - move(target, MOVE_DOWN); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public void moveRight() - { - try - { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); - Window target = (Window)portalObjectContainer.getObject(poid); - move(target, MOVE_RIGHT); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public void moveLeft() - { - try - { - Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - String id = (String)pmap.get("id"); - PortalObjectId poid = PortalObjectId.parse(id, PortalObjectId.CANONICAL_FORMAT); - Window target = (Window)portalObjectContainer.getObject(poid); - move(target, MOVE_LEFT); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public void move(Window target, int direction) - { - try - { - // Get region - String region = target.getDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION); - if (region == null) - { - region = "unknown"; - } - - // Get page - Page page = (Page)target.getParent(); - - // Build the set of cols - Map columns = getWindows(page); - - // - List regions = new ArrayList(columns.keySet()); - Collections.sort(regions); - - // Do the move - switch (direction) - { - case MOVE_UP: - { - List column = new ArrayList((SortedSet)columns.get(region)); - int order = column.indexOf(target); - int newOrder = order - 1; - if (newOrder >= 0 && newOrder < column.size()) - { - column.set(order, column.set(newOrder, target)); - } - for (int index = 0; index < column.size(); index++) - { - Window window = (Window)column.get(index); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + index); - } - break; - } - case MOVE_DOWN: - { - List column = new ArrayList((SortedSet)columns.get(region)); - int order = column.indexOf(target); - int newOrder = order + 1; - if (newOrder >= 0 && newOrder < column.size()) - { - column.set(order, column.set(newOrder, target)); - } - for (int index = 0; index < column.size(); index++) - { - Window window = (Window)column.get(index); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + index); - } - break; - } - case MOVE_RIGHT: - { - int index = regions.indexOf(region); - if (index < regions.size() - 1) - { - String newRegion = (String)regions.get(index + 1); - target.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, newRegion); - target.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); - ((SortedSet)columns.get(region)).remove(target); - ((SortedSet)columns.get(newRegion)).add(target); - List column = new ArrayList((SortedSet)columns.get(newRegion)); - for (int i = 0; i < column.size(); i++) - { - Window window = (Window)column.get(i); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); - } - } - break; - } - case MOVE_LEFT: - { - int index = regions.indexOf(region); - if (index > 0) - { - String newRegion = (String)regions.get(index - 1); - target.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, newRegion); - target.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); - ((SortedSet)columns.get(region)).remove(target); - ((SortedSet)columns.get(newRegion)).add(target); - List column = new ArrayList((SortedSet)columns.get(newRegion)); - for (int i = 0; i < column.size(); i++) - { - Window window = (Window)column.get(i); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); - } - } - break; - } - } - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public Map getWindowMap() - { - try - { - return getWindows((Page)getSelectedObject()); - } - catch (Exception e) - { - e.printStackTrace(); - return Collections.EMPTY_MAP; - } - } - /** Returns a <Region,<Window>SortedSet>Map. */ private Map getWindows(Page page) throws Exception { @@ -867,9 +627,9 @@ for (Iterator i = layout.getLayoutInfo().getRegionNames().iterator(); i.hasNext();) { String region = (String)i.next(); - windows.put(region, new TreeSet(comparator)); + windows.put(region, new TreeSet(new WindowComparator())); } - windows.put("unknown", new TreeSet(comparator)); + windows.put("unknown", new TreeSet(new WindowComparator())); // for (Iterator j = getSelectedObject().getChildren().iterator(); j.hasNext();)