Merge branch 'JAL-1013_pca_rna_dna' into develop

[jalview.git] / src / jalview / analysis / Dna.java

diff --git a/src/jalview/analysis/Dna.java b/src/jalview/analysis/Dna.java
index bf25bcf..9f3a8d0 100644 (file)
--- a/src/jalview/analysis/Dna.java
+++ b/src/jalview/analysis/Dna.java
@@ -1,6 +1,6 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)\r
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
  * \r
  * This file is part of Jalview.\r
  * \r
@@ -559,8 +559,8 @@ public class Dna
     }\r
     if (resSize > 0)\r
     {\r
-      SequenceI newseq = new Sequence(selection.getName(), protein\r
-              .toString());\r
+      SequenceI newseq = new Sequence(selection.getName(),\r
+              protein.toString());\r
       if (rf != 0)\r
       {\r
         jalview.bin.Cache.log\r
@@ -655,7 +655,7 @@ public class Dna
       }\r
     }\r
     // register the mapping somehow\r
-    // \r
+    //\r
     return null;\r
   }\r
 \r
@@ -700,8 +700,7 @@ public class Dna
         fgstate = (featureGroups == null) ? null : ((Boolean) featureGroups\r
                 .get(sf[f].featureGroup));\r
         if ((featureTypes == null || featureTypes.containsKey(sf[f]\r
-                .getType()))\r
-                && (fgstate == null || fgstate.booleanValue()))\r
+                .getType())) && (fgstate == null || fgstate.booleanValue()))\r
         {\r
           if (FeatureProperties.isCodingFeature(null, sf[f].getType()))\r
           {\r