JAL-1551 JAL-1819 formatting/imports

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index 72f94ec..8f24f11 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -20,6 +20,13 @@
  */
 package jalview.appletgui;
 
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.UrlLink;
+import jalview.viewmodel.AlignmentViewport;
+
 import java.awt.BorderLayout;
 import java.awt.Panel;
 import java.awt.event.InputEvent;
@@ -29,13 +36,6 @@ import java.awt.event.MouseMotionListener;
 import java.util.List;
 import java.util.Vector;
 
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceGroup;
-import jalview.datamodel.SequenceI;
-import jalview.util.UrlLink;
-import jalview.viewmodel.AlignmentViewport;
-
 public class IdPanel extends Panel implements MouseListener,
         MouseMotionListener
 {

diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java
index 0230e7a..71ebbb3 100755 (executable)
--- a/src/jalview/datamodel/Annotation.java
+++ b/src/jalview/datamodel/Annotation.java
@@ -107,9 +107,13 @@ public class Annotation
       return;
     }
     if (that.displayCharacter != null)
+    {
       displayCharacter = new String(that.displayCharacter);
+    }
     if (that.description != null)
+    {
       description = new String(that.description);
+    }
     secondaryStructure = that.secondaryStructure;
     value = that.value;
     colour = that.colour;

diff --git a/src/jalview/io/vamsas/Sequencefeature.java b/src/jalview/io/vamsas/Sequencefeature.java
index d1af2cf..ffc9998 100644 (file)
--- a/src/jalview/io/vamsas/Sequencefeature.java
+++ b/src/jalview/io/vamsas/Sequencefeature.java
@@ -20,6 +20,12 @@
  */
 package jalview.io.vamsas;
 
+import jalview.bin.Cache;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.io.VamsasAppDatastore;
+import jalview.util.UrlLink;
+
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -31,11 +37,6 @@ import uk.ac.vamsas.objects.core.RangeAnnotation;
 import uk.ac.vamsas.objects.core.Score;
 import uk.ac.vamsas.objects.core.Seg;
 import uk.ac.vamsas.objects.utils.Properties;
-import jalview.bin.Cache;
-import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceI;
-import jalview.io.VamsasAppDatastore;
-import jalview.util.UrlLink;
 
 /**
  * @author JimP
@@ -207,7 +208,7 @@ public class Sequencefeature extends Rangetype
     {
       for (int i = 0, iSize = feature.links.size(); i < iSize; i++)
       {
-        String link = (String) feature.links.elementAt(i);
+        String link = feature.links.elementAt(i);
         UrlLink ulink = new UrlLink(link);
         if (ulink.isValid())
         {