From 73abf39adee4778771256e9d9dd04fdd85fa4a74 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 23 Jul 2014 00:41:03 +0200 Subject: [PATCH] Redundant String usage The JSON method already converts it into an integer --- .../core/parsers/servers/PublicServers.java | 3 ++- .../executers/PublicServerExecuter.java | 21 +++---------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java b/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java index c3362ca..5bc57d7 100644 --- a/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java +++ b/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java @@ -44,10 +44,11 @@ public class PublicServers extends ServerParser { String name = String.valueOf(jsonObject.get("name")); String author = String.valueOf(jsonObject.get("author")); double version = Double.parseDouble(String.valueOf(jsonObject.get("version"))); + int serverID = Integer.parseInt(String.valueOf(jsonObject.get("id"))); ServerDescription desc = new ServerDescription(name, author, version); - SERVER_CACHE.put(desc, new PublicServerExecuter(name, line)); + SERVER_CACHE.put(desc, new PublicServerExecuter(name, serverID)); } br.close(); diff --git a/parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java index 79783cf..e5505d5 100644 --- a/parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java +++ b/parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java @@ -30,7 +30,7 @@ import java.net.URL; */ public class PublicServerExecuter extends ServerExecuter { private String serverName; - private String serverID; + private int serverID; private static AccountManager manager; @@ -43,7 +43,7 @@ public class PublicServerExecuter extends ServerExecuter { }; - public PublicServerExecuter(final String serverName, final String serverID) { + public PublicServerExecuter(final String serverName, final int serverID) { this.serverName = serverName; this.serverID = serverID; } @@ -51,16 +51,6 @@ public class PublicServerExecuter extends ServerExecuter { @Override public void run() { try { - try { - Integer.parseInt(this.serverID); - } catch (NumberFormatException e) { - UILog.log( - "Error", - "Failed to parse the server ID for the server provider, error: [Server ID is not an integer.]", - JOptionPane.ERROR_MESSAGE); - return; - } - ServerProviderInfo serverProviderInfo = new ServerProviderInfo(new URL(Configuration.GET_SERVER_PROVIDER_INFO + this.serverID), manager.getAccount().getUsername(), manager.getAccount().getPassword()); @@ -110,12 +100,7 @@ public class PublicServerExecuter extends ServerExecuter { .newInstance(); Context.getInstance(serverProvider).setProviderInfo(serverProviderInfo); super.finalize(serverProvider, this.serverName); - } catch (NoClassDefFoundError ignored) { - UILog.log( - "Error", - "Failed to load server provider, error: [This server provider is not compitable with this version of parabot]", - JOptionPane.ERROR_MESSAGE); - } catch (ClassNotFoundException ignored) { + } catch (NoClassDefFoundError | ClassNotFoundException ignored) { UILog.log( "Error", "Failed to load server provider, error: [This server provider is not compitable with this version of parabot]",