Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB

[jalview.git] / src / jalview / commands / EditCommand.java

diff --git a/src/jalview/commands/EditCommand.java b/src/jalview/commands/EditCommand.java
index 1a227c5..385a33e 100644 (file)
--- a/src/jalview/commands/EditCommand.java
+++ b/src/jalview/commands/EditCommand.java
@@ -618,8 +618,8 @@ public class EditCommand implements CommandI
          */
         if (command.alIndex[i] < command.al.getHeight())
         {
-          List<SequenceI> sequences;
-          synchronized (sequences = command.al.getSequences())
+          List<SequenceI> sequences = command.al.getSequences();
+          synchronized (sequences)
           {
             if (!(command.alIndex[i] < 0))
             {
@@ -1443,45 +1443,45 @@ public class EditCommand implements CommandI
 
   public class Edit
   {
-    private SequenceI[] oldds;
+    SequenceI[] oldds;
 
     /**
      * start and end of sequence prior to edit
      */
-    private Range[] oldStartEnd;
+    Range[] oldStartEnd;
 
-    private boolean fullAlignmentHeight = false;
+    boolean fullAlignmentHeight = false;
 
-    private Map<SequenceI, AlignmentAnnotation[]> deletedAnnotationRows;
+    Map<SequenceI, AlignmentAnnotation[]> deletedAnnotationRows;
 
-    private Map<String, Annotation[]> deletedAnnotations;
+    Map<String, Annotation[]> deletedAnnotations;
 
     /*
      * features deleted by the cut (re-add on Undo)
      * (including the original of any shortened features)
      */
-    private Map<SequenceI, List<SequenceFeature>> deletedFeatures;
+    Map<SequenceI, List<SequenceFeature>> deletedFeatures;
 
     /*
      * shortened features added by the cut (delete on Undo)
      */
-    private Map<SequenceI, List<SequenceFeature>> truncatedFeatures;
+    Map<SequenceI, List<SequenceFeature>> truncatedFeatures;
 
-    private AlignmentI al;
+    AlignmentI al;
 
-    final private Action command;
+    final Action command;
 
     char[][] string;
 
     SequenceI[] seqs;
 
-    private int[] alIndex;
+    int[] alIndex;
 
-    private int position;
+    int position;
 
-    private int number;
+    int number;
 
-    private char gapChar;
+    char gapChar;
 
     public Edit(Action cmd, SequenceI[] sqs, int pos, int count,
             char gap)