[jboss-svn-commits] JBL Code SVN: r11153 - labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-04-20 08:15:55 -0400 (Fri, 20 Apr 2007)
New Revision: 11153

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java
Log:
JBLAB-849
bugfix+cleanup
-Pawel;


Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java	2007-04-20 11:47:53 UTC (rev 11152)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminBean.java	2007-04-20 12:15:55 UTC (rev 11153)
@@ -76,16 +76,15 @@
 	
 	/* page*/
 	
-	public String editPage() {
+	public synchronized String editPage() {
 		
-		page = PagesAdminTools.findPage(pages, selectedPage);	
+		page = PagesAdminTools.findPage(pages, selectedPage);
+		clearPreferences();
 		
-		setPreferences();
-		
 		return "";
 	}
 	
-	public String addPage() {
+	public synchronized String addPage() {
 		
 		String name = PagesAdminTools.newPageName(pages); 
 		page = PagesAdminTools.newPage(pages, name);
@@ -138,7 +137,6 @@
 	
 	public String selectPageContent() {
 	
-		System.out.println("SELECT PAGE CONTENT " + selectedPageContent);
 		setPreferences();
 		
 		return "";
@@ -158,11 +156,8 @@
 		}	
 		portlet = PagesAdminTools.findPortlet(page, selectedPageContent);
 		
-		System.out.println("SET PREFS " + portlet.getRegion());
-		
 		preferences = PagesAdminTools.getPreferences(portlet);
 		
-		
 		setHeight(portlet.getHeight());
 	}
 	
@@ -222,7 +217,6 @@
 	
 	public Portlet getPortlet() {
 		return portlet;
-		//return PagesAdminTools.findPortlet(page, selectedPageContent);
 	}
 	
 	public String getHeight() {
@@ -245,21 +239,11 @@
 		
 		Portlet portlet = getPortlet();
 		
-		System.out.println("getRegion " + portlet + ((portlet == null) ? null : (portlet.getName() + " " + portlet.getRegion().getClass())));
-		
 		return (portlet == null) ? null : portlet.getRegion();
 	}
 	
 	public void setRegion(String value) {
-/*
-		if ((FacesTools.getRequestParameter("doNotSetHR") != null) ||
-				(FacesTools.getRequestParameter("doNotSetHR").equals("true"))) {
-			System.out.println("skipped");
-			return;
-		}*/
-		
-		System.out.println("SET REGION " + value + " " + selectedPageContent);
-		
+
 		Portlet portlet = getPortlet();
 		
 		if (portlet != null) {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java	2007-04-20 11:47:53 UTC (rev 11152)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/pages/PagesAdminTools.java	2007-04-20 12:15:55 UTC (rev 11153)
@@ -22,8 +22,6 @@
 package org.jboss.forge.projects.admin.pages;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -86,12 +84,13 @@
 		for (Portlet portlet :	portlets) {
 			
 			contentList.add(
-					new SelectItem(Integer.toString(i), Integer.toString(i) + portlet.getName()));	
+					new SelectItem(Integer.toString(i), portlet.getName()));	
 			i++;
 		}
 
 		return contentList;
 	}
+	
 
 	public static List<SelectItem> getPages(Pages pages) {
 		
@@ -128,11 +127,6 @@
 		List<Portlet> portletsList = (List<Portlet>) page.getPortlets();
 		
 		portletsList.add(portlet);
-		/*
-		System.out.println("ADD CONTENT " + portlet.getRegion());
-		for (Portlet p : portletsList) {
-			System.out.println("p " + p.getName() + " " + p.getRegion());
-		}*/
 	}
 
 	public static void removeContent(Page page, String contentToRemove) {
@@ -152,13 +146,7 @@
 		if ((contentPosition == null) || (contentPosition.length() == 0)) {
 			return null;
 		}
-		/*
-		System.out.println("FIND " + contentPosition);
-		List<Portlet> portletsList = (List<Portlet>) page.getPortlets();
-		for (Portlet p : portletsList) {
-			System.out.println("p " + p.getName() + " " + p.getRegion());
-		}*/
-		
+
 		int n = Integer.parseInt(contentPosition);
 		
 		List<Portlet> portlets = (List<Portlet>) page.getPortlets();