2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-06 00:37:52 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Redundant String usage

Browse Source 
The JSON method already converts it into an integer
This commit is contained in:
JKetelaar
2014-07-23 00:41:03 +02:00
parent 1dea72621e
commit 73abf39ade
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java
+2 -1
View File
@@ -44,10 +44,11 @@ public class PublicServers extends ServerParser {
String name = String.valueOf(jsonObject.get("name")); String name = String.valueOf(jsonObject.get("name"));
String author = String.valueOf(jsonObject.get("author")); String author = String.valueOf(jsonObject.get("author"));
double version = Double.parseDouble(String.valueOf(jsonObject.get("version"))); double version = Double.parseDouble(String.valueOf(jsonObject.get("version")));
int serverID = Integer.parseInt(String.valueOf(jsonObject.get("id")));
ServerDescription desc = new ServerDescription(name, ServerDescription desc = new ServerDescription(name,
author, version); author, version);
SERVER_CACHE.put(desc, new PublicServerExecuter(name, line)); SERVER_CACHE.put(desc, new PublicServerExecuter(name, serverID));
} }
br.close(); br.close();
parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java
+3 -18
View File
@@ -30,7 +30,7 @@ import java.net.URL;
*/ */
public class PublicServerExecuter extends ServerExecuter { public class PublicServerExecuter extends ServerExecuter {
private String serverName; private String serverName;
private String serverID; private int serverID;
private static AccountManager manager; 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.serverName = serverName;
this.serverID = serverID; this.serverID = serverID;
} }
@@ -51,16 +51,6 @@ public class PublicServerExecuter extends ServerExecuter {
@Override @Override
public void run() { public void run() {
try { 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 ServerProviderInfo serverProviderInfo = new ServerProviderInfo(new URL(Configuration.GET_SERVER_PROVIDER_INFO
+ this.serverID), manager.getAccount().getUsername(), manager.getAccount().getPassword()); + this.serverID), manager.getAccount().getUsername(), manager.getAccount().getPassword());
@@ -110,12 +100,7 @@ public class PublicServerExecuter extends ServerExecuter {
.newInstance(); .newInstance();
Context.getInstance(serverProvider).setProviderInfo(serverProviderInfo); Context.getInstance(serverProvider).setProviderInfo(serverProviderInfo);
super.finalize(serverProvider, this.serverName); super.finalize(serverProvider, this.serverName);
} catch (NoClassDefFoundError 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]",
JOptionPane.ERROR_MESSAGE);
} catch (ClassNotFoundException ignored) {
UILog.log( UILog.log(
"Error", "Error",
"Failed to load server provider, error: [This server provider is not compitable with this version of parabot]", "Failed to load server provider, error: [This server provider is not compitable with this version of parabot]",