Mercurial > forge

changeset 10388:ce4e1bc6a020 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved & simplified Java-based interface checking and made it less verbose
author prnienhuis
date Wed, 06 Jun 2012 21:22:02 +0000
parents d775e9b9ff5e
children 71568c56ac1b
files main/io/inst/odsopen.m
diffstat 1 files changed, 340 insertions(+), 338 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/odsopen.m	Wed Jun 06 21:08:51 2012 +0000
+++ b/main/io/inst/odsopen.m	Wed Jun 06 21:22:02 2012 +0000
@@ -74,257 +74,263 @@
 ## 2010-03-14 Updated help text (section on readwrite)
 ## 2010-06-01 Added check for jOpenDocument version + suitable warning
 ## 2010-06-02 Added ";" to supress debug stuff around lines 115
-##      "     Moved JOD version check to subfunc getodsinterfaces
-##      "     Fiddled ods.changed flag when creating a spreadsheet to avoid unnamed 1st sheets
+##     ''      Moved JOD version check to subfunc getodsinterfaces
+##     ''      Fiddled ods.changed flag when creating a spreadsheet to avoid unnamed 1st sheets
 ## 2010-08-23 Added version field "odfvsn" to ods file ptr, set in getodsinterfaces() (odfdom)
-##      "     Moved JOD version check to this func from subfunc getodsinterfaces()
-##      "     Full support for odfdom 0.8.6 (in subfunc)
+##     ''     Moved JOD version check to this func from subfunc getodsinterfaces()
+##     ''     Full support for odfdom 0.8.6 (in subfunc)
 ## 2010-08-27 Improved help text
 ## 2010-10-27 Improved tracking of file changes tru ods.changed
 ## 2010-11-12 Small changes to help text
-##     "      Added try-catch to file open sections to create fallback to other intf
+##     ''     Added try-catch to file open sections to create fallback to other intf
 ## 2011-05-06 Experimental UNO support
 ## 2011-05-18 Creating new spreadsheet docs in UNO now works
 ## 2011-06-06 Tamed down interface verbosity on first startup
-##      "     Multiple requested interfaces now possible 
+##     ''     Multiple requested interfaces now possible 
 ## 2011-09-03 Reset chkintf if no ods support was found to allow full interface rediscovery
 ##            (otherwise javaclasspath additions will never be picked up)
 ## 2012-01-26 Fixed "seealso" help string
 ## 2012-02-26 Added ";" to suppress echo of filename f UNO
+## 2012-06-06 Made interface checking routine less verbose when same requested interface
+##            was used consecutively
 ##
-## Latest change on subfunctions below: 2012-03-22
+## Latest change on subfunctions below: 2012-06-06
 
 function [ ods ] = odsopen (filename, rw=0, reqinterface=[])
 
-	persistent odsinterfaces; persistent chkintf;
-	if (isempty (chkintf))
-		odsinterfaces = struct ( "OTK", [], "JOD", [], "UNO", [] );
-		chkintf = 1;
-	endif
-	
-	if (nargout < 1) usage ("ODS = odsopen (ODSfile, [Rw]). But no return argument specified!"); endif
+  persistent odsinterfaces; persistent chkintf; persistent lastintf;
+  if (isempty (chkintf))
+    odsinterfaces = struct ( "OTK", [], "JOD", [], "UNO", [] );
+    chkintf = 1;
+  endif
+  if (isempty (lastintf)); lastintf = '---'; endif 
+  
+  if (nargout < 1) usage ("ODS = odsopen (ODSfile, [Rw]). But no return argument specified!"); endif
 
