diff options
| author | Chris Ward <chris@chrisgward.com> | 2013-01-10 00:40:54 +1100 |
|---|---|---|
| committer | Chris Ward <chris@chrisgward.com> | 2013-01-10 00:40:54 +1100 |
| commit | e86adc48e6bd8d0ca517bdb94308a813b3a797cd (patch) | |
| tree | 38a8743ff5213d566604e9d0cb8f72011290c66c /EssentialsUpdate | |
| parent | f47c504202c2ee4959292f918841b1a90b53380a (diff) | |
| download | Essentials-e86adc48e6bd8d0ca517bdb94308a813b3a797cd.tar Essentials-e86adc48e6bd8d0ca517bdb94308a813b3a797cd.tar.gz Essentials-e86adc48e6bd8d0ca517bdb94308a813b3a797cd.tar.lz Essentials-e86adc48e6bd8d0ca517bdb94308a813b3a797cd.tar.xz Essentials-e86adc48e6bd8d0ca517bdb94308a813b3a797cd.zip | |
Unnecessary RegEx is unnecessary. Also storing Patterns in their classes for reuse.
437b01e3712e437371489e3c8714c62ea65c1913
c4e10da646a0066cff73b497cd283ae42cc775f0
Diffstat (limited to 'EssentialsUpdate')
| -rw-r--r-- | EssentialsUpdate/src/net/ess3/update/PastieUpload.java | 3 | ||||
| -rw-r--r-- | EssentialsUpdate/src/net/ess3/update/UpdateCheck.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/EssentialsUpdate/src/net/ess3/update/PastieUpload.java b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java index 9fba2351d..fba475b70 100644 --- a/EssentialsUpdate/src/net/ess3/update/PastieUpload.java +++ b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java @@ -12,6 +12,7 @@ import java.util.regex.Pattern; public class PastieUpload { private final transient PostToUrl connection; + private final Pattern pattern = Pattern.compile("(?s).*\\?key=([a-z0-9]+).*"); public PastieUpload() throws MalformedURLException { @@ -26,7 +27,7 @@ public class PastieUpload map.put("paste[body]", data); map.put("paste[restricted]", "1"); final String html = connection.send(map); - final Matcher matcher = Pattern.compile("(?s).*\\?key=([a-z0-9]+).*").matcher(html); + final Matcher matcher = pattern.matcher(html); if (matcher.matches()) { final String key = matcher.group(1); diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java index 51ebe9d1e..901696a14 100644 --- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java +++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java @@ -20,6 +20,7 @@ public class UpdateCheck private final static int CHECK_INTERVAL = 20 * 60 * 60 * 6; private final transient Plugin plugin; private transient boolean essentialsInstalled; + private final Pattern bukkitVersionPattern = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*"); public UpdateCheck(final Plugin plugin) { @@ -188,8 +189,7 @@ public class UpdateCheck private int getBukkitVersion() { - final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher( - plugin.getServer().getVersion()); + final Matcher versionMatch = bukkitVersionPattern.matcher(plugin.getServer().getVersion()); if (versionMatch.matches()) { return Integer.parseInt(versionMatch.group(1)); |