From: <rv...@us...> - 2011-05-12 17:46:39
|
Revision: 851 http://treebase.svn.sourceforge.net/treebase/?rev=851&view=rev Author: rvos Date: 2011-05-12 17:46:33 +0000 (Thu, 12 May 2011) Log Message: ----------- Added map to go from tree names to phylows paths 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 17:38:26 UTC (rev 850) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java 2011-05-12 17:46:33 UTC (rev 851) @@ -53,6 +53,7 @@ String defaultNewick = ""; String separator = "@"; Map<String, String> treeMap = new HashMap<String, String>(); + Map<String,String> phylowsMap = new HashMap<String,String>(); String newickStringName = null; if (pRequest.getParameter("treeblockid") != null) { @@ -71,6 +72,7 @@ for (PhyloTree aTree : TB.getTreeList()) { treeMap.put(getMapKey(aTree), aTree.getId() + separator + aTree.getNewickString() + separator + "T"); + phylowsMap.put(getMapKey(aTree), aTree.getPhyloWSPath().getPath()); if ( defaultNewick.equals("") ) { defaultNewick = aTree.getNewickString(); } @@ -96,6 +98,7 @@ // use "T" to enable the edit menu items. treeMap.put(getMapKey(aTree), TreeId + separator + aTree.getNewickString() + separator + "T"); + phylowsMap.put(getMapKey(aTree), aTree.getPhyloWSPath().getPath()); newickStringName = aTree.getTitle(); Study study = aTree.getStudy(); if ( study != null && study.isPublished() ) { @@ -107,6 +110,7 @@ pRequest.getSession().setAttribute("DEFAULTNEWICK", defaultNewick); pRequest.getSession().setAttribute("NEWICKSTRINGSMAP", treeMap); + pRequest.getSession().setAttribute("PHYLOWSMAP", phylowsMap); pRequest.getSession().setAttribute("NEWICKSTRINGNAME", newickStringName); return new ModelAndView(getDefaultView()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |