JAL-2805 made needed color set methods public

[jalview.git] / forester / java / src / org / forester / phylogeny / PhylogenyBranch.java

diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java
index 214337f..4b9c673 100644 (file)
--- a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java
+++ b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java
@@ -7,7 +7,7 @@
 // Copyright (C) 2000-2001 Washington University School of Medicine
 // and Howard Hughes Medical Institute
 // 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
@@ -17,13 +17,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.phylogeny;
 
@@ -32,7 +32,7 @@ import org.forester.phylogeny.data.PhylogenyData;
 /*
  * @author Christian M. Zmasek
  */
-public class PhylogenyBranch implements Edge {
+public class PhylogenyBranch {
 
     private final PhylogenyNode _node_1;
     private final PhylogenyNode _node_2;
@@ -129,10 +129,10 @@ public class PhylogenyBranch implements Edge {
                 hc_2 = node_2_hc;
             }
         }
-        result = PRIME * result + ( ( _data == null ) ? 0 : _data.hashCode() );
-        result = PRIME * result + ( _is_directed ? 1231 : 1237 );
-        result = PRIME * result + hc_1;
-        result = PRIME * result + hc_2;
+        result = ( PRIME * result ) + ( ( _data == null ) ? 0 : _data.hashCode() );
+        result = ( PRIME * result ) + ( _is_directed ? 1231 : 1237 );
+        result = ( PRIME * result ) + hc_1;
+        result = ( PRIME * result ) + hc_2;
         return result;
     }