import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
+import jalview.bin.Instance;
import jalview.bin.Jalview;
import jalview.gui.ImageExporter.ImageWriterI;
import jalview.io.BackupFiles;
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;
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;
- }
-
- private void setDesktopPane(MyDesktopPane pane)
- {
- getInstance().desktopPane = pane;
+ return Instance.getDesktop().desktopPane;
}
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;
+
public Desktop(boolean forInstance)
{
instanceOnly = true;
- setInstance(this);
}
/**
* Creates a new Desktop object.
* block are spawned off as threads rather than waited for during this
* constructor.
*/
- setInstance(this);
+ Instance.setDesktop(this);
if (!Platform.isJS())
{
doVamsasClientCheck();
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();
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)
}
- this.setDropTarget(new java.awt.dnd.DropTarget(getDesktopPane(), this));
+ this.setDropTarget(new java.awt.dnd.DropTarget(desktopPane, this));
this.addWindowListener(new WindowAdapter()
{
}
}
});
- getDesktopPane().addMouseListener(ma);
+ desktopPane.addMouseListener(ma);
}
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 (Instance.getDesktop().instanceOnly || Jalview.isHeadlessMode())
{
return;
}
{
menuItem.removeActionListener(menuItem.getActionListeners()[0]);
}
- getInstance().windowMenu.remove(menuItem);
+ Instance.getDesktop().windowMenu.remove(menuItem);
};
});
getDesktopPane().add(frame);
- getInstance().windowMenu.add(menuItem);
+ Instance.getDesktop().windowMenu.add(menuItem);
frame.toFront();
try
{
if (!internalCopy)
{
- Desktop.getInstance().jalviewClipboard = null;
+ Instance.getDesktop().jalviewClipboard = null;
}
internalCopy = false;
@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
{
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++)
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);
}
*/
public static void showUrl(final String url)
{
- showUrl(url, Desktop.getInstance());
+ showUrl(url, Instance.getDesktop());
}
/**
public static ParamManager getUserParameterStore()
{
- Desktop d = getInstance();
+ Desktop d = Instance.getDesktop();
if (d.wsparamManager == null)
{
d.wsparamManager = new WsParamSetManager();
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 Instance.getDesktop().groovyConsole;
}
/**
Class<? extends StructureViewerBase> structureViewerClass)
{
List<StructureViewerBase> result = new ArrayList<>();
- JInternalFrame[] frames = Desktop.getInstance().getAllFrames();
+ JInternalFrame[] frames = getAllFrames();
for (JInternalFrame frame : frames)
{
git://source.jalview.org / jalview.git / blobdiff