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-3638 don’t move cursor to next gap after moving selection up and down with shift...
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
ed9ed50
..
7564dda
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-143,7
+143,7
@@
public class Desktop extends jalview.jbgui.GDesktop
protected static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT";
protected static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT";
- public static HashMap<String, FileWriter> savingFiles = new HashMap<>();
+ public static HashMap<String, FileWriter> savingFiles = new HashMap<String, FileWriter>();
private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
@@
-1924,7
+1924,10
@@
public class Desktop extends jalview.jbgui.GDesktop
}
// FIXME: ideally should use UI interface API
}
// FIXME: ideally should use UI interface API
- FeatureSettings viewFeatureSettings = af.featureSettings;
+ FeatureSettings viewFeatureSettings = (af.featureSettings != null
+ && af.featureSettings.isOpen())
+ ? af.featureSettings
+ : null;
Rectangle fsBounds = af.getFeatureSettingsGeometry();
for (int i = 0; i < size; i++)
{
Rectangle fsBounds = af.getFeatureSettingsGeometry();
for (int i = 0; i < size; i++)
{
@@
-1935,9
+1938,10
@@
public class Desktop extends jalview.jbgui.GDesktop
// transfer reference for existing feature settings to new alignFrame
if (ap == af.alignPanel)
{
// transfer reference for existing feature settings to new alignFrame
if (ap == af.alignPanel)
{
- newaf.featureSettings = (viewFeatureSettings.fr.ap == ap)
- ? viewFeatureSettings
- : null;
+ if (viewFeatureSettings != null && viewFeatureSettings.fr.ap == ap)
+ {
+ newaf.featureSettings = viewFeatureSettings;
+ }
newaf.setFeatureSettingsGeometry(fsBounds);
}
newaf.setFeatureSettingsGeometry(fsBounds);
}
@@
-1966,6
+1970,7
@@
public class Desktop extends jalview.jbgui.GDesktop
}
}
}
}
+ af.featureSettings = null;
af.alignPanels.clear();
af.closeMenuItem_actionPerformed(true);
af.alignPanels.clear();
af.closeMenuItem_actionPerformed(true);