X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fio%2Fwriters%2FPhyloXmlNodeWriter.java;h=c92e1d77a32bb1dc151401b3e777dff03d1c2368;hb=665e671efec73fcb36a9aac45f119330f290fa81;hp=586a70960236ce4c4ad87ec571293602491e2261;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git

diff --git a/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java b/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
index 586a709..c92e1d7 100644
--- a/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
+++ b/forester/java/src/org/forester/io/writers/PhyloXmlNodeWriter.java
@@ -5,7 +5,7 @@
 // Copyright (C) 2000-2009 Christian M. Zmasek
 // Copyright (C) 2007-2009 Burnham Institute for Medical Research
 // All rights reserved
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -15,13 +15,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // Lesser General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // 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;
 
@@ -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 = "";
-        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 );
         }
-        if ( node.getDistanceToParent() != PhylogenyNode.DISTANCE_DEFAULT ) {
+        if ( node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) {
             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 );