X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Ffcp%2FSimpleProgress.java;h=6399750dbd23e2cca3628521bcd4899ccb006f4f;hb=7e47f97402156f816cabf610ea0cdc80c851b9a2;hp=caf8065a074a87e0db9fbf24da09786b0d38ff46;hpb=321147d4c7eeeccd114a83225ef15fe1d13efa27;p=jSite2.git

diff --git a/src/net/pterodactylus/util/fcp/SimpleProgress.java b/src/net/pterodactylus/util/fcp/SimpleProgress.java
index caf8065..6399750 100644
--- a/src/net/pterodactylus/util/fcp/SimpleProgress.java
+++ b/src/net/pterodactylus/util/fcp/SimpleProgress.java
@@ -23,7 +23,7 @@ package net.pterodactylus.util.fcp;
  * A “SimpleProgress” message tells the client about the progress of a
  * {@link ClientGet} or {@link ClientPut} operation.
  * 
- * @author David Roden <droden@gmail.com>
+ * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
 public class SimpleProgress extends BaseMessage {
@@ -34,7 +34,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @param receivedMessage
 	 *            The received message
 	 */
-	public SimpleProgress(FcpMessage receivedMessage) {
+	SimpleProgress(FcpMessage receivedMessage) {
 		super(receivedMessage);
 	}
 
@@ -45,11 +45,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @return The total number of blocks
 	 */
 	public int getTotal() {
-		try {
-			return Integer.valueOf(getField("Total"));
-		} catch (NumberFormatException nfe1) {
-			return -1;
-		}
+		return FcpUtils.safeParseInt(getField("Total"));
 	}
 
 	/**
@@ -61,11 +57,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @return The number of required blocks
 	 */
 	public int getRequired() {
-		try {
-			return Integer.valueOf(getField("Required"));
-		} catch (NumberFormatException nfe1) {
-			return -1;
-		}
+		return FcpUtils.safeParseInt(getField("Required"));
 	}
 
 	/**
@@ -74,11 +66,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @return The number of failed blocks
 	 */
 	public int getFailed() {
-		try {
-			return Integer.valueOf(getField("Failed"));
-		} catch (NumberFormatException nfe1) {
-			return -1;
-		}
+		return FcpUtils.safeParseInt(getField("Failed"));
 	}
 
 	/**
@@ -88,11 +76,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @return The number of fatally failed blocks
 	 */
 	public int getFatallyFailed() {
-		try {
-			return Integer.valueOf(getField("FatallyFailed"));
-		} catch (NumberFormatException nfe1) {
-			return -1;
-		}
+		return FcpUtils.safeParseInt(getField("FatallyFailed"));
 	}
 
 	/**
@@ -101,11 +85,7 @@ public class SimpleProgress extends BaseMessage {
 	 * @return The number of succeeded blocks
 	 */
 	public int getSucceeded() {
-		try {
-			return Integer.valueOf(getField("Succeeded"));
-		} catch (NumberFormatException nfe1) {
-			return -1;
-		}
+		return FcpUtils.safeParseInt(getField("Succeeded"));
 	}
 
 	/**