Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-09 17:02:23 +01:00
Code Issues Projects Releases Wiki Activity

Move to switch statement (Java 7 sugar)

Browse Source
This commit is contained in:
vemacs 2015-06-03 14:03:26 -06:00
parent 65fc8a9c41
commit c03765803c
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
View File

@ -3,6 +3,7 @@ package com.earth2me.essentials.perm;
import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder; import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -10,8 +11,8 @@ import org.bukkit.plugin.Plugin;
public class GroupManagerHandler extends AbstractVaultHandler { public class GroupManagerHandler extends AbstractVaultHandler {
private final transient GroupManager groupManager; private final transient GroupManager groupManager;
public GroupManagerHandler(final Plugin permissionsPlugin) { public GroupManagerHandler() {
groupManager = ((GroupManager) permissionsPlugin); groupManager = ((GroupManager) Bukkit.getPluginManager().getPlugin("GroupManager"));
} }
@Override @Override

21
Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
View File

@ -110,18 +110,25 @@ public class PermissionsHandler implements IPermissionsHandler {
if (!(handler instanceof AbstractVaultHandler)) { if (!(handler instanceof AbstractVaultHandler)) {
AbstractVaultHandler vaultHandler; AbstractVaultHandler vaultHandler;
// No switch statements for Strings, this is Java 6 // No switch statements for Strings, this is Java 6
if (enabledPermsPlugin.equals("PermissionsEx")) { switch (enabledPermsPlugin) {
case "PermissionsEx":
vaultHandler = new PermissionsExHandler(); vaultHandler = new PermissionsExHandler();
} else if (enabledPermsPlugin.equals("GroupManager")) { break;
vaultHandler = new GroupManagerHandler(pluginManager.getPlugin(enabledPermsPlugin)); case "GroupManager":
} else if (enabledPermsPlugin.equals("SimplyPerms")) { vaultHandler = new GroupManagerHandler();
break;
case "SimplyPerms":
vaultHandler = new SimplyPermsHandler(); vaultHandler = new SimplyPermsHandler();
} else if (enabledPermsPlugin.equals("Privileges")) { break;
case "Privileges":
vaultHandler = new PrivilegesHandler(); vaultHandler = new PrivilegesHandler();
} else if (enabledPermsPlugin.equals("bPermissions")) { break;
case "bPermissions":
vaultHandler = new BPermissions2Handler(); vaultHandler = new BPermissions2Handler();
} else { break;
default:
vaultHandler = new GenericVaultHandler(); vaultHandler = new GenericVaultHandler();
break;
} }
if (enabledPermsPlugin.equals("")) { if (enabledPermsPlugin.equals("")) {
enabledPermsPlugin = "generic"; enabledPermsPlugin = "generic";

1
Essentials/src/com/earth2me/essentials/utils/SpawnerUtil.java
View File

@ -68,7 +68,6 @@ public class SpawnerUtil {
} }
public EntityType getEntityType(ItemStack is) { public EntityType getEntityType(ItemStack is) {
ItemMeta meta = is.getItemMeta();
if (useMeta) { if (useMeta) {
BlockStateMeta bsm = (BlockStateMeta) is.getItemMeta(); BlockStateMeta bsm = (BlockStateMeta) is.getItemMeta();
CreatureSpawner bs = (CreatureSpawner) bsm.getBlockState(); CreatureSpawner bs = (CreatureSpawner) bsm.getBlockState();