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-3626 from JAL-3253-applet web page embedding
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
82d38e3
..
1b85dd5
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-155,7
+155,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();
@@
-204,6
+204,16
@@
public class Desktop extends jalview.jbgui.GDesktop
/** Singleton Desktop instance */
public static Desktop instance;
/** Singleton Desktop instance */
public static Desktop instance;
+ /**
+ * BH TEMPORARY ONLY -- should use ApplicationSingleton
+ *
+ * @return
+ */
+ public static Desktop getInstance()
+ {
+ return instance;
+ }
+
public static MyDesktopPane desktop;
public static MyDesktopPane getDesktop()
public static MyDesktopPane desktop;
public static MyDesktopPane getDesktop()
@@
-871,8
+881,8
@@
public class Desktop extends jalview.jbgui.GDesktop
frame.setMaximizable(resizable);
frame.setIconifiable(resizable);
frame.setOpaque(Platform.isJS());
frame.setMaximizable(resizable);
frame.setIconifiable(resizable);
frame.setOpaque(Platform.isJS());
-
- if (frame.getX() < 1 && frame.getY() < 1)
+ boolean isEmbedded = (Platform.getDimIfEmbedded(frame, -1, -1) != null);
+ if (!isEmbedded && frame.getX() < 1 && frame.getY() < 1)
{
frame.setLocation(xOffset * openFrameCount,
yOffset * ((openFrameCount - 1) % 10) + yOffset);
{
frame.setLocation(xOffset * openFrameCount,
yOffset * ((openFrameCount - 1) % 10) + yOffset);
@@
-1767,7
+1777,7
@@
public class Desktop extends jalview.jbgui.GDesktop
{
try
{
{
try
{
- new Jalview2XML().loadJalviewAlign(choice);
+ new Jalview2XML().loadJalviewAlign(selectedFile);
} catch (OutOfMemoryError oom)
{
new OOMWarning("Whilst loading project from " + choice, oom);
} catch (OutOfMemoryError oom)
{
new OOMWarning("Whilst loading project from " + choice, oom);
@@
-2489,7
+2499,7
@@
public class Desktop extends jalview.jbgui.GDesktop
@Override
public void setProgressBar(String message, long id)
{
@Override
public void setProgressBar(String message, long id)
{
- Platform.timeCheck("Desktop " + message, Platform.TIME_MARK);
+ // Platform.timeCheck("Desktop " + message, Platform.TIME_MARK);
if (progressBars == null)
{
if (progressBars == null)
{
@@
-3364,4
+3374,5
@@
public class Desktop extends jalview.jbgui.GDesktop
}
return result;
}
}
return result;
}
+
}
}