Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] Add ternary operators to clean up code #797

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

[Fix] Add ternary operators to clean up code #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 13 additions & 52 deletions Essentials/src/com/earth2me/essentials/Essentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,8 @@ public ISettings getSettings()
public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
{
final File dataFolder = File.createTempFile("essentialstest", "");
if (!dataFolder.delete())
{
throw new IOException();
}
if (!dataFolder.mkdir())
{
throw new IOException();
}
if (!dataFolder.delete()) throw new IOException();
if (!dataFolder.mkdir()) throw new IOException()
i18n = new I18n(this);
i18n.onEnable();
i18n.updateLocale("en");
Expand Down Expand Up @@ -164,12 +158,8 @@ public void onEnable()
final PluginManager pm = getServer().getPluginManager();
for (Plugin plugin : pm.getPlugins())
{
if (plugin.getDescription().getName().startsWith("Essentials")
&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
{
LOGGER.log(Level.WARNING, tl("versionMismatch", plugin.getDescription().getName()));
}
if (plugin.getDescription().getName().startsWith("Essentials") && !plugin.getDescription().getVersion().equals(this.getDescription().getVersion()) && !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
LOGGER.log(Level.WARNING, tl("versionMismatch", plugin.getDescription().getName()));
}
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(getServer().getVersion());
if (versionMatch.matches())
Expand Down Expand Up @@ -228,14 +218,7 @@ public void onEnable()
}
catch (YAMLException exception)
{
if (pm.getPlugin("EssentialsUpdate") != null)
{
LOGGER.log(Level.SEVERE, tl("essentialsHelp2"));
}
else
{
LOGGER.log(Level.SEVERE, tl("essentialsHelp1"));
}
if (pm.getPlugin("EssentialsUpdate") != null) LOGGER.log(Level.SEVERE, tl("essentialsHelp2")); else LOGGER.log(Level.SEVERE, tl("essentialsHelp1"));
handleCrash(exception);
return;
}
Expand All @@ -250,21 +233,11 @@ public void onEnable()
execTimer.mark("RegHandler");

final MetricsStarter metricsStarter = new MetricsStarter(this);
if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
{
runTaskLaterAsynchronously(metricsStarter, 1);
}
else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
{
final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
pm.registerEvents(metricsListener, this);
}
if (metricsStarter.getStart() != null && metricsStarter.getStart() == true) runTaskLaterAsynchronously(metricsStarter, 1);
else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false) pm.registerEvents(new MetricsListener(this, metricsStarter), this);

final String timeroutput = execTimer.end();
if (getSettings().isDebug())
{
LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
}
if (getSettings().isDebug()) LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
}
catch (NumberFormatException ex)
{
Expand All @@ -287,10 +260,7 @@ private void registerListeners(PluginManager pm)
{
HandlerList.unregisterAll(this);

if (getSettings().isDebug())
{
LOGGER.log(Level.INFO, "Registering Listeners");
}
if (getSettings().isDebug()) LOGGER.log(Level.INFO, "Registering Listeners");

final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
pm.registerEvents(serverListener, this);
Expand Down Expand Up @@ -335,14 +305,8 @@ public void onDisable()
user.stopTransaction();
}
cleanupOpenInventories();
if (i18n != null)
{
i18n.onDisable();
}
if (backup != null)
{
backup.stopTask();
}
if (i18n != null) i18n.onDisable();
if (backup != null) backup.stopTask();
Economy.setEss(null);
Trade.closeLog();
getUserMap().getUUIDMap().forceWriteUUIDMap();
Expand Down Expand Up @@ -382,12 +346,9 @@ public List<String> onTabComplete(CommandSender sender,
try
{
TabCompleter completer = pc.getTabCompleter();
if (completer != null)
{
return completer.onTabComplete(sender, command, commandLabel, args);
}
if (completer != null) return completer.onTabComplete(sender, command, commandLabel, args);
}
catch (final Exception ex)
catch (final Exception ex)
{
Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
}
Expand Down