import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
+import jalview.api.StructureSelectionManagerProvider;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.gui.ImageExporter.ImageWriterI;
import jalview.io.IdentifyFile;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
+import jalview.jbgui.GDesktop;
import jalview.jbgui.GSplitFrame;
import jalview.jbgui.GStructureViewer;
import jalview.project.Jalview2XML;
import jalview.util.Platform;
import jalview.util.UrlConstants;
import jalview.viewmodel.AlignmentViewport;
+import jalview.ws.jws1.Discoverer;
import jalview.ws.params.ParamManager;
import jalview.ws.utils.UrlDownloadClient;
* @version $Revision: 1.155 $
*/
@SuppressWarnings("serial")
-public class Desktop extends jalview.jbgui.GDesktop
+public class Desktop extends GDesktop
implements DropTargetListener, ClipboardOwner, IProgressIndicator,
- jalview.api.StructureSelectionManagerProvider
+ StructureSelectionManagerProvider, ApplicationSingletonI
{
+
private final static int DEFAULT_MIN_WIDTH = 300;
private final static int DEFAULT_MIN_HEIGHT = 250;
listener);
}
- /**
- * Singleton Desktop instance only in Java;
- */
- private static Desktop instance;
-
- public static Desktop getInstance()
- {
- if (instance == null)
- {
- new Desktop(true);
- }
- Desktop d;
- @SuppressWarnings("unused")
- ThreadGroup g = Thread.currentThread().getThreadGroup();
- /**
- * @j2sNative d = g._jalviewDesktopInstance;
- */
- {
- d = instance;
- }
- return d;
- }
-
- private static void setInstance(Desktop d)
- {
- @SuppressWarnings("unused")
- ThreadGroup g = Thread.currentThread().getThreadGroup();
- /**
- * @j2sNative g._jalviewDesktopInstance = d;
- */
- {
- instance = d;
- }
- }
-
- private MyDesktopPane desktopPane;
-
public static MyDesktopPane getDesktopPane()
{
- return getInstance().desktopPane;
+ return Desktop.getInstance().desktopPane;
}
- private void setDesktopPane(MyDesktopPane pane)
+ public StructureSelectionManager getStructureSelectionManager()
{
- getInstance().desktopPane = pane;
+ return StructureSelectionManager
+ .getStructureSelectionManager(this);
}
static int openFrameCount = 0;
static final int yOffset = 30;
- public jalview.ws.jws1.Discoverer discoverer;
+ public Discoverer discoverer;
public Object[] jalviewClipboard;
public JInternalFrame conservationSlider, PIDSlider;
+ /**
+ * just an instance (for testng, probably); no actual frames
+ */
private boolean instanceOnly;
class MyDesktopManager implements DesktopManager
} catch (NullPointerException npe)
{
Point p = getMousePosition();
- getInstance().showPasteMenu(p.x, p.y);
+ showPasteMenu(p.x, p.y);
}
}
public void endDraggingFrame(JComponent f)
{
delegate.endDraggingFrame(f);
- getDesktopPane().repaint();
+ desktopPane.repaint();
}
@Override
public void endResizingFrame(JComponent f)
{
delegate.endResizingFrame(f);
- getDesktopPane().repaint();
+ desktopPane.repaint();
}
@Override
}
+ public MyDesktopPane desktopPane;
+
+ /**
+ * Answers an 'application scope' singleton instance of this class. Separate
+ * SwingJS 'applets' running in the same browser page will each have a
+ * distinct instance of Desktop.
+ *
+ * @return
+ */
+ public static Desktop getInstance()
+ {
+ return (Desktop) ApplicationSingletonProvider
+ .getInstance(Desktop.class);
+ }
+
+ /**
+ * For testing.
+ *
+ * @param forInstance
+ */
public Desktop(boolean forInstance)
{
instanceOnly = true;
- setInstance(this);
}
+
/**
- * Creates a new Desktop object.
+ * Private constructor enforces singleton pattern. It is called by reflection
+ * from ApplicationSingletonProvider.getInstance().
*/
- public Desktop()
+ @SuppressWarnings("unused")
+ private Desktop()
{
/**
* A note to implementors. It is ESSENTIAL that any activities that might
* block are spawned off as threads rather than waited for during this
* constructor.
*/
- setInstance(this);
if (!Platform.isJS())
{
doVamsasClientCheck();
}
-
+
doConfigureStructurePrefs();
setTitle("Jalview " + jalview.bin.Cache.getProperty("VERSION"));
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
false);
boolean showjconsole = jalview.bin.Cache.getDefault("SHOW_JAVA_CONSOLE",
false);
- setDesktopPane(new MyDesktopPane(selmemusage));
-
+ desktopPane = new MyDesktopPane(selmemusage);
+
showMemusage.setSelected(selmemusage);
- getDesktopPane().setBackground(Color.white);
+ desktopPane.setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
// alternate config - have scrollbars - see notes in JAL-153
// JScrollPane sp = new JScrollPane();
// sp.getViewport().setView(desktop);
// getContentPane().add(sp, BorderLayout.CENTER);
-
+
// BH 2018 - just an experiment to try unclipped JInternalFrames.
if (Platform.isJS())
{
getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
}
-
- getContentPane().add(getDesktopPane(), BorderLayout.CENTER);
- getDesktopPane().setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
-
+
+ getContentPane().add(desktopPane, BorderLayout.CENTER);
+ desktopPane.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+
// This line prevents Windows Look&Feel resizing all new windows to maximum
// if previous window was maximised
- getDesktopPane().setDesktopManager(new MyDesktopManager(
+ desktopPane.setDesktopManager(new MyDesktopManager(
(Platform.isWindowsAndNotJS() ? new DefaultDesktopManager()
: Platform.isAMacAndNotJS()
? new AquaInternalFrameManager(
- getDesktopPane().getDesktopManager())
- : getDesktopPane().getDesktopManager())));
-
+ desktopPane.getDesktopManager())
+ : desktopPane.getDesktopManager())));
+
Rectangle dims = getLastKnownDimensions("");
if (dims != null)
{
int yPos = Math.max(5, (screenSize.height - 650) / 2);
setBounds(xPos, yPos, 900, 650);
}
-
+
if (!Platform.isJS())
/**
* Java only
* @j2sIgnore
*/
{
-
+
jconsole = new Console(this, showjconsole);
// add essential build information
jconsole.setHeader("Jalview Version: "
+ System.getProperty("os.arch") + " "
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version"));
-
+
showConsole(showjconsole);
-
+
showNews.setVisible(false);
-
+
experimentalFeatures.setSelected(showExperimental());
-
+
getIdentifiersOrgData();
-
+
checkURLLinks();
-
+
// Spawn a thread that shows the splashscreen
-
+
SwingUtilities.invokeLater(new Runnable()
{
@Override
new SplashScreen();
}
});
-
+
// Thread off a new instance of the file chooser - this reduces the time
// it
// takes to open it later on.
changeSupport.addJalviewPropertyChangeListener("services",
new PropertyChangeListener()
{
-
+
@Override
public void propertyChange(PropertyChangeEvent evt)
{
+ evt.getNewValue());
JalviewServicesChanged(evt);
}
-
+
});
-
+
}
-
- this.setDropTarget(new java.awt.dnd.DropTarget(getDesktopPane(), this));
-
+
+ this.setDropTarget(new java.awt.dnd.DropTarget(desktopPane, this));
+
this.addWindowListener(new WindowAdapter()
{
@Override
quit();
}
});
-
+
MouseAdapter ma;
this.addMouseListener(ma = new MouseAdapter()
{
showPasteMenu(evt.getX(), evt.getY());
}
}
-
+
@Override
public void mouseReleased(MouseEvent evt)
{
}
}
});
- getDesktopPane().addMouseListener(ma);
-
+ desktopPane.addMouseListener(ma);
}
/**
public void doConfigureStructurePrefs()
{
// configure services
- StructureSelectionManager ssm = StructureSelectionManager
- .getStructureSelectionManager(this);
+ StructureSelectionManager ssm = getStructureSelectionManager();
if (jalview.bin.Cache.getDefault(Preferences.ADD_SS_ANN, true))
{
ssm.setAddTempFacAnnot(jalview.bin.Cache
}
}
}).start();
- ;
+
}
@Override
public void run()
{
long now = System.currentTimeMillis();
- Desktop.getInstance().setProgressBar(
+ setProgressBar(
MessageManager.getString("status.refreshing_news"), now);
jvnews.refreshNews();
- Desktop.getInstance().setProgressBar(null, now);
+ setProgressBar(null, now);
jvnews.showNews();
}
}).start();
// A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
// IF JALVIEW IS RUNNING HEADLESS
// ///////////////////////////////////////////////
- if (getInstance().instanceOnly || Jalview.isHeadlessMode())
+ if (Desktop.getInstance().instanceOnly || Jalview.isHeadlessMode())
{
return;
}
{
menuItem.removeActionListener(menuItem.getActionListeners()[0]);
}
- getInstance().windowMenu.remove(menuItem);
- };
+ Desktop.getInstance().windowMenu.remove(menuItem);
+ }
});
menuItem.addActionListener(new ActionListener()
getDesktopPane().add(frame);
- getInstance().windowMenu.add(menuItem);
+ Desktop.getInstance().windowMenu.add(menuItem);
frame.toFront();
try
@Override
public void closeAll_actionPerformed(ActionEvent e)
{
- if (getDesktopPane() == null)
+ if (desktopPane == null)
{
return;
}
// TODO show a progress bar while closing?
- JInternalFrame[] frames = getDesktopPane().getAllFrames();
+ JInternalFrame[] frames = desktopPane.getAllFrames();
for (int i = 0; i < frames.length; i++)
{
try
* reset state of singleton objects as appropriate (clear down session state
* when all windows are closed)
*/
- StructureSelectionManager ssm = StructureSelectionManager
- .getStructureSelectionManager(this);
- if (ssm != null)
- {
- ssm.resetAll();
- }
+ getStructureSelectionManager().resetAll();
}
@Override
{
progressPanel = new JPanel(new GridLayout(1, 1));
totalProgressCount = 0;
- getInstance().getContentPane().add(progressPanel, BorderLayout.SOUTH);
+ getContentPane().add(progressPanel, BorderLayout.SOUTH);
}
JPanel thisprogress = new JPanel(new BorderLayout(10, 5));
JProgressBar progressBar = new JProgressBar();
((GridLayout) progressPanel.getLayout()).setRows(
((GridLayout) progressPanel.getLayout()).getRows() + 1);
++totalProgressCount;
- getInstance().validate();
+ validate();
return thisprogress;
}
{
source.viewport.setGatherViewsHere(true);
source.viewport.setExplodedGeometry(source.getBounds());
- JInternalFrame[] frames = getDesktopPane().getAllFrames();
+ JInternalFrame[] frames = getAllFrames();
String viewId = source.viewport.getSequenceSetId();
for (int t = 0; t < frames.length; t++)
});
rthr.start();
}
- };
+ }
});
VamsasStMenu.add(sessit);
}
public JInternalFrame[] getAllFrames()
{
- return getDesktopPane().getAllFrames();
+ return desktopPane.getAllFrames();
}
/**
});
msgPanel.add(jcb);
- JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), msgPanel,
+ JvOptionPane.showMessageDialog(desktopPane, msgPanel,
MessageManager
.getString("label.SEQUENCE_ID_no_longer_used"),
JvOptionPane.WARNING_MESSAGE);
} catch (Exception ex)
{
jalview.bin.Cache.log.error("Groovy Shell Creation failed.", ex);
- JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
+ JvOptionPane.showInternalMessageDialog(desktopPane,
MessageManager.getString("label.couldnt_create_groovy_shell"),
MessageManager.getString("label.groovy_support_failed"),
// todo: changesupport handlers need to be transferred
if (discoverer == null)
{
- discoverer = new jalview.ws.jws1.Discoverer();
+ discoverer = Discoverer.getInstance();
// register PCS handler for getDesktop().
discoverer.addPropertyChangeListener(changeSupport);
}
if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
{
- t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer()
+ t2 = jalview.ws.jws2.Jws2Discoverer.getInstance()
.startDiscoverer(changeSupport);
}
Thread t3 = null;
{
if (evt.getNewValue() == null || evt.getNewValue() instanceof Vector)
{
- final String ermsg = jalview.ws.jws2.Jws2Discoverer.getDiscoverer()
+ final String ermsg = jalview.ws.jws2.Jws2Discoverer.getInstance()
.getErrorMessages();
if (ermsg != null)
{
public static ParamManager getUserParameterStore()
{
- Desktop d = getInstance();
+ Desktop d = Desktop.getInstance();
if (d.wsparamManager == null)
{
d.wsparamManager = new WsParamSetManager();
} catch (InterruptedException x)
{
}
- ;
}
if (instanceOnly)
{
String topViewId = myTopFrame.viewport.getSequenceSetId();
String bottomViewId = myBottomFrame.viewport.getSequenceSetId();
- JInternalFrame[] frames = getDesktopPane().getAllFrames();
+ JInternalFrame[] frames = desktopPane.getAllFrames();
for (JInternalFrame frame : frames)
{
if (frame instanceof SplitFrame && frame != source)
public static groovy.ui.Console getGroovyConsole()
{
- return getInstance().groovyConsole;
+ return Desktop.getInstance().groovyConsole;
}
/**
System.err.println(
"Please ignore plist error - occurs due to problem with java 8 on OSX");
}
- ;
}
} catch (Throwable ex)
{
Class<? extends StructureViewerBase> structureViewerClass)
{
List<StructureViewerBase> result = new ArrayList<>();
- JInternalFrame[] frames = Desktop.getInstance().getAllFrames();
+ JInternalFrame[] frames = getAllFrames();
for (JInternalFrame frame : frames)
{