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
Merge branch 'Jalview-JS/develop' into merge_js_develop
[jalview.git]
/
test
/
jalview
/
io
/
Jalview2xmlBase.java
diff --git
a/test/jalview/io/Jalview2xmlBase.java
b/test/jalview/io/Jalview2xmlBase.java
index
fbdd782
..
3a0560c
100644
(file)
--- a/
test/jalview/io/Jalview2xmlBase.java
+++ b/
test/jalview/io/Jalview2xmlBase.java
@@
-70,16
+70,16
@@
public class Jalview2xmlBase
@AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
@AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
- jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
+ jalview.gui.Desktop.getInstance().closeAll_actionPerformed(null);
}
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
}
@BeforeTest(alwaysRun = true)
public static void clearDesktop()
{
- if (Desktop.instance != null && Desktop.getFrames() != null
+ if (Desktop.getInstance() != null && Desktop.getFrames() != null
&& Desktop.getFrames().length > 0)
{
&& Desktop.getFrames().length > 0)
{
- Desktop.instance.closeAll_actionPerformed(null);
+ Desktop.getInstance().closeAll_actionPerformed(null);
}
}
}
}