More cleanup and refactoring - get ready to split out core

src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java

@@ -0,0 +1,31 @@
+package org.dynmap.bukkit.permissions;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.dynmap.Log;
+
+public class BukkitPermissions implements PermissionProvider {
+    String name;
+
+    public static BukkitPermissions create(String name) {
+        try {
+            Class.forName("org.bukkit.permissions.PermissibleBase");    /* See if class exists */
+        } catch (ClassNotFoundException cnfx) {
+            return null;
+        }
+        Log.info("Using Bukkit Permissions (superperms) for access control");
+        return new BukkitPermissions(name);
+    }
+
+    public BukkitPermissions(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean has(CommandSender sender, String permission) {
+        Player player = sender instanceof Player ? (Player) sender : null;
+        return player != null
+                ? player.hasPermission(name + "." + permission) || player.hasPermission(name + ".*")
+                : true;
+    }
+}

src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java

@@ -0,0 +1,41 @@
+package org.dynmap.bukkit.permissions;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.dynmap.Log;
+
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
+
+public class NijikokunPermissions implements PermissionProvider {
+    String name;
+    PermissionHandler permissions;
+    Plugin plugin;
+    
+    public static NijikokunPermissions create(Server server, String name) {
+        Plugin permissionsPlugin = server.getPluginManager().getPlugin("Permissions");
+        if (permissionsPlugin == null)
+            return null;
+        
+        server.getPluginManager().enablePlugin(permissionsPlugin);
+        Log.info("Using Permissions " + permissionsPlugin.getDescription().getVersion() + " for access control");
+        return new NijikokunPermissions(permissionsPlugin, name);
+    }
+
+    public NijikokunPermissions(Plugin permissionsPlugin, String name) {
+        this.name = name;
+        plugin = permissionsPlugin;
+    }
+
+    @Override
+    public boolean has(CommandSender sender, String permission) {
+        if(permissions == null)
+            permissions = ((Permissions)plugin).getHandler();
+        Player player = sender instanceof Player ? (Player) sender : null;
+        return player != null
+                ? permissions.has(player, name + "." + permission) || permissions.has(player, name + ".*")
+                : true;
+    }
+}

src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java

@@ -0,0 +1,27 @@
+package org.dynmap.bukkit.permissions;
+
+import java.util.HashSet;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.dynmap.Log;
+
+public class OpPermissions implements PermissionProvider {
+    public HashSet<String> opCommands = new HashSet<String>();
+
+    public OpPermissions(String[] opCommands) {
+        for (String opCommand : opCommands) {
+            this.opCommands.add(opCommand);
+        }
+        Log.info("Using ops.txt for access control");
+    }
+
+    @Override
+    public boolean has(CommandSender sender, String permission) {
+        return (sender instanceof Player)
+            ? opCommands.contains(permission)
+                ? ((Player) sender).isOp()
+                : true
+            : true;
+    }
+}

src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java

@@ -0,0 +1,7 @@
+package org.dynmap.bukkit.permissions;
+
+import org.bukkit.command.CommandSender;
+
+public interface PermissionProvider {
+    boolean has(CommandSender sender, String permission);
+}