incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [25/50] git commit: cleaning up handling of exceptions. removing unnecessary exception declaration in FileUtils. removing try-catch that should not have been done in HttpHandler
Date Tue, 03 Jan 2012 18:57:09 GMT
cleaning up handling of exceptions. removing unnecessary exception declaration in FileUtils.
removing try-catch that should not have been done in HttpHandler


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/cd5bf619
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/cd5bf619
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/cd5bf619

Branch: refs/heads/master
Commit: cd5bf6195e3a78ac000f089664481f56a8956e07
Parents: 7c8db0e
Author: William Shen <williamshen@william-shens-macbook.local>
Authored: Wed Nov 23 10:52:43 2011 -0800
Committer: William Shen <williamshen@william-shens-macbook.local>
Committed: Wed Nov 23 10:52:43 2011 -0800

----------------------------------------------------------------------
 framework/src/com/phonegap/FileUtils.java   |    2 +-
 framework/src/com/phonegap/HttpHandler.java |   31 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/cd5bf619/framework/src/com/phonegap/FileUtils.java
----------------------------------------------------------------------
diff --git a/framework/src/com/phonegap/FileUtils.java b/framework/src/com/phonegap/FileUtils.java
index 00aa9ce..5f94856 100755
--- a/framework/src/com/phonegap/FileUtils.java
+++ b/framework/src/com/phonegap/FileUtils.java
@@ -531,7 +531,7 @@ public class FileUtils extends Plugin {
 	 * @throws NoModificationAllowedException
 	 * @throws InvalidModificationException
 	 */
-	private JSONObject moveDirectory(File srcDir, File destinationDir) throws JSONException,
FileExistsException, NoModificationAllowedException, InvalidModificationException {
+	private JSONObject moveDirectory(File srcDir, File destinationDir) throws JSONException,
InvalidModificationException {
 		// Renaming a file to an existing directory should fail
 		if (destinationDir.exists() && destinationDir.isFile()) {
 			throw new InvalidModificationException("Can't rename a file to a directory");

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/cd5bf619/framework/src/com/phonegap/HttpHandler.java
----------------------------------------------------------------------
diff --git a/framework/src/com/phonegap/HttpHandler.java b/framework/src/com/phonegap/HttpHandler.java
index 156d5a2..78b8df5 100755
--- a/framework/src/com/phonegap/HttpHandler.java
+++ b/framework/src/com/phonegap/HttpHandler.java
@@ -20,6 +20,7 @@ package com.phonegap;
 
 import java.io.EOFException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.http.HttpEntity;
@@ -56,27 +57,25 @@ public class HttpHandler {
 		return entity;
 	}
 	
-	private void writeToDisk(HttpEntity entity, String file) throws EOFException
+	private void writeToDisk(HttpEntity entity, String file) throws IllegalStateException, IOException
 	/**
 	 * writes a HTTP entity to the specified filename and location on disk
 	 */
 	{  
 		int i=0;
 		String FilePath="/sdcard/" + file;
-		try {
-			InputStream in = entity.getContent();
-			byte buff[] = new byte[1024];    
-			FileOutputStream out=
-				new FileOutputStream(FilePath);
-			do {
-				int numread = in.read(buff);
-				if (numread <= 0)
-                   	break;
-				out.write(buff, 0, numread);
-				i++;
-			} while (true);
-			out.flush();
-			out.close();	
-		} catch (Exception e) { e.printStackTrace(); }
+		InputStream in = entity.getContent();
+		byte buff[] = new byte[1024];    
+		FileOutputStream out=
+			new FileOutputStream(FilePath);
+		do {
+			int numread = in.read(buff);
+			if (numread <= 0)
+				break;
+			out.write(buff, 0, numread);
+			i++;
+		} while (true);
+		out.flush();
+		out.close();	
 	}
 }


Mime
View raw message