[Treebase-guts] SF.net SVN: treebase:[865] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/DirectMapToPhyloWidgetController.java

[<rv...@us...>]

Revision: 865
          http://treebase.svn.sourceforge.net/treebase/?rev=865&view=rev
Author:   rvos
Date:     2011-05-12 22:49:08 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Adding tree list as session attribute

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java	2011-05-12 20:42:36 UTC (rev 864)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java	2011-05-12 22:49:08 UTC (rev 865)
@@ -1,6 +1,8 @@
 package org.cipres.treebase.web.controllers;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 import java.util.Map;
@@ -54,6 +56,7 @@
 		String separator = "@";
 		Map<String, String> treeMap = new HashMap<String, String>();
 		Map<String,String> phylowsMap = new HashMap<String,String>();
+		List<PhyloTree> treeList = new ArrayList<PhyloTree>();
 		String newickStringName = null;
 
 		if (pRequest.getParameter("treeblockid") != null) {
@@ -76,6 +79,7 @@
 				if ( defaultNewick.equals("") ) {
 					defaultNewick = aTree.getNewickString();
 				}
+				treeList.add(aTree);
 			}					
 			// XXX ok, so this mess started when we somehow combined phylowidget for searching
 			// with phylowidget for submission (why???) -- rvosa
@@ -94,6 +98,7 @@
 
 			String TreeId = pRequest.getParameter("treeid");
 			PhyloTree aTree = getPhyloTreeService().findByID(Long.parseLong(TreeId));
+			treeList.add(aTree);
 
 			// use "T" to enable the edit menu items.
 			treeMap.put(getMapKey(aTree), TreeId + separator + aTree.getNewickString() + separator
@@ -112,6 +117,7 @@
 		pRequest.getSession().setAttribute("NEWICKSTRINGSMAP", treeMap);
 		pRequest.getSession().setAttribute("PHYLOWSMAP", phylowsMap);
 		pRequest.getSession().setAttribute("NEWICKSTRINGNAME", newickStringName);
+		pRequest.getSession().setAttribute("TREELIST", treeList);
 
 		return new ModelAndView(getDefaultView());
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.