git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1244 improved status message for insert/delete gap
[jalview.git]
/
src
/
jalview
/
commands
/
EditCommand.java
diff --git
a/src/jalview/commands/EditCommand.java
b/src/jalview/commands/EditCommand.java
index
cac843f
..
81076e5
100644
(file)
--- a/
src/jalview/commands/EditCommand.java
+++ b/
src/jalview/commands/EditCommand.java
@@
-114,7
+114,7
@@
public class EditCommand implements CommandI
public abstract Action getUndoAction();
};
public abstract Action getUndoAction();
};
- private List<Edit> edits = new ArrayList<Edit>();
+ private List<Edit> edits = new ArrayList<>();
String description;
String description;
@@
-789,7
+789,7
@@
public class EditCommand implements CommandI
if (modifyVisibility && !insert)
{
// only occurs if a sequence was added or deleted.
if (modifyVisibility && !insert)
{
// only occurs if a sequence was added or deleted.
- command.deletedAnnotationRows = new Hashtable<SequenceI, AlignmentAnnotation[]>();
+ command.deletedAnnotationRows = new Hashtable<>();
}
if (command.fullAlignmentHeight)
{
}
if (command.fullAlignmentHeight)
{
@@
-948,7
+948,7
@@
public class EditCommand implements CommandI
if (!insert)
{
if (!insert)
{
- command.deletedAnnotations = new Hashtable<String, Annotation[]>();
+ command.deletedAnnotations = new Hashtable<>();
}
int aSize;
}
int aSize;
@@
-1138,7
+1138,7
@@
public class EditCommand implements CommandI
return;
}
return;
}
- List<SequenceFeature> oldsf = new ArrayList<SequenceFeature>();
+ List<SequenceFeature> oldsf = new ArrayList<>();
int cSize = j - i;
int cSize = j - i;
@@
-1196,7
+1196,7
@@
public class EditCommand implements CommandI
if (command.editedFeatures == null)
{
if (command.editedFeatures == null)
{
- command.editedFeatures = new Hashtable<SequenceI, List<SequenceFeature>>();
+ command.editedFeatures = new Hashtable<>();
}
command.editedFeatures.put(seq, oldsf);
}
command.editedFeatures.put(seq, oldsf);
@@
-1233,7
+1233,7
@@
public class EditCommand implements CommandI
*/
public Map<SequenceI, SequenceI> priorState(boolean forUndo)
{
*/
public Map<SequenceI, SequenceI> priorState(boolean forUndo)
{
- Map<SequenceI, SequenceI> result = new HashMap<SequenceI, SequenceI>();
+ Map<SequenceI, SequenceI> result = new HashMap<>();
if (getEdits() == null)
{
return result;
if (getEdits() == null)
{
return result;
@@
-1266,7
+1266,7
@@
public class EditCommand implements CommandI
* Work backwards through the edit list, deriving the sequences before each
* was applied. The final result is the sequence set before any edits.
*/
* Work backwards through the edit list, deriving the sequences before each
* was applied. The final result is the sequence set before any edits.
*/
- Iterator<Edit> editList = new ReverseListIterator<Edit>(getEdits());
+ Iterator<Edit> editList = new ReverseListIterator<>(getEdits());
while (editList.hasNext())
{
Edit oldEdit = editList.next();
while (editList.hasNext())
{
Edit oldEdit = editList.next();
@@
-1339,6
+1339,12
@@
public class EditCommand implements CommandI
char gapChar;
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)
{
public Edit(Action cmd, SequenceI[] sqs, int pos, int count,
char gap)
{
@@
-1410,6
+1416,16
@@
public class EditCommand implements CommandI
{
return gapChar;
}
{
return gapChar;
}
+
+ public void setSystemGenerated(boolean b)
+ {
+ systemGenerated = b;
+ }
+
+ public boolean isSystemGenerated()
+ {
+ return systemGenerated;
+ }
}
/**
}
/**
@@
-1427,7
+1443,7
@@
public class EditCommand implements CommandI
}
else
{
}
else
{
- return new ReverseListIterator<Edit>(getEdits());
+ return new ReverseListIterator<>(getEdits());
}
}
}
}
}
}