[Treebase-guts] SF.net SVN: treebase:[76] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain/tree/PhyloTree.java

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

Revision: 76
          http://treebase.svn.sourceforge.net/treebase/?rev=76&view=rev
Author:   rvos
Date:     2009-06-23 10:57:15 +0000 (Tue, 23 Jun 2009)

Log Message:
-----------
Fix: now no longer returns PhyloTreenull as a default title. Instead, if getId() returns a value, return a TreebaseIDString, otherwise return null.

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java	2009-06-23 10:56:13 UTC (rev 75)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java	2009-06-23 10:57:15 UTC (rev 76)
@@ -46,6 +46,7 @@
 import mesquite.lib.MesquiteDouble;
 import mesquite.lib.StringUtil;
 
+import org.cipres.treebase.TreebaseIDString;
 import org.cipres.treebase.TreebaseUtil;
 import org.cipres.treebase.domain.AbstractPersistedObject;
 import org.cipres.treebase.domain.TBPersistable;
@@ -224,8 +225,11 @@
 		if ( ! TreebaseUtil.isEmpty(mTitle) ) {
 			return mTitle;
 		}
+		else if ( null != getId() ){
+			return TreebaseIDString.getIDString(this);
+		}
 		else {
-			return "PhyloTree" + getId();
+			return null;
 		}
 	}
 


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