From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 1 Mar 2019 12:26:45 +0000 (+0000)
Subject: Merge branch 'feature/JAL-1244stretchStatusMsg' into merge/JAL-1244
X-Git-Tag: Release_2_11_0~17^2~84
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c793942b6430bba9d9b6795e4afd8a1907c022d7;p=jalview.git

Merge branch 'feature/JAL-1244stretchStatusMsg' into merge/JAL-1244

Conflicts:
	src/jalview/commands/EditCommand.java
---

c793942b6430bba9d9b6795e4afd8a1907c022d7
diff --cc src/jalview/commands/EditCommand.java
index f80bd4a,81076e5..b9d32f7
--- a/src/jalview/commands/EditCommand.java
+++ b/src/jalview/commands/EditCommand.java
@@@ -1476,14 -1333,18 +1476,20 @@@ public class EditCommand implements Com
  
      SequenceI[] seqs;
  
 -    int[] alIndex;
 +    private int[] alIndex;
  
 -    int position, number;
 +    private int position;
  
 -    char gapChar;
 +    private int number;
 +
 +    private char gapChar;
  
+     /*
+      * flag that identifies edits inserted to balance 
+      * user edits in a 'locked editing' region
+      */
+     private boolean systemGenerated;
+ 
      public Edit(Action cmd, SequenceI[] sqs, int pos, int count,
              char gap)
      {