Downgraded TestAnnotate3D compatibility from Java8 to Java7

diff --git a/test/jalview/ext/paradise/TestAnnotate3D.java b/test/jalview/ext/paradise/TestAnnotate3D.java
index 6635f0d..440d26e 100644 (file)
--- a/test/jalview/ext/paradise/TestAnnotate3D.java
+++ b/test/jalview/ext/paradise/TestAnnotate3D.java
@@ -1,19 +1,19 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
  * Copyright (C) 2014 The Jalview Authors
- * 
+ *
  * This file is part of Jalview.
- * 
+ *
  * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License 
+ * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3
  * of the License, or (at your option) any later version.
- *  
- * Jalview is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty 
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
@@ -21,10 +21,8 @@
 package jalview.ext.paradise;
 
 import static org.junit.Assert.assertTrue;
-
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
-import jalview.ext.paradise.Annotate3D;
 import jalview.io.FastaFile;
 import jalview.io.FormatAdapter;
 
@@ -72,15 +70,19 @@ public class TestAnnotate3D
         iline = id.readLine();
         fline = file.readLine();
         if (iline != null)
+        {
           System.out.println(iline);
+        }
         if (fline != null)
+        {
           System.out.println(fline);
+        }
         // next assert fails for latest RNAview - because the XMLID entries
         // change between file and ID based RNAML generation.
         assertTrue(
                 "Results differ for ID and file upload based retrieval (chain entry "
                         + (++i) + ")",
-                ((iline == fline && iline == null) || (iline != null
+                        ((iline == fline && iline == null) || (iline != null
                         && fline != null && iline.equals(fline))));
 
       } while (iline != null);
@@ -90,7 +92,7 @@ public class TestAnnotate3D
   /**
    * test to demonstrate JAL-1142 - compare sequences in RNAML returned from
    * Annotate3d vs those extracted by Jalview from the originl PDB file
-   * 
+   *
    * @throws Exception
    */
   @Test
@@ -149,9 +151,9 @@ public class TestAnnotate3D
             {
               Assert.fail("Couldn't find this sequence in original input:\n"
                       + new FastaFile().print(new SequenceI[]
-                      { sq })
-                      + "\n\nOriginal input:\n"
-                      + new FastaFile().print(pdbf.getSeqsAsArray()) + "\n");
+                              { sq })
+                              + "\n\nOriginal input:\n"
+                              + new FastaFile().print(pdbf.getSeqsAsArray()) + "\n");
             }
           }
         }