merge from 2_4_Release branch

[jalview.git] / src / org / biojava / dasobert / feature / SegmentImpl.java

diff --git a/src/org/biojava/dasobert/feature/SegmentImpl.java b/src/org/biojava/dasobert/feature/SegmentImpl.java
index 5a0585f..dba25e9 100644 (file)
--- a/src/org/biojava/dasobert/feature/SegmentImpl.java
+++ b/src/org/biojava/dasobert/feature/SegmentImpl.java
@@ -25,54 +25,59 @@ package org.biojava.dasobert.feature;
 
 import java.awt.Color;
 
-public class SegmentImpl extends AbstractSegment  {
+public class SegmentImpl extends AbstractSegment
+{
 
-    public SegmentImpl() {
-       super();
-        start = 0 ;
-        end   = 0 ;
-        name  = "Unknown";
-        color = Color.white ;
-        txtColor = "white" ;
-        parent = null ;
-        note = "";
-    }
-    
-    public boolean equals(Segment s){
-        if ( s == null)
-            return false;
-        
-        if (    ( start == s.getStart() ) &&
-                ( end == s.getEnd() ) &&
-                ( name.equals(s.getName()))               
-                )      
+  public SegmentImpl()
+  {
+    super();
+    start = 0;
+    end = 0;
+    name = "Unknown";
+    color = Color.white;
+    txtColor = "white";
+    parent = null;
+    note = "";
+  }
+
+  public boolean equals(Segment s)
+  {
+    if (s == null)
+      return false;
+
+    if ((start == s.getStart()) && (end == s.getEnd())
+            && (name.equals(s.getName())))
+    {
+      if (note == null)
+      {
+        if (s.getNote() == null)
+          return true;
+      }
+      else
+      {
+        if (s.getNote() != null)
         {
-            if ( note == null) {
-                if (s.getNote() == null)
-                    return true;
-            } else {
-                if (s.getNote() != null){
-                    if (s.getNote().equals(note))
-                        return true;
-                }
-            }
-            
+          if (s.getNote().equals(note))
+            return true;
         }
-        
-        
-        return false;
-    }
-    
-    public Object clone(){
-        
-        Segment s = new SegmentImpl();
-        s.setStart(start);
-        s.setEnd(end);
-        s.setName(name);
-        s.setColor(color);
-        s.setTxtColor(txtColor);
-        s.setNote(note);
-        return s;
-        
+      }
+
     }
+
+    return false;
+  }
+
+  public Object clone()
+  {
+
+    Segment s = new SegmentImpl();
+    s.setStart(start);
+    s.setEnd(end);
+    s.setName(name);
+    s.setColor(color);
+    s.setTxtColor(txtColor);
+    s.setNote(note);
+    return s;
+
+  }
 }