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-1713 don’t close an automatically created overview window for projects from Jalvi...
[jalview.git]
/
src
/
jalview
/
project
/
Jalview2XML.java
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
4d35021
..
8d2efe0
100644
(file)
--- a/
src/jalview/project/Jalview2XML.java
+++ b/
src/jalview/project/Jalview2XML.java
@@
-1510,7
+1510,7
@@
public class Jalview2XML
ov.getCanvas().getResidueColour().getRGB());
overview.setHiddenColour(ov.getCanvas().getHiddenColour().getRGB());
view.setOverview(overview);
ov.getCanvas().getResidueColour().getRGB());
overview.setHiddenColour(ov.getCanvas().getHiddenColour().getRGB());
view.setOverview(overview);
- }
+ }
if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme)
{
view.setBgColour(setUserColourScheme(av.getGlobalColourScheme(),
if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme)
{
view.setBgColour(setUserColourScheme(av.getGlobalColourScheme(),
@@
-4122,7
+4122,7
@@
public class Jalview2XML
loadPCAViewers(jalviewModel, ap);
loadPDBStructures(jprovider, jseqs, af, ap);
loadRnaViewers(jprovider, jseqs, ap);
loadPCAViewers(jalviewModel, ap);
loadPDBStructures(jprovider, jseqs, af, ap);
loadRnaViewers(jprovider, jseqs, ap);
- loadOverview(view, af);
+ loadOverview(view, jalviewModel.getVersion(), af);
}
// and finally return.
return af;
}
// and finally return.
return af;
@@
-4135,8
+4135,13
@@
public class Jalview2XML
* @param view
* @param af
*/
* @param view
* @param af
*/
- protected void loadOverview(Viewport view, AlignFrame af)
+ protected void loadOverview(Viewport view, String version, AlignFrame af)
{
{
+ if (!isVersionStringLaterThan("2.11.3",
+ version) && view.getOverview()==null)
+ {
+ return;
+ }
/*
* first close any Overview that was opened automatically
* (if so configured in Preferences) so that the view is
/*
* first close any Overview that was opened automatically
* (if so configured in Preferences) so that the view is
@@
-4676,7
+4681,7
@@
public class Jalview2XML
* - minimum version we are comparing against
* @param version
* - version of data being processsed
* - minimum version we are comparing against
* @param version
* - version of data being processsed
- * @return
+ * @return true if version is equal to or later than supported
*/
public static boolean isVersionStringLaterThan(String supported,
String version)
*/
public static boolean isVersionStringLaterThan(String supported,
String version)