-	if (~isempty (reqinterface))
-		if ~(ischar (reqinterface) || iscell (reqinterface)), usage ("Arg # 3 not recognized"); endif
-		# Turn arg3 into cell array if needed
-		if (~iscell (reqinterface)), reqinterface = {reqinterface}; endif
-		odsinterfaces.OTK = 0; odsinterfaces.JOD = 0; odsinterfaces.UNO = 0;
-		for ii=1:numel (reqinterface)
-			reqintf = toupper (reqinterface {ii});
-			# Try to invoke requested interface(s) for this call. Check if it
-			# is supported anyway by emptying the corresponding var.
-			if     (strcmp (reqintf, 'OTK'))
-				odsinterfaces.OTK = [];
-			elseif (strcmp (reqintf, 'JOD'))
-				odsinterfaces.JOD = [];
-			elseif (strcmp (reqintf, 'UNO'))
-				odsinterfaces.UNO = [];
-			else 
-				usage (sprintf ("Unknown .ods interface \"%s\" requested. Only OTK, JOD or UNO supported\n", reqinterface{}));
-			endif
-		endfor
-		printf ("Checking requested interface(s):\n");
-		odsinterfaces = getodsinterfaces (odsinterfaces);
-		# Well, is/are the requested interface(s) supported on the system?
-		# FIXME check for multiple interfaces
-		odsintf_cnt = 0;
-		for ii=1:numel (reqinterface)
-			if (~odsinterfaces.(toupper (reqinterface{ii})))
-				# No it aint
-				printf ("%s is not supported.\n", toupper (reqinterface{ii}));
-			else
-				++odsintf_cnt;
-			endif
-		endfor
-		# Reset interface check indicator if no requested support found
-		if (~odsintf_cnt)
-			chkintf = [];
-			ods = [];
-			return
-		endif
-	endif
-	
-	# Var rw is really used to avoid creating files when wanting to read, or
-	# not finding not-yet-existing files when wanting to write.
+  if (~isempty (reqinterface))
+    if ~(ischar (reqinterface) || iscell (reqinterface)), usage ("Arg # 3 not recognized"); endif
+    # Turn arg3 into cell array if needed
+    if (~iscell (reqinterface)), reqinterface = {reqinterface}; endif
+    ## Check if previously used interface matches a requested interface
+    if (isempty (regexpi (reqinterface, lastintf, 'once'){1}))
+      ## New interface requested
+      odsinterfaces.OTK = 0; odsinterfaces.JOD = 0; odsinterfaces.UNO = 0;
+      for ii=1:numel (reqinterface)
+        reqintf = toupper (reqinterface {ii});
+        # Try to invoke requested interface(s) for this call. Check if it
+        # is supported anyway by emptying the corresponding var.
+        if     (strcmp (reqintf, 'OTK'))
+          odsinterfaces.OTK = [];
+        elseif (strcmp (reqintf, 'JOD'))
+          odsinterfaces.JOD = [];
+        elseif (strcmp (reqintf, 'UNO'))
+          odsinterfaces.UNO = [];
+        else 
+          usage (sprintf ("Unknown .ods interface \"%s\" requested. Only OTK, JOD or UNO supported\n", reqinterface{}));
+        endif
+      endfor
+      printf ("Checking requested interface(s):\n");
+      odsinterfaces = getodsinterfaces (odsinterfaces);
+      # Well, is/are the requested interface(s) supported on the system?
+      # FIXME check for multiple interfaces
+      odsintf_cnt = 0;
+      for ii=1:numel (reqinterface)
+        if (~odsinterfaces.(toupper (reqinterface{ii})))
+          # No it aint
+          printf ("%s is not supported.\n", toupper (reqinterface{ii}));
+        else
+          ++odsintf_cnt;
+        endif
+      endfor
+      # Reset interface check indicator if no requested support found
+      if (~odsintf_cnt)
+        chkintf = [];
+        ods = [];
+        return
+      endif
+    endif
+  endif
+  
+  # Var rw is really used to avoid creating files when wanting to read, or
+  # not finding not-yet-existing files when wanting to write.
 
-	if (rw), rw = 1; endif		# Be sure it's either 0 or 1 initially
+  if (rw), rw = 1; endif    # Be sure it's either 0 or 1 initially
 
-	# Check if ODS file exists. Set open mode based on rw argument
-	if (rw), fmode = 'r+b'; else fmode = 'rb'; endif
-	fid = fopen (filename, fmode);
-	if (fid < 0)
-		if (~rw)			# Read mode requested but file doesn't exist
-			err_str = sprintf ("File %s not found\n", filename);
-			error (err_str)
-		else				# For writing we need more info:
-			fid = fopen (filename, 'rb');  # Check if it can be opened for reading
-			if (fid < 0)	# Not found => create it
-				printf ("Creating file %s\n", filename);
-				rw = 3;
-			else			# Found but not writable = error
-				fclose (fid);	# Do not forget to close the handle neatly
-				error (sprintf ("Write mode requested but file %s is not writable\n", filename))
-			endif
-		endif
-	else
-		# close file anyway to avoid Java errors
-		fclose (fid);
-	endif
+  # Check if ODS file exists. Set open mode based on rw argument
+  if (rw), fmode = 'r+b'; else fmode = 'rb'; endif
+  fid = fopen (filename, fmode);
+  if (fid < 0)
+    if (~rw)      # Read mode requested but file doesn't exist
+      err_str = sprintf ("File %s not found\n", filename);
+      error (err_str)
+    else        # For writing we need more info:
+      fid = fopen (filename, 'rb');  # Check if it can be opened for reading
+      if (fid < 0)  # Not found => create it
+        printf ("Creating file %s\n", filename);
+        rw = 3;
+      else      # Found but not writable = error
+        fclose (fid);  # Do not forget to close the handle neatly
+        error (sprintf ("Write mode requested but file %s is not writable\n", filename))
+      endif
+    endif
+  else
+    # close file anyway to avoid Java errors
+    fclose (fid);
+  endif
 
 # Check for the various ODS interfaces. No problem if they've already
 # been checked, getodsinterfaces (far below) just returns immediately then.
 
