Index: editor/filemanager/connectors/cfm/image.cfc
===================================================================
--- editor/filemanager/connectors/cfm/image.cfc	(revision 7697)
+++ editor/filemanager/connectors/cfm/image.cfc	(working copy)
@@ -127,7 +127,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 		<cfset retVal.metaData = getImageMetadata(loadImage.inFile)>
@@ -148,7 +148,7 @@
 		<cfset retVal.canModify = true>
 		<cfreturn retVal>
 		<cfcatch type="any">
-			<cfset retVal = throw( "#cfcatch.message#: #cfcatch.detail#")>
+			<cfset retVal = fckthrow( "#cfcatch.message#: #cfcatch.detail#")>
 			<cfreturn retVal>
 		</cfcatch>
 	</cftry>
@@ -278,7 +278,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -321,7 +321,7 @@
 			w = newWidth;
 			h = newHeight;
 		} else {
-			retVal = throw( retVal.errorMessage);
+			retVal = fckthrow( retVal.errorMessage);
 			return retVal;
 		}
 		resizedImage.init(javacast("int",w),javacast("int",h),img.getType());
@@ -405,7 +405,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -420,7 +420,7 @@
 			fromY + newHeight gt img.getHeight()
 			)
 		{
-			retval = throw( "The cropped image dimensions go beyond the original image dimensions.");
+			retval = fckthrow( "The cropped image dimensions go beyond the original image dimensions.");
 			return retVal;
 		}
 		croppedImage = img.getSubimage(javaCast("int", fromX), javaCast("int", fromY), javaCast("int", newWidth), javaCast("int", newHeight) );
@@ -470,7 +470,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -480,7 +480,7 @@
 		<cfset img = convertImageObject(img,img.TYPE_3BYTE_BGR)>
 	</cfif>
 	<cfif ListFind("-270,-180,-90,90,180,270",degrees) is 0>
-		<cfset retVal = throw( "At this time, image.cfc only supports rotating images in 90 degree increments.")>
+		<cfset retVal = fckthrow( "At this time, image.cfc only supports rotating images in 90 degree increments.")>
 		<cfreturn retVal>
 	</cfif>
 
