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-3437 Desktop File...Load Project fails in JalviewJS
[jalview.git]
/
src
/
jalview
/
gui
/
SplitFrame.java
diff --git
a/src/jalview/gui/SplitFrame.java
b/src/jalview/gui/SplitFrame.java
index
8d559ee
..
253b02c
100644
(file)
--- a/
src/jalview/gui/SplitFrame.java
+++ b/
src/jalview/gui/SplitFrame.java
@@
-21,7
+21,6
@@
package jalview.gui;
import jalview.api.SplitContainerI;
package jalview.gui;
import jalview.api.SplitContainerI;
-import jalview.bin.Instance;
import jalview.datamodel.AlignmentI;
import jalview.jbgui.GAlignFrame;
import jalview.jbgui.GSplitFrame;
import jalview.datamodel.AlignmentI;
import jalview.jbgui.GAlignFrame;
import jalview.jbgui.GSplitFrame;
@@
-133,7
+132,7
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
// allow about 65 pixels for Desktop decorators on Windows
int newHeight = Math.min(height,
// allow about 65 pixels for Desktop decorators on Windows
int newHeight = Math.min(height,
- Instance.getDesktop().getHeight() - DESKTOP_DECORATORS_HEIGHT);
+ Desktop.getInstance().getHeight() - DESKTOP_DECORATORS_HEIGHT);
if (newHeight != height)
{
int oldDividerLocation = getDividerLocation();
if (newHeight != height)
{
int oldDividerLocation = getDividerLocation();
@@
-150,8
+149,8
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
{
// TODO if CommandListener is only ever 1:1 for complementary views,
// may change broadcast pattern to direct messaging (more efficient)
{
// TODO if CommandListener is only ever 1:1 for complementary views,
// may change broadcast pattern to direct messaging (more efficient)
- final StructureSelectionManager ssm = StructureSelectionManager
- .getStructureSelectionManager(Instance.getDesktop());
+ final StructureSelectionManager ssm = Desktop
+ .getStructureSelectionManager();
ssm.addCommandListener(((AlignFrame) getTopFrame()).getViewport());
ssm.addCommandListener(((AlignFrame) getBottomFrame()).getViewport());
}
ssm.addCommandListener(((AlignFrame) getTopFrame()).getViewport());
ssm.addCommandListener(((AlignFrame) getBottomFrame()).getViewport());
}
@@
-283,7
+282,7
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
public void internalFrameClosed(InternalFrameEvent evt)
{
close();
public void internalFrameClosed(InternalFrameEvent evt)
{
close();
- };
+ }
});
}
});
}
@@
-556,8
+555,8
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
*/
adjustLayout();
*/
adjustLayout();
- final StructureSelectionManager ssm = StructureSelectionManager
- .getStructureSelectionManager(Instance.getDesktop());
+ final StructureSelectionManager ssm = Desktop
+ .getStructureSelectionManager();
ssm.addCommandListener(newTopPanel.av);
ssm.addCommandListener(newBottomPanel.av);
}
ssm.addCommandListener(newTopPanel.av);
ssm.addCommandListener(newBottomPanel.av);
}
@@
-684,7
+683,7
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
*/
protected void expandViews_actionPerformed()
{
*/
protected void expandViews_actionPerformed()
{
- Instance.getDesktop().explodeViews(this);
+ Desktop.getInstance().explodeViews(this);
}
/**
}
/**
@@
-693,7
+692,7
@@
public class SplitFrame extends GSplitFrame implements SplitContainerI
*/
protected void gatherViews_actionPerformed()
{
*/
protected void gatherViews_actionPerformed()
{
- Instance.getDesktop().gatherViews(this);
+ Desktop.getInstance().gatherViews(this);
}
/**
}
/**