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

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

Revision: 10970
          http://octave.svn.sourceforge.net/octave/?rev=10970&view=rev
Author:   prnienhuis
Date:     2012-09-07 12:58:28 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
Style changes + filesep rather than hard-coded "/"

Modified Paths:
--------------
    trunk/octave-forge/main/io/PKG_ADD

Modified: trunk/octave-forge/main/io/PKG_ADD
===================================================================
--- trunk/octave-forge/main/io/PKG_ADD	2012-09-07 09:01:00 UTC (rev 10969)
+++ trunk/octave-forge/main/io/PKG_ADD	2012-09-07 12:58:28 UTC (rev 10970)
@@ -1,14 +1,16 @@
 ## PKG_ADD
 ## add paths of io pkg java jars if java pkg is installed and loaded
 pkglist = pkg ("list");
-javapkgind = find (cellfun(@(x) strcmp(x.name, "java"), pkglist), 1, "first");
-if ~isempty (javapkgind)
+javapkgind = find (cellfun (@(x) strcmp(x.name, "java"), pkglist), 1, "first");
+if (! isempty (javapkgind))
   javapkg = pkglist{javapkgind};
-  if javapkg.loaded
+  if (javapkg.loaded)
     # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out
-    libdir = octave_config_info("libdir");
-    pause (0.5);
-    spr_status = chk_spreadsheet_support ([libdir "/java"]);
+    libdir = octave_config_info ("libdir");
+    ## Allow time for package to be fully loaded
+    pause (0.25);
+    spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]);
   endif
 endif
+## Clean up
 clear javapkgind javapkg libdir spr_status pkglist ;
\ No newline at end of file

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