-	[odsinterfaces] = getodsinterfaces (odsinterfaces);
+  [odsinterfaces] = getodsinterfaces (odsinterfaces);
 
 # Supported interfaces determined; now check ODS file type.
 
-	chk1 = strcmp (tolower (filename(end-3:end)), '.ods');
-	# Only jOpenDocument (JOD) can read from .sxc files, but only if odfvsn = 2
-	chk2 = strcmp (tolower (filename(end-3:end)), '.sxc');
-#	if (~chk1)
-#		error ("Currently ods2oct can only read reliably from .ods files")
-#	endif
+  chk1 = strcmp (tolower (filename(end-3:end)), '.ods');
+  # Only jOpenDocument (JOD) can read from .sxc files, but only if odfvsn = 2
+  chk2 = strcmp (tolower (filename(end-3:end)), '.sxc');
+#  if (~chk1)
+#    error ("Currently ods2oct can only read reliably from .ods files")
+#  endif
 
-	ods = struct ("xtype", [], "app", [], "filename", [], "workbook", [], "changed", 0, "limits", [], "odfvsn", []);
+  ods = struct ("xtype", [], "app", [], "filename", [], "workbook", [], "changed", 0, "limits", [], "odfvsn", []);
 
-	# Preferred interface = OTK (ODS toolkit & xerces), so it comes first. 
-	# Keep track of which interface is selected. Can be used for fallback to other intf
-	odssupport = 0;
+  # Preferred interface = OTK (ODS toolkit & xerces), so it comes first. 
+  # Keep track of which interface is selected. Can be used for fallback to other intf
+  odssupport = 0;
 
-	if (odsinterfaces.OTK && ~odssupport)
-		# Parts after user gfterry in
-		# http://www.oooforum.org/forum/viewtopic.phtml?t=69060
-		odftk = 'org.odftoolkit.odfdom.doc';
-		try
-			if (rw > 2)
-				# New spreadsheet
-				wb = java_invoke ([odftk '.OdfSpreadsheetDocument'], 'newSpreadsheetDocument');
-			else
-				# Existing spreadsheet
-				wb = java_invoke ([odftk '.OdfDocument'], 'loadDocument', filename);
-			endif
-			ods.workbook = wb.getContentDom ();		# Reads the entire spreadsheet
-			ods.xtype = 'OTK';
-			ods.app = wb;
-			ods.filename = filename;
-			ods.odfvsn = odsinterfaces.odfvsn;
-			odssupport += 1;
-		catch
-			if (odsinterfaces.JOD && ~rw && chk2)
-				printf ('Couldn''t open file %s using OTK; trying .sxc format with JOD...\n', filename);
-			else
-				error ('Couldn''t open file %s using OTK', filename);
-			endif
-		end_try_catch
-	endif
-
-	if (odsinterfaces.JOD && ~odssupport)
-		file = java_new ('java.io.File', filename);
-		jopendoc = 'org.jopendocument.dom.spreadsheet.SpreadSheet';
-		try
-			if (rw > 2)
-				# Create an empty 2 x 2 default TableModel template
-				tmodel= java_new ('javax.swing.table.DefaultTableModel', 2, 2);
-				wb = java_invoke (jopendoc, 'createEmpty', tmodel);
-			else
-				wb = java_invoke (jopendoc, 'createFromFile', file);
-			endif
-			ods.workbook = wb;
-			ods.filename = filename;
-			ods.xtype = 'JOD';
-			ods.app = 'file';
-			# Check jOpenDocument version. This can only work here when a
-			# workbook has been opened
-			sh = ods.workbook.getSheet (0);
-			cl = sh.getCellAt (0, 0);
-			try
-				# 1.2b3 has public getValueType ()
-				cl.getValueType ();
-				ods.odfvsn = 3;
-			catch
-				# 1.2b2 has not
-				ods.odfvsn = 2;
-				printf ("NOTE: jOpenDocument v. 1.2b2 has limited functionality. Try upgrading to 1.2\n");
-			end_try_catch
-			odssupport += 2;
-		catch
-			error ('Couldn''t open file %s using JOD', filename);
-		end_try_catch
-	endif
+  if (odsinterfaces.OTK && ~odssupport)
+    # Parts after user gfterry in
+    # http://www.oooforum.org/forum/viewtopic.phtml?t=69060
+    odftk = 'org.odftoolkit.odfdom.doc';
+    try
+      if (rw > 2)
+        # New spreadsheet
+        wb = java_invoke ([odftk '.OdfSpreadsheetDocument'], 'newSpreadsheetDocument');
+      else
+        # Existing spreadsheet
+        wb = java_invoke ([odftk '.OdfDocument'], 'loadDocument', filename);
+      endif
+      ods.workbook = wb.getContentDom ();    # Reads the entire spreadsheet
+      ods.xtype = 'OTK';
+      ods.app = wb;
+      ods.filename = filename;
+      ods.odfvsn = odsinterfaces.odfvsn;
+      odssupport += 1;
+      lastintf = 'OTK';
+    catch
+      if (odsinterfaces.JOD && ~rw && chk2)
+        printf ('Couldn''t open file %s using OTK; trying .sxc format with JOD...\n', filename);
+      else
+        error ('Couldn''t open file %s using OTK', filename);
+      endif
+    end_try_catch
+  endif
 
