Mercurial > octave

changeset 21778:895971cb50f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usejava: Return false if not running in a graphical environment (bug #48005) * usejava.m: Check java.awt.GraphicsEnvironment.isHeadless when testing for the "awt" and "swing" features.
author Atri Bhattacharya <badshah400@aim.com>
date Wed, 25 May 2016 16:59:05 -0700
parents d6826b38b29c
children 7db94853d12b
files scripts/java/usejava.m
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/java/usejava.m	Wed May 25 12:28:50 2016 -0700
+++ b/scripts/java/usejava.m	Wed May 25 16:59:05 2016 -0700
@@ -62,7 +62,7 @@
     case "awt"
       try
         dum = methods ("java.awt.Frame");
-        retval = true;
+        retval = ! javaMethod ("isHeadless", "java.awt.GraphicsEnvironment");
       end_try_catch
     case "desktop"
       ## Octave has no Java based GUI/desktop, leave retval = false
@@ -74,7 +74,7 @@
     case "swing"
       try
         dum = methods ("javax.swing.Popup");
-        retval = true;
+        retval = ! javaMethod ("isHeadless", "java.awt.GraphicsEnvironment");
       end_try_catch
     otherwise
       error ("usejava: unrecognized feature '%s'", feature);