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
Merge branch 'develop' into releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
75cb45b
..
08af2ec
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-664,8
+664,7
@@
public abstract class AlignmentViewport
* retain any colour thresholds per group while
* changing choice of colour scheme (JAL-2386)
*/
* retain any colour thresholds per group while
* changing choice of colour scheme (JAL-2386)
*/
- sg.setColourScheme(
- cs == null ? null : cs.getInstance(this, sg));
+ sg.setColourScheme(cs == null ? null : cs.getInstance(this, sg));
if (cs != null)
{
sg.getGroupColourScheme().alignmentChanged(sg,
if (cs != null)
{
sg.getGroupColourScheme().alignmentChanged(sg,
@@
-1821,9
+1820,8
@@
public abstract class AlignmentViewport
AlignmentAnnotation clone = new AlignmentAnnotation(annot);
if (selectedOnly && selectionGroup != null)
{
AlignmentAnnotation clone = new AlignmentAnnotation(annot);
if (selectedOnly && selectionGroup != null)
{
- clone.makeVisibleAnnotation(
- selectionGroup.getStartRes(), selectionGroup.getEndRes(),
- alignment.getHiddenColumns());
+ clone.makeVisibleAnnotation(selectionGroup.getStartRes(),
+ selectionGroup.getEndRes(), alignment.getHiddenColumns());
}
else
{
}
else
{
@@
-2987,7
+2985,8
@@
public abstract class AlignmentViewport
}
@Override
}
@Override
- public AlignmentExportData getAlignExportData(AlignExportSettingsI options)
+ public AlignmentExportData getAlignExportData(
+ AlignExportSettingsI options)
{
AlignmentI alignmentToExport = null;
String[] omitHidden = null;
{
AlignmentI alignmentToExport = null;
String[] omitHidden = null;
@@
-3015,7
+3014,7
@@
public abstract class AlignmentViewport
omitHidden, alignmentStartEnd);
return ed;
}
omitHidden, alignmentStartEnd);
return ed;
}
-
+
/**
* flag set to indicate if structure views might be out of sync with sequences
* in the alignment
/**
* flag set to indicate if structure views might be out of sync with sequences
* in the alignment