-	if (odsinterfaces.UNO && ~odssupport)
-		# First the file name must be transformed into a URL
-		if (~isempty (strmatch ("file:///", filename)) || ~isempty (strmatch ("http:///", filename))...
-			|| ~isempty (strmatch ("ftp:///", filename)) || ~isempty (strmatch ("www:///", filename)))
-			# Seems in proper shape for OOO (at first sight)
-		else
-			# Transform into URL form
-			fname = canonicalize_file_name (strsplit (filename, filesep){end});
-			# On Windows, change backslash file separator into forward slash
-			if (strcmp (filesep, "\\"))
-				tmp = strsplit (fname, filesep);
-				flen = numel (tmp);
-				tmp(2:2:2*flen) = tmp;
-				tmp(1:2:2*flen) = '/';
-				fname = [ tmp{:} ];
-			endif
-			filename = [ 'file://' fname ];
-		endif
-		try
-			xContext = java_invoke ("com.sun.star.comp.helper.Bootstrap", "bootstrap");
-			xMCF = xContext.getServiceManager ();
-			oDesktop = xMCF.createInstanceWithContext ("com.sun.star.frame.Desktop", xContext);
-			# Workaround:
-			unotmp = java_new ('com.sun.star.uno.Type', 'com.sun.star.frame.XComponentLoader');
-			aLoader = oDesktop.queryInterface (unotmp);
-			# Some trickery as Octave Java cannot create non-numeric arrays
-			lProps = javaArray ('com.sun.star.beans.PropertyValue', 1);
-			lProp = java_new ('com.sun.star.beans.PropertyValue', "Hidden", 0, true, []);
-			lProps(1) = lProp;
-			if (rw > 2)
-				xComp = aLoader.loadComponentFromURL ("private:factory/scalc", "_blank", 0, lProps);
-			else
-				xComp = aLoader.loadComponentFromURL (filename, "_blank", 0, lProps);
-			endif
-			# Workaround:
-			unotmp = java_new ('com.sun.star.uno.Type', 'com.sun.star.sheet.XSpreadsheetDocument');
-			# save in ods struct:
-			xSpdoc = xComp.queryInterface (unotmp);
-			ods.workbook = xSpdoc;			# Needed to be able to close soffice in odsclose()
-			ods.filename = filename;
-			ods.xtype = 'UNO';
-			ods.app.xComp = xComp;			# Needed to be able to close soffice in odsclose()
-			ods.app.aLoader = aLoader;	# Needed to be able to close soffice in odsclose()
-			ods.odfvsn = 'UNO';
-			odssupport += 4;
-		catch
-			error ('Couldn''t open file %s using UNO', filename);
-		end_try_catch
-	endif
+  if (odsinterfaces.JOD && ~odssupport)
+    file = java_new ('java.io.File', filename);
+    jopendoc = 'org.jopendocument.dom.spreadsheet.SpreadSheet';
+    try
+      if (rw > 2)
+        # Create an empty 2 x 2 default TableModel template
+        tmodel= java_new ('javax.swing.table.DefaultTableModel', 2, 2);
+        wb = java_invoke (jopendoc, 'createEmpty', tmodel);
+      else
+        wb = java_invoke (jopendoc, 'createFromFile', file);
+      endif
+      ods.workbook = wb;
+      ods.filename = filename;
+      ods.xtype = 'JOD';
+      ods.app = 'file';
+      # Check jOpenDocument version. This can only work here when a
+      # workbook has been opened
+      sh = ods.workbook.getSheet (0);
+      cl = sh.getCellAt (0, 0);
+      try
+        # 1.2b3 has public getValueType ()
+        cl.getValueType ();
+        ods.odfvsn = 3;
+      catch
+        # 1.2b2 has not
+        ods.odfvsn = 2;
+        printf ("NOTE: jOpenDocument v. 1.2b2 has limited functionality. Try upgrading to 1.2\n");
+      end_try_catch
+      odssupport += 2;
+      lastintf = 'JOD';
+    catch
+      error ('Couldn''t open file %s using JOD', filename);
+    end_try_catch
+  endif
 