@@ -540,7 +540,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -550,7 +550,7 @@
 	<cfscript>
 		if (outputFile eq "")
 		{
-			retVal = throw( "The convert method requires a valid output filename.");
+			retVal = fckthrow( "The convert method requires a valid output filename.");
 			return retVal;
 		} else {
 			saveImage = writeImage(outputFile, img, jpegCompression);
@@ -645,29 +645,29 @@
 	<cfset retVal.errorMessage = "">
 
 	<cfif not fileExists(arguments.inputFile)>
-		<cfset retVal = throw("The specified file #Chr(34)##arguments.inputFile##Chr(34)# could not be found.")>
+		<cfset retVal = fckthrow("The specified file #Chr(34)##arguments.inputFile##Chr(34)# could not be found.")>
 		<cfreturn retVal>
 	<cfelseif listLen(filename,".") lt 2>
-		<cfset retVal = throw("Sorry, image files without extensions cannot be manipulated.")>
+		<cfset retVal = fckthrow("Sorry, image files without extensions cannot be manipulated.")>
 		<cfreturn retVal>
 	<cfelseif listFindNoCase(validExtensionsToRead, extension) is 0>
-		<cfset retVal = throw("Java is unable to read #extension# files.")>
+		<cfset retVal = fckthrow("Java is unable to read #extension# files.")>
 		<cfreturn retVal>
 	<cfelseif NOT fileExists(arguments.inputFile)>
-		<cfset retVal = throw("The specified input file does not exist.")>
+		<cfset retVal = fckthrow("The specified input file does not exist.")>
 		<cfreturn retVal>
 	<cfelse>
 		<cfset img = CreateObject("java", "java.awt.image.BufferedImage")>
 		<cfset inFile = CreateObject("java", "java.io.File")>
 		<cfset inFile.init(arguments.inputFile)>
 		<cfif NOT inFile.canRead()>
-			<cfset retVal = throw("Unable to open source file #Chr(34)##arguments.inputFile##Chr(34)#.")>
+			<cfset retVal = fckthrow("Unable to open source file #Chr(34)##arguments.inputFile##Chr(34)#.")>
 			<cfreturn retVal>
 		<cfelse>
 			<cftry>
 				<cfset img = imageIO.read(inFile)>
 				<cfcatch type="any">
-					<cfset retval = throw("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
+					<cfset retval = fckthrow("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
 					<cfreturn retVal>
 				</cfcatch>
 			</cftry>
@@ -695,7 +695,7 @@
 	<cftry>
 		<cfset img = imageIO.read(inURL)>
 		<cfcatch type="any">
-			<cfset retval = throw("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
+			<cfset retval = fckthrow("An error occurred attempting to read the specified image.  #cfcatch.message# - #cfcatch.detail#")>
 			<cfreturn retVal>
 		</cfcatch>
 	</cftry>
@@ -727,7 +727,7 @@
 	<cfset retVal.errorMessage = "">
 
 	<cfif listFindNoCase(validExtensionsToWrite, extension) eq 0>
-		<cfset throw("Java is unable to write #extension# files.  Valid formats include: #validExtensionsToWrite#")>
+		<cfset fckthrow("Java is unable to write #extension# files.  Valid formats include: #validExtensionsToWrite#")>
 	</cfif>
 
 	<cfif extension neq "jpg" and extension neq "jpeg">
@@ -782,7 +782,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -845,14 +845,14 @@
 	<cfset retVal.errorMessage = "">
 
 	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
+		<cfset fckthrow("Sorry, but the blur filter is not supported on this platform.")>
 	</cfif>
 	<cfif inputFile neq "">
 		<cfset loadImage = readImage(inputFile, "NO")>
 		<cfif loadImage.errorCode is 0>
 			<cfset srcImage = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -912,7 +912,7 @@
 	<cfset retVal.errorMessage = "">
 
 	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
+		<cfset fckthrow("Sorry, but the blur filter is not supported on this platform.")>
 	</cfif>
 
 	<cfif inputFile neq "">
@@ -920,7 +920,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset srcImage = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -974,7 +974,7 @@
 	<cfset retVal.errorMessage = "">
 
 	<cfif NOT variables.javanulls>
-		<cfset throw("Sorry, but the blur filter is not supported on this platform.")>
+		<cfset fckthrow("Sorry, but the blur filter is not supported on this platform.")>
 	</cfif>
 
 	<cfif inputFile neq "">
@@ -982,7 +982,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset srcImage = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -992,7 +992,7 @@
 		<cfset srcImage = convertImageObject(srcImage,srcImage.TYPE_3BYTE_BGR)>
 	</cfif>
 	<cfif srcImage.getType() neq 5>
-		<cfset throw("ImageCFC cannot posterize this image type (#srcImage.getType()#)")>
+		<cfset fckthrow("ImageCFC cannot posterize this image type (#srcImage.getType()#)")>
 	</cfif>
 	<cfscript>
 		// initialize the posterize filter
@@ -1053,13 +1053,13 @@
 	<cfparam name="arguments.fontDetails.fontName" default="serif">
 
 	<cfif arguments.fontDetails.fontFile neq "" and not fileExists(arguments.fontDetails.fontFile)>
-		<cfset retVal = throw("The specified font file #Chr(34)##arguments.inputFile##Chr(34)# could not be found on the server.")>
+		<cfset retVal = fckthrow("The specified font file #Chr(34)##arguments.inputFile##Chr(34)# could not be found on the server.")>
 		<cfreturn retVal>
 	</cfif>
 	<cftry>
 		<cfset rgb = getRGB(arguments.fontDetails.color)>
 		<cfcatch type="any">
-			<cfset retVal = throw("Invalid color #Chr(34)##arguments.fontDetails.color##Chr(34)#")>
+			<cfset retVal = fckthrow("Invalid color #Chr(34)##arguments.fontDetails.color##Chr(34)#")>
 			<cfreturn retVal>
 		</cfcatch>
 	</cftry>
@@ -1068,7 +1068,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset img = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -1159,7 +1159,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset originalImage = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -1174,7 +1174,7 @@
 		<cfif loadImage.errorCode is 0>
 			<cfset wmImage = loadImage.img>
 		<cfelse>
-			<cfset retVal = throw(loadImage.errorMessage)>
+			<cfset retVal = fckthrow(loadImage.errorMessage)>
 			<cfreturn retVal>
 		</cfif>
 	<cfelse>
@@ -1266,7 +1266,7 @@
 	<cfreturn retVal>
 </cffunction>
 
-<cffunction name="throw" access="private" output="false" returnType="struct">
+<cffunction name="fckthrow" access="private" output="false" returnType="struct">
 	<cfargument name="detail" type="string" required="yes">
 	<cfargument name="force" type="boolean" required="no" default="no">