[Zooimage-commits] r81 - pkg/zooimage/R

[noreply at r-forge.r-project.org]

Author: romain
Date: 2009-04-15 17:47:07 +0200 (Wed, 15 Apr 2009)
New Revision: 81

Modified:
   pkg/zooimage/R/zid.r
Log:
minor withCallingHandler -> tryCatch

Modified: pkg/zooimage/R/zid.r
===================================================================
--- pkg/zooimage/R/zid.r	2009-04-15 15:45:15 UTC (rev 80)
+++ pkg/zooimage/R/zid.r	2009-04-15 15:47:07 UTC (rev 81)
@@ -332,12 +332,10 @@
 	# {{{ Make sure the .RData file is created (or refreshed)
 	# TODO: this needs to be simplified, the calling handlers should be invisible 
 	#       here.
-	withRestarts( withCallingHandlers( { 
+	tryCatch( { 
 		make.RData(zidir, type = type, replace = replace, show.log = FALSE)
 	}, zooImageError = function(e){ # "has no .RData (error while creating it)!"
 		logError( e, msg = "has no .RData (error while creating it)!" )
-		invokeRestart( "zooImageError" )
-	} ), zooImageError = function(e){
 		ok <<- FALSE
 	} )
 	if( !ok ) return( invisible( FALSE ) )