-#	if 
-#		<other interfaces here>
+  if (odsinterfaces.UNO && ~odssupport)
+    # First the file name must be transformed into a URL
+    if (~isempty (strmatch ("file:///", filename)) || ~isempty (strmatch ("http:///", filename))...
+      || ~isempty (strmatch ("ftp:///", filename)) || ~isempty (strmatch ("www:///", filename)))
+      # Seems in proper shape for OOO (at first sight)
+    else
+      # Transform into URL form
+      fname = canonicalize_file_name (strsplit (filename, filesep){end});
+      # On Windows, change backslash file separator into forward slash
+      if (strcmp (filesep, "\\"))
+        tmp = strsplit (fname, filesep);
+        flen = numel (tmp);
+        tmp(2:2:2*flen) = tmp;
+        tmp(1:2:2*flen) = '/';
+        fname = [ tmp{:} ];
+      endif
+      filename = [ 'file://' fname ];
+    endif
+    try
+      xContext = java_invoke ("com.sun.star.comp.helper.Bootstrap", "bootstrap");
+      xMCF = xContext.getServiceManager ();
+      oDesktop = xMCF.createInstanceWithContext ("com.sun.star.frame.Desktop", xContext);
+      # Workaround:
+      unotmp = java_new ('com.sun.star.uno.Type', 'com.sun.star.frame.XComponentLoader');
+      aLoader = oDesktop.queryInterface (unotmp);
+      # Some trickery as Octave Java cannot create non-numeric arrays
+      lProps = javaArray ('com.sun.star.beans.PropertyValue', 1);
+      lProp = java_new ('com.sun.star.beans.PropertyValue', "Hidden", 0, true, []);
+      lProps(1) = lProp;
+      if (rw > 2)
+        xComp = aLoader.loadComponentFromURL ("private:factory/scalc", "_blank", 0, lProps);
+      else
+        xComp = aLoader.loadComponentFromURL (filename, "_blank", 0, lProps);
+      endif
+      # Workaround:
+      unotmp = java_new ('com.sun.star.uno.Type', 'com.sun.star.sheet.XSpreadsheetDocument');
+      # save in ods struct:
+      xSpdoc = xComp.queryInterface (unotmp);
+      ods.workbook = xSpdoc;      # Needed to be able to close soffice in odsclose()
+      ods.filename = filename;
+      ods.xtype = 'UNO';
+      ods.app.xComp = xComp;      # Needed to be able to close soffice in odsclose()
+      ods.app.aLoader = aLoader;  # Needed to be able to close soffice in odsclose()
+      ods.odfvsn = 'UNO';
+      odssupport += 4;
+      lastintf = 'UNO';
+    catch
+      error ('Couldn''t open file %s using UNO', filename);
+    end_try_catch
+  endif
 
-	if (~odssupport)
+#  if 
+#    <other interfaces here>
+
+  if (~odssupport)
     printf ("None.\n");
-		warning ("No support for OpenOffice.org .ods I/O"); 
-		ods = [];
-	else
-		# From here on rw is tracked via ods.changed in the various lower
-		# level r/w routines and it is only used to determine if an informative
-		# message is to be given when saving a newly created ods file.
-		ods.changed = rw;
+    warning ("No support for OpenOffice.org .ods I/O"); 
+    ods = [];
+    chkintf = [];
+  else
+    # From here on rw is tracked via ods.changed in the various lower
+    # level r/w routines and it is only used to determine if an informative
+    # message is to be given when saving a newly created ods file.
+    ods.changed = rw;
 
