[Octave-cvsupdate] SF.net SVN: octave:[8116] trunk/octave-forge/main/io/inst

[<prn...@us...>]

Revision: 8116
          http://octave.svn.sourceforge.net/octave/?rev=8116&view=rev
Author:   prnienhuis
Date:     2011-02-15 21:52:49 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------
Adapted to new java-1.2.8 javaclasspath() calling style

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/odsopen.m
    trunk/octave-forge/main/io/inst/xlsopen.m

Modified: trunk/octave-forge/main/io/inst/odsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/odsopen.m	2011-02-14 22:14:26 UTC (rev 8115)
+++ trunk/octave-forge/main/io/inst/odsopen.m	2011-02-15 21:52:49 UTC (rev 8116)
@@ -78,7 +78,7 @@
 ##     "      Added try-catch to file open sections to create fallback to other intf
 ## 2010-12-06 Textual changes to info header 
 ##
-## Latest change on subfunction below: 2010-09-27
+## Latest change on subfunction below: 2011-02-15
 
 function [ ods ] = odsopen (filename, rw=0, reqinterface=[])
 
@@ -181,7 +181,7 @@
 			ods.odfvsn = odsinterfaces.odfvsn;
 			odssupport += 1;
 		catch
-			if (xlsinterfaces.JOD && ~rw && chk2)
+			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);
@@ -301,6 +301,7 @@
 ##     "      Rearranged code a bit; fixed typos in OTK detection code (odfdvsn -> odfvsn)
 ## 2010-09-27 More code cleanup
 ## 2010-11-12 Warning added about waning support for odfdom v. 0.7.5
+## 2011-02-15 Adapted to new java-1.2.8 javaclasspath() calling style
 
 function [odsinterfaces] = getodsinterfaces (odsinterfaces)
 
@@ -313,7 +314,8 @@
 
 	# Check Java support
 	try
-		tmp1 = javaclasspath;
+		tmp1 = javaclasspath ('-all');						# For java pkg > 1.2.7
+		if (isempty (tmp1)), tmp1 = javaclasspath; endif	# For java pkg < 1.2.8
 		# If we get here, at least Java works. Now check for proper entries
 		# in class path. Under *nix the classpath must first be split up
 		if (isunix) tmp1 = strsplit (char(tmp1), ":"); endif
@@ -323,7 +325,7 @@
 		# No Java support
 		odsinterfaces.OTK = 0;
 		odsinterfaces.JOD = 0;
-		if ~(isempty (xlsinterfaces.POI) && isempty (xlsinterfaces.JXL))
+		if ~(isempty (odsinterfaces.POI) && isempty (odsinterfaces.JXL))
 			# Some Java-based interface requested but Java support is absent
 			error ('No Java support found.');
 		else

Modified: trunk/octave-forge/main/io/inst/xlsopen.m
===================================================================
--- trunk/octave-forge/main/io/inst/xlsopen.m	2011-02-14 22:14:26 UTC (rev 8115)
+++ trunk/octave-forge/main/io/inst/xlsopen.m	2011-02-15 21:52:49 UTC (rev 8116)
@@ -90,7 +90,7 @@
 ## 2010-12-01 Small bugfix - reset xlssupport in l. 102
 ## 2010-12-06 Textual changes to info header 
 ##
-## 2010-11-05 Latest subfunction update
+## 2011-02-15 Latest subfunction update
 
 function [ xls ] = xlsopen (filename, xwrite=0, reqinterface=[])
 
@@ -340,6 +340,7 @@
 ## 2010-09-27 More code cleanup
 ## 2010-10-20 Added check for minimum Java version (should be >= 6 / 1.6)
 ## 2010-11-05 Slight change to reporting to screen
+## 2011-02-15 Adapted to javaclasspath calling style of java-1.2.8 pkg
 
 function [xlsinterfaces] = getxlsinterfaces (xlsinterfaces)
 
@@ -372,7 +373,8 @@
 	if (isempty (tmp1))
 		# Check Java support. First try javaclasspath
 		try
-			jcp = javaclasspath;
+			jcp = javaclasspath ('-all');					# For java pkg > 1.2.7
+			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, '.');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.