From 2b3a9245efcef7924ed4189a190ca1db97eaeb05 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 14 Aug 2018 16:31:28 +0200
Subject: [PATCH] Cleanup (unified number parsing)

---
 .../openapi/util/text/StringUtilRt.java       | 36 +++++++------------
 .../openapi/util/text/StringUtil.java         |  4 +--
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java b/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
index d11ac0e0efbd..70d5a40d9f7e 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/text/StringUtilRt.java
@@ -171,39 +171,29 @@ public class StringUtilRt {
 
   @Contract(pure = true)
   public static int parseInt(@Nullable String string, int defaultValue) {
-    if (string == null) {
-      return defaultValue;
-    }
-
-    try {
-      return Integer.parseInt(string);
-    }
-    catch (Exception e) {
-      return defaultValue;
+    if (string != null) {
+      try { return Integer.parseInt(string); }
+      catch (NumberFormatException ignored) { }
     }
+    return defaultValue;
   }
 
   @Contract(pure = true)
   public static long parseLong(@Nullable String string, long defaultValue) {
-    if (string == null) {
-      return defaultValue;
-    }
-    try {
-      return Long.parseLong(string);
-    }
-    catch (Exception e) {
-      return defaultValue;
+    if (string != null) {
+      try { return Long.parseLong(string); }
+      catch (NumberFormatException ignored) { }
     }
+    return defaultValue;
   }
 
   @Contract(pure = true)
-  public static double parseDouble(String string, double defaultValue) {
-    try {
-      return Double.parseDouble(string);
-    }
-    catch (Exception e) {
-      return defaultValue;
+  public static double parseDouble(@Nullable String string, double defaultValue) {
+    if (string != null) {
+      try { return Double.parseDouble(string); }
+      catch (NumberFormatException ignored) { }
     }
+    return defaultValue;
   }
 
   @Contract(pure = true)
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 05bb05e49010..7173a4f558f6 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -3044,7 +3044,7 @@ public class StringUtil extends StringUtilRt {
   }
 
   @Contract(pure = true)
-  public static int parseInt(final String string, final int defaultValue) {
+  public static int parseInt(@Nullable String string, int defaultValue) {
     return StringUtilRt.parseInt(string, defaultValue);
   }
 
@@ -3054,7 +3054,7 @@ public class StringUtil extends StringUtilRt {
   }
 
   @Contract(pure = true)
-  public static double parseDouble(final String string, final double defaultValue) {
+  public static double parseDouble(@Nullable String string, double defaultValue) {
     return StringUtilRt.parseDouble(string, defaultValue);
   }