add IdentifierCollision

[jSite2.git] / src / net / pterodactylus / util / fcp / NodeHello.java

diff --git a/src/net/pterodactylus/util/fcp/NodeHello.java b/src/net/pterodactylus/util/fcp/NodeHello.java
index 8094013..8fdd863 100644 (file)
--- a/src/net/pterodactylus/util/fcp/NodeHello.java
+++ b/src/net/pterodactylus/util/fcp/NodeHello.java
@@ -3,7 +3,6 @@
  */
 package net.pterodactylus.util.fcp;
 
-
 /**
  * Some convenience methods for parsing a “NodeHello” message from the node.
  * 
@@ -18,7 +17,7 @@ public class NodeHello extends BaseMessage {
         * @param receivedMessage
         *            The received FCP message
         */
-       public NodeHello(FcpMessage receivedMessage) {
+       NodeHello(FcpMessage receivedMessage) {
                super(receivedMessage);
        }
 
@@ -40,13 +39,7 @@ public class NodeHello extends BaseMessage {
         *         number could not be determined
         */
        public int getBuildNumber() {
-               String build = getBuild();
-               try {
-                       return Integer.valueOf(build);
-               } catch (NumberFormatException nfe1) {
-                       /* ignore. */
-               }
-               return -1;
+               return FcpUtils.safeParseInt(getBuild());
        }
 
        /**
@@ -65,13 +58,7 @@ public class NodeHello extends BaseMessage {
         *         number of compression codecs could not be determined
         */
        public int getCompressionCodecsNumber() {
-               String compressionCodecs = getCompressionCodecs();
-               try {
-                       return Integer.valueOf(compressionCodecs);
-               } catch (NumberFormatException nfe1) {
-                       /* ignore. */
-               }
-               return -1;
+               return FcpUtils.safeParseInt(getCompressionCodecs());
        }
 
        /**
@@ -99,13 +86,7 @@ public class NodeHello extends BaseMessage {
         *         if the build number could not be determined
         */
        public int getExtBuildNumber() {
-               String extBuild = getExtBuild();
-               try {
-                       return Integer.valueOf(extBuild);
-               } catch (NumberFormatException nfe1) {
-                       /* ignore. */
-               }
-               return -1;
+               return FcpUtils.safeParseInt(getExtBuild());
        }
 
        /**
@@ -124,13 +105,7 @@ public class NodeHello extends BaseMessage {
         *         <code>-1</code> if the revision number could not be determined
         */
        public int getExtRevisionNumber() {
-               String extRevision = getExtRevision();
-               try {
-                       return Integer.valueOf(extRevision);
-               } catch (NumberFormatException nfe1) {
-                       /* ignore. */
-               }
-               return -1;
+               return FcpUtils.safeParseInt(getExtRevision());
        }
 
        /**
@@ -177,13 +152,7 @@ public class NodeHello extends BaseMessage {
         *         revision number coult not be determined
         */
        public int getRevisionNumber() {
-               String revision = getRevision();
-               try {
-                       return Integer.valueOf(revision);
-               } catch (NumberFormatException nfe1) {
-                       /* ignore. */
-               }
-               return -1;
+               return FcpUtils.safeParseInt(getRevision());
        }
 
        /**