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 bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
AlignViewport.java
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
90f627e
..
ef9e575
100644
(file)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-340,7
+340,7
@@
public class AlignViewport extends AlignmentViewport
viewStyle.setFontName(font.getName());
viewStyle.setFontStyle(font.getStyle());
viewStyle.setFontSize(font.getSize());
viewStyle.setFontName(font.getName());
viewStyle.setFontStyle(font.getStyle());
viewStyle.setFontSize(font.getSize());
-
+
validCharWidth = true;
}
validCharWidth = true;
}
@@
-745,6
+745,11
@@
public class AlignViewport extends AlignmentViewport
*/
public void addFile(File file, FileFormatI format)
{
*/
public void addFile(File file, FileFormatI format)
{
+ addFile(file, format, true);
+ }
+
+ public void addFile(File file, FileFormatI format, boolean async)
+ {
DataSourceType protocol = AppletFormatAdapter.checkProtocol(file);
if (format == null)
DataSourceType protocol = AppletFormatAdapter.checkProtocol(file);
if (format == null)
@@
-769,7
+774,8
@@
public class AlignViewport extends AlignmentViewport
}
}
}
}
- new FileLoader().LoadFile(this, file, DataSourceType.FILE, format);
+ new FileLoader().LoadFile(this, file, DataSourceType.FILE, format,
+ async);
}
public void addFile(File file)
}
public void addFile(File file)
@@
-803,13
+809,10
@@
public class AlignViewport extends AlignmentViewport
JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
.setResponseHandler(0, () -> {
addDataToAlignment(al);
JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
.setResponseHandler(0, () -> {
addDataToAlignment(al);
- return null;
}).setResponseHandler(1, () -> {
us.openLinkedAlignmentAs(al, title, true);
}).setResponseHandler(1, () -> {
us.openLinkedAlignmentAs(al, title, true);
- return null;
}).setResponseHandler(2, () -> {
us.openLinkedAlignmentAs(al, title, false);
}).setResponseHandler(2, () -> {
us.openLinkedAlignmentAs(al, title, false);
- return null;
});
dialog.showDialog(question,
MessageManager.getString("label.open_split_window"),
});
dialog.showDialog(question,
MessageManager.getString("label.open_split_window"),
@@
-1155,4
+1158,5
@@
public class AlignViewport extends AlignmentViewport
{
this.viewName = viewName;
}
{
this.viewName = viewName;
}
+
}
}