licencing and format applied (eclipse)

[jalview.git] / src / jalview / datamodel / Annotation.java

diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java
index b332fb4..348c9a4 100755 (executable)
--- a/src/jalview/datamodel/Annotation.java
+++ b/src/jalview/datamodel/Annotation.java
@@ -22,7 +22,7 @@ import java.awt.*;
 
 /**
  * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
  */
@@ -47,11 +47,15 @@ public class Annotation
 
   /**
    * Creates a new Annotation object.
-   *
-   * @param displayChar DOCUMENT ME!
-   * @param desc DOCUMENT ME!
-   * @param ss DOCUMENT ME!
-   * @param val DOCUMENT ME!
+   * 
+   * @param displayChar
+   *                DOCUMENT ME!
+   * @param desc
+   *                DOCUMENT ME!
+   * @param ss
+   *                DOCUMENT ME!
+   * @param val
+   *                DOCUMENT ME!
    */
   public Annotation(String displayChar, String desc, char ss, float val)
   {
@@ -63,32 +67,41 @@ public class Annotation
 
   /**
    * Creates a new Annotation object.
-   *
-   * @param displayChar DOCUMENT ME!
-   * @param desc DOCUMENT ME!
-   * @param ss DOCUMENT ME!
-   * @param val DOCUMENT ME!
-   * @param colour DOCUMENT ME!
+   * 
+   * @param displayChar
+   *                DOCUMENT ME!
+   * @param desc
+   *                DOCUMENT ME!
+   * @param ss
+   *                DOCUMENT ME!
+   * @param val
+   *                DOCUMENT ME!
+   * @param colour
+   *                DOCUMENT ME!
    */
   public Annotation(String displayChar, String desc, char ss, float val,
-                    Color colour)
+          Color colour)
   {
     this(displayChar, desc, ss, val);
     this.colour = colour;
   }
+
   /**
-   * Copy constructor
-   * New annotation takes on the same (or duplicated) attributes as the given template
-   * @param that template annotation
+   * Copy constructor New annotation takes on the same (or duplicated)
+   * attributes as the given template
+   * 
+   * @param that
+   *                template annotation
    */
-  public Annotation(Annotation that) {
-    if (that==null || this==that)
+  public Annotation(Annotation that)
+  {
+    if (that == null || this == that)
     {
       return;
     }
-    if (that.displayCharacter!=null)
+    if (that.displayCharacter != null)
       displayCharacter = new String(that.displayCharacter);
-    if (that.description!=null)
+    if (that.description != null)
       description = new String(that.description);
     secondaryStructure = that.secondaryStructure;
     value = that.value;
@@ -97,7 +110,9 @@ public class Annotation
 
   /**
    * Value only annotation.
-   * @param val value at this annotation position
+   * 
+   * @param val
+   *                value at this annotation position
    */
   public Annotation(float val)
   {