git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keep it as close with archy.js as possible...
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
io
/
writers
/
PhyloXmlNodeWriter.java
diff --git
a/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
b/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
index
1c11cb0
..
c92e1d7
100644
(file)
--- a/
forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
+++ b/
forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
@@
-21,7
+21,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
package org.forester.io.writers;
package org.forester.io.writers;
@@
-39,15
+39,15
@@
public class PhyloXmlNodeWriter {
public static void toPhyloXml( final Writer w, final PhylogenyNode node, final int level, final String indentation )
throws IOException {
String ind = "";
public static void toPhyloXml( final Writer w, final PhylogenyNode node, final int level, final String indentation )
throws IOException {
String ind = "";
- if ( indentation.length() > 0 ) {
+ if ( ( indentation != null ) && ( indentation.length() > 0 ) ) {
ind = indentation + PhylogenyWriter.PHYLO_XML_INTENDATION_BASE;
}
if ( !ForesterUtil.isEmpty( node.getName() ) ) {
PhylogenyDataUtil.appendElement( w, PhyloXmlMapping.NODE_NAME, node.getName(), indentation );
}
ind = indentation + PhylogenyWriter.PHYLO_XML_INTENDATION_BASE;
}
if ( !ForesterUtil.isEmpty( node.getName() ) ) {
PhylogenyDataUtil.appendElement( w, PhyloXmlMapping.NODE_NAME, node.getName(), indentation );
}
- if ( node.getDistanceToParent() != PhylogenyNode.DISTANCE_DEFAULT ) {
+ if ( node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) {
PhylogenyDataUtil.appendElement( w, PhyloXmlMapping.BRANCH_LENGTH, String.valueOf( ForesterUtil.round( node
PhylogenyDataUtil.appendElement( w, PhyloXmlMapping.BRANCH_LENGTH, String.valueOf( ForesterUtil.round( node
- .getDistanceToParent(), PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ), indentation );
+ .getDistanceToParent(), PhyloXmlUtil.ROUNDING_DIGITS_FOR_PHYLOXML_DOUBLE_OUTPUT ) ), indentation );
}
if ( node.getBranchData() != null ) {
node.getBranchData().toPhyloXML( w, level, ind );
}
if ( node.getBranchData() != null ) {
node.getBranchData().toPhyloXML( w, level, ind );