-		# Until something was written to existing files we keep status "unchanged".
-		# ods.changed = 0 (existing/only read from), 1 (existing/data added), 2 (new,
-		# data added) or 3 (pristine, no data added).
-		if (ods.changed == 1) ods.changed = 0; endif
-	endif
-
-	if (~isempty (reqinterface) || ~odssupport)
-		# Reset all found interfaces for re-testing in the next call. Add interfaces if needed.
-		chkintf = [];
-	endif
+    # Until something was written to existing files we keep status "unchanged".
+    # ods.changed = 0 (existing/only read from), 1 (existing/data added), 2 (new,
+    # data added) or 3 (pristine, no data added).
+    if (ods.changed == 1) ods.changed = 0; endif
+  endif
 
 endfunction
 
@@ -392,144 +398,140 @@
 ##     ''     Reset tmp1 (always allow interface rediscovery) for empty odsinterfaces arg
 ## 2011-09-18 Added temporary warning about UNO interface
 ## 2012-03-22 Improved Java checks (analogous to xlsopen)
+## 2012-06-06 Again improved & simplified Java-based interface checking support
 
 function [odsinterfaces] = getodsinterfaces (odsinterfaces)
 
   # tmp1 = [] (not initialized), 0 (No Java detected), or 1 (Working Java found)
-	persistent tmp1 = []; persistent jcp;  # Java class path
+  persistent tmp1 = []; persistent jcp;  # Java class path
   persistent uno_1st_time = 0;
 
-	if (isempty (odsinterfaces.OTK) && isempty (odsinterfaces.JOD) && isempty (odsinterfaces.UNO))
+  if (isempty (odsinterfaces.OTK) && isempty (odsinterfaces.JOD) && isempty (odsinterfaces.UNO))
     # Assume no interface detection has happened yet
-		printf ("Detected ODS interfaces: ");
+    printf ("Detected ODS interfaces: ");
     tmp1 = [];
-	elseif (isempty (odsinterfaces.OTK) || isempty (odsinterfaces.JOD) || isempty (odsinterfaces.UNO))
+  elseif (isempty (odsinterfaces.OTK) || isempty (odsinterfaces.JOD) || isempty (odsinterfaces.UNO))
     # Can't be first call. Here one of the Java interfaces is requested
     if (~tmp1)
       # Check Java support again
       tmp1 = [];
     endif
-	endif
-	deflt = 0;
+  endif
+  deflt = 0;
 
-	if (isempty (tmp1))
-	# Check Java support
-		try
-			jcp = javaclasspath ("-all");					# For java pkg >= 1.2.8
-			if (isempty (jcp)), jcp = javaclasspath; endif	# For java pkg <  1.2.8
-			# If we get here, at least Java works. Now check for proper version (>= 1.6)
-			jver = char (java_invoke ('java.lang.System', 'getProperty', 'java.version'));
-			cjver = strsplit (jver, '.');
-			if (sscanf (cjver{2}, '%d') < 6)
-				warning ("\nJava version too old - you need at least Java 6 (v. 1.6.x.x)\n");
-				return
-			endif
-			# Now check for proper entries in class path. Under *nix the classpath
-			# must first be split up. In java 1.2.8+ javaclasspath is already a cell array
-			if (isunix && ~iscell (jcp)), jcp = strsplit (char (jcp), pathsep ()); endif
-			tmp1 = 1;
-		catch
-			# No Java support
+  if (isempty (tmp1))
+  # Check Java support
+    try
+      jcp = javaclasspath ("-all");          # For java pkg >= 1.2.8
+      if (isempty (jcp)), jcp = javaclasspath; endif  # For java pkg <  1.2.8
+      # If we get here, at least Java works. Now check for proper version (>= 1.6)
+      jver = char (java_invoke ('java.lang.System', 'getProperty', 'java.version'));
+      cjver = strsplit (jver, '.');
+      if (sscanf (cjver{2}, '%d') < 6)
+        warning ("\nJava version too old - you need at least Java 6 (v. 1.6.x.x)\n");
+        return
+      endif
+      # Now check for proper entries in class path. Under *nix the classpath
+      # must first be split up. In java 1.2.8+ javaclasspath is already a cell array
+      if (isunix && ~iscell (jcp)), jcp = strsplit (char (jcp), pathsep ()); endif
+      tmp1 = 1;
+    catch
+      # No Java support
       tmp1 = 0;
