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-3783 Updated groovy jars. Requires javaparser-core library to run too
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
d5840e6
..
0ebc58b
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-2624,7
+2624,7
@@
public class Desktop extends jalview.jbgui.GDesktop
openGroovyConsole();
} catch (Exception ex)
{
openGroovyConsole();
} catch (Exception ex)
{
- jalview.bin.Console.error("Groovy Shell Creation failed.", ex);
+ jalview.bin.Console.error("Groovy Console creation failed.", ex);
JvOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.getString("label.couldnt_create_groovy_shell"),
JvOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.getString("label.couldnt_create_groovy_shell"),
@@
-2640,7
+2640,7
@@
public class Desktop extends jalview.jbgui.GDesktop
{
if (groovyConsole == null)
{
{
if (groovyConsole == null)
{
- groovyConsole = new groovy.ui.Console();
+ groovyConsole = new groovy.console.ui.Console();
groovyConsole.setVariable("Jalview", this);
groovyConsole.run();
groovyConsole.setVariable("Jalview", this);
groovyConsole.run();
@@
-3123,7
+3123,7
@@
public class Desktop extends jalview.jbgui.GDesktop
*/
private Semaphore block = new Semaphore(0);
*/
private Semaphore block = new Semaphore(0);
- private static groovy.ui.Console groovyConsole;
+ private static groovy.console.ui.Console groovyConsole;
/**
* add another dialog thread to the queue
/**
* add another dialog thread to the queue
@@
-3385,7
+3385,7
@@
public class Desktop extends jalview.jbgui.GDesktop
myTopFrame.setDisplayedView(myTopFrame.alignPanel);
}
myTopFrame.setDisplayedView(myTopFrame.alignPanel);
}
- public static groovy.ui.Console getGroovyConsole()
+ public static groovy.console.ui.Console getGroovyConsole()
{
return groovyConsole;
}
{
return groovyConsole;
}
@@
-3771,7
+3771,7
@@
public class Desktop extends jalview.jbgui.GDesktop
boolean html, boolean modal, int timeout)
{
nonBlockingDialog(32, 2, title, message, boxtext, button, type,
boolean html, boolean modal, int timeout)
{
nonBlockingDialog(32, 2, title, message, boxtext, button, type,
- scrollable, false, modal, timeout);
+ scrollable, html, modal, timeout);
}
public void nonBlockingDialog(int width, int height, String title,
}
public void nonBlockingDialog(int width, int height, String title,