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

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

Author: wrzep
Date: 2007-03-31 05:03:30 -0400 (Sat, 31 Mar 2007)
New Revision: 10679

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PagesAdminTools.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PreferenceBean.java
Log:
JBLAB-843
bugfixes


Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PagesAdminTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PagesAdminTools.java	2007-03-31 08:34:56 UTC (rev 10678)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PagesAdminTools.java	2007-03-31 09:03:30 UTC (rev 10679)
@@ -43,6 +43,7 @@
 import org.jboss.forge.common.projects.project.Pages;
 import org.jboss.forge.common.projects.project.Portlet;
 import org.jboss.forge.common.projects.project.Preference;
+import org.jboss.forge.common.projects.proxies.ObjectRWProxy;
 
 /**
  * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
@@ -102,7 +103,11 @@
 		Comparator<Portlet> portletsComparator = new PortletsHeightComparator();
 			            // Create new list since CopyOnWriteArrayList iterator
 					    // doesn't support set operation
-		List<Portlet> ret = new ArrayList(portlets);
+						// DO NOT use ArrayList(portlets) here. It will NOT work.
+		List<Portlet> ret = new ArrayList();
+		for (Object p : portlets) {
+			ret.add((Portlet) p);
+		}
 		
 		Collections.sort(ret, portletsComparator);
 		
@@ -231,6 +236,7 @@
 		}
 		
 		List<Preference> preferences = (List<Preference>) portlet.getPreferences();
+		
 		Set<String> preferencesSet = new HashSet<String>();
 		for (Preference preference : preferences) {
 			preferencesSet.add(preference.getName());
@@ -264,7 +270,10 @@
 		
 		List<PreferenceBean> ret = new ArrayList<PreferenceBean>();
 		for (Preference pref : preferences) {
-			ret.add(new PreferenceBean(pref, preferencesMap.get(pref.getName())));
+			
+			if (preferencesMap.containsKey(pref.getName())) {
+				ret.add(new PreferenceBean(pref, preferencesMap.get(pref.getName())));
+			}
 		}
 				
 		return ret;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PreferenceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PreferenceBean.java	2007-03-31 08:34:56 UTC (rev 10678)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/admin/PreferenceBean.java	2007-03-31 09:03:30 UTC (rev 10679)
@@ -58,7 +58,7 @@
 		
 		List<SelectItem> list = new ArrayList<SelectItem>();
 		
-		if ((preference.getValues() == null) | (preference.getValues().size() == 0)) {
+		if ((preference.getValues() == null) || (preference.getValues().size() == 0)) {
 			return list;
 		}