-			if ~(isempty (odsinterfaces.OTK) && isempty (odsinterfaces.JOD) && isempty (odsinterfaces.UNO))
-				# Some Java-based interface explicitly requested but Java support is absent
-        xlsinterfaces.OTK = 0;
-        xlsinterfaces.JOD = 0;
-        xlsinterfaces.UNO = 0;
-				warning (' No Java support found (no Java JRE? no Java pkg installed AND loaded?');
-			else
-				# No specific Java-based interface requested. Just return (needed for if
-				# ever a non-Java based interfaces will be implemented)
-        odsinterfaces.OTK = 0;
-        odsinterfaces.JOD = 0;
-        odsinterfaces.UNO = 0;
-        printf ("\n");
-				return;
-			endif
-		end_try_catch
-	endif
+      if (isempty (odsinterfaces.OTK) || isempty (odsinterfaces.JOD) || isempty (odsinterfaces.UNO))
+        # Some or all Java-based interface explicitly requested; but no Java support
+        warning (' No Java support found (no Java JRE? no Java pkg installed AND loaded?');
+      endif
+      # No specific Java-based interface requested. Just return
+      odsinterfaces.OTK = 0;
+      odsinterfaces.JOD = 0;
+      odsinterfaces.UNO = 0;
+      printf ("\n");
+      return;
+    end_try_catch
+  endif
 
-	# Try Java & ODF toolkit
-	if (isempty (odsinterfaces.OTK))
-		odsinterfaces.OTK = 0;
-		jpchk = 0; entries = {"odfdom", "xercesImpl"};
-		# Only under *nix we might use brute force: e.g., strfind(classpath, classname);
-		# under Windows we need the following more subtle, platform-independent approach:
-		for ii=1:length (jcp)
-			for jj=1:length (entries)
-				if (~isempty (strfind ( jcp{ii}, entries{jj}))), ++jpchk; endif
-			endfor
-		endfor
-		if (jpchk >= numel(entries))		# Apparently all requested classes present.
-			# Only now we can check for proper odfdom version (only 0.7.5 & 0.8.6 work OK).
-			# The odfdom team deemed it necessary to change the version call so we need this:
-			odfvsn = ' ';
-			try
-				# New in 0.8.6
-				odfvsn = java_invoke ('org.odftoolkit.odfdom.JarManifest', 'getOdfdomVersion');
-			catch
-				odfvsn = java_invoke ('org.odftoolkit.odfdom.Version', 'getApplicationVersion');
-			end_try_catch
-			if ~(strcmp (odfvsn, '0.7.5') || strcmp (odfvsn, '0.8.6') || strcmp (odfvsn, '0.8.7'))
-				warning ("\nodfdom version %s is not supported - use v. 0.8.6 or 0.8.7.\n", odfvsn);
-			else
-				if (strcmp (odfvsn, '0.7.5'))
-					warning ("odfdom v. 0.7.5 support won't be maintained - please upgrade to 0.8.6 or higher."); 
-				endif
-				odsinterfaces.OTK = 1;
-				printf ("OTK");
-				if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; endif
-			endif
-			odsinterfaces.odfvsn = odfvsn;
-		else
-			warning ("\nNot all required classes (.jar) in classpath for OTK");
-		endif
-	endif
+  # Try Java & ODF toolkit
+  if (isempty (odsinterfaces.OTK))
+    odsinterfaces.OTK = 0;
+    jpchk = 0; entries = {"odfdom", "xercesImpl"};
+    # Only under *nix we might use brute force: e.g., strfind(classpath, classname);
+    # under Windows we need the following more subtle, platform-independent approach:
+    for ii=1:length (jcp)
+      for jj=1:length (entries)
+        if (~isempty (strfind ( jcp{ii}, entries{jj}))), ++jpchk; endif
+      endfor
+    endfor
+    if (jpchk >= numel(entries))    # Apparently all requested classes present.
+      # Only now we can check for proper odfdom version (only 0.7.5 & 0.8.6 work OK).
+      # The odfdom team deemed it necessary to change the version call so we need this:
+      odfvsn = ' ';
+      try
+        # New in 0.8.6
+        odfvsn = java_invoke ('org.odftoolkit.odfdom.JarManifest', 'getOdfdomVersion');
+      catch
+        odfvsn = java_invoke ('org.odftoolkit.odfdom.Version', 'getApplicationVersion');
+      end_try_catch
+      if ~(strcmp (odfvsn, '0.7.5') || strcmp (odfvsn, '0.8.6') || strcmp (odfvsn, '0.8.7'))
+        warning ("\nodfdom version %s is not supported - use v. 0.8.6 or 0.8.7.\n", odfvsn);
+      else
+        if (strcmp (odfvsn, '0.7.5'))
+          warning ("odfdom v. 0.7.5 support won't be maintained - please upgrade to 0.8.6 or higher."); 
+        endif
+        odsinterfaces.OTK = 1;
+        printf ("OTK");
+        if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; endif
+      endif
+      odsinterfaces.odfvsn = odfvsn;
+    else
+      warning ("\nNot all required classes (.jar) in classpath for OTK");
+    endif
+  endif
 
