Author: julien(a)jboss.com Date: 2007-02-27 11:56:45 -0500 (Tue, 27 Feb 2007) New Revision: 6430 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 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:53:55 UTC (rev 6429) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 16:56:45 UTC (rev 6430) @@ -650,7 +650,7 @@ } /** Return the <Region>List on the selected object which must be a page. */ - public List getCols() + public List getRegionNames() { try { @@ -693,60 +693,6 @@ return windowMap; } - public List getRegionItems() throws Exception - { - List list = getCols(); - for (int i = 0;i < list.size();i++) - { - String regionName = (String)list.get(i); - SelectItem regionItem = new SelectItem(); - regionItem.setValue(regionName); - regionItem.setLabel(regionName); - list.set(i, regionItem); - } - return list; - } - - /** Return an array of <Region,Window>Map on the selected object which must be a page. */ - public Map[] getRows() throws Exception - { - Map windows = getWindows((Page)getSelectedObject()); - - // - List regions = new ArrayList(windows.keySet()); - Collections.sort(regions); - - // - Iterator[] iterators = new Iterator[regions.size()]; - for (int i = 0; i < regions.size(); i++) - { - String region = (String)regions.get(i); - iterators[i] = ((SortedSet)windows.get(region)).iterator(); - } - - // - List maps = new ArrayList(); - while (true) - { - Map row = new HashMap(); - for (int i = 0; i < iterators.length; i++) - { - Iterator iterator = iterators[i]; - if (iterator.hasNext()) - { - row.put(regions.get(i), iterator.next()); - } - } - if (row.size() == 0) - { - break; - } - maps.add(row); - } - - return (Map[])maps.toArray(new Map[maps.size()]); - } - // **************************** public class PortalObjectAuthorizationBean extends AbstractAuthorizationBean Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27 16:53:55 UTC (rev 6429) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27 16:56:45 UTC (rev 6430) @@ -52,7 +52,7 @@ </table> </td> <td> - <c:forEach items="#{portalobjectmgr.cols}" var="regionName"> + <c:forEach items="#{portalobjectmgr.regionNames}" var="regionName"> <table> <tr> <td colspan="3">#{regionName} Column</td>