-	# Try Java & jOpenDocument
-	if (isempty (odsinterfaces.JOD))
-		odsinterfaces.JOD = 0;
-		jpchk = 0; entries = {"jOpenDocument"};
-		for ii=1:length (jcp)
-			for jj=1:length (entries)
-				if (~isempty (strfind (jcp{ii}, entries{jj}))), ++jpchk; endif
-			endfor
-		endfor
-		if (jpchk >= numel(entries))
-			odsinterfaces.JOD = 1;
-			printf ("JOD");
-			if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; endif
-		else
-			warning ("\nNot all required classes (.jar) in classpath for JOD");
-		endif
-	endif
+  # Try Java & jOpenDocument
+  if (isempty (odsinterfaces.JOD))
+    odsinterfaces.JOD = 0;
+    jpchk = 0; entries = {"jOpenDocument"};
+    for ii=1:length (jcp)
+      for jj=1:length (entries)
+        if (~isempty (strfind (jcp{ii}, entries{jj}))), ++jpchk; endif
+      endfor
+    endfor
+    if (jpchk >= numel(entries))
+      odsinterfaces.JOD = 1;
+      printf ("JOD");
+      if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; endif
+    else
+      warning ("\nNot all required classes (.jar) in classpath for JOD");
+    endif
+  endif
 
-	# Try Java & UNO
-	if (isempty (odsinterfaces.UNO))
-		odsinterfaces.UNO = 0;
-		# entries(1) = not a jar but a directory (<000_install_dir/program/>)
-		jpchk = 0; entries = {'program', 'unoil', 'jurt', 'juh', 'unoloader', 'ridl'};
-		for jj=1:numel (entries)
-			for ii=1:numel (jcp)
-				jcplst = strsplit (jcp{ii}, filesep);
-				jcpentry = jcplst {end};
-				if (~isempty (strfind (lower (jcpentry), lower (entries{jj}))))
-					jpchk = jpchk + 1;
-				endif
-			endfor
-		endfor
-		if (jpchk >= numel (entries))
-			odsinterfaces.UNO = 1;
-			printf ("UNO");
-			if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; uno_1st_time = min (++uno_1st_time, 2); endif
-		else
-			warning ("\nOne or more UNO classes (.jar) missing in javaclasspath");
-		endif
-	endif
-	
-	# ---- Other interfaces here, similar to the ones above
+  # Try Java & UNO
+  if (isempty (odsinterfaces.UNO))
+    odsinterfaces.UNO = 0;
+    # entries(1) = not a jar but a directory (<000_install_dir/program/>)
+    jpchk = 0; entries = {'program', 'unoil', 'jurt', 'juh', 'unoloader', 'ridl'};
+    for jj=1:numel (entries)
+      for ii=1:numel (jcp)
+        jcplst = strsplit (jcp{ii}, filesep);
+        jcpentry = jcplst {end};
+        if (~isempty (strfind (lower (jcpentry), lower (entries{jj}))))
+          jpchk = jpchk + 1;
+        endif
+      endfor
+    endfor
+    if (jpchk >= numel (entries))
+      odsinterfaces.UNO = 1;
+      printf ("UNO");
+      if (deflt), printf ("; "); else, printf ("*; "); deflt = 1; uno_1st_time = min (++uno_1st_time, 2); endif
+    else
+      warning ("\nOne or more UNO classes (.jar) missing in javaclasspath");
+    endif
+  endif
+  
+  # ---- Other interfaces here, similar to the ones above
 
-	if (deflt), printf ("(* = active interface)\n"); endif
+  if (deflt), printf ("(* = active interface)\n"); endif
 
   ## FIXME the below stanza should be dropped once UNO is stable.
   # Echo a suitable warning about experimental status:
@@ -541,5 +543,5 @@
     printf ("also those that were started outside and/or before Octave!\n");
     printf ("Trying to quit Octave w/o invoking odsclose will only hang Octave.\n\n");
   endif
-	
+  
 endfunction