From 34ba8e89bc9e9be00a539bb07a8ddaca16f9e954 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Mon, 31 Oct 2011 08:34:07 +0000
Subject: Added Global Groups Defined in groupmanager/globalgroups.yml. Create
 groups in the yml with a g: prefix, then inherit in the worlds groups files.

---
 .../src/org/anjocaido/groupmanager/GroupManager.java  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index a450b4bee..b74a29977 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -47,7 +47,7 @@ import org.bukkit.plugin.java.JavaPlugin;
  */
 public class GroupManager extends JavaPlugin {
 
-    private File configFile;
+    //private File configFile;
     private File backupFolder;
     private Runnable commiter;
     private ScheduledThreadPoolExecutor scheduler;
@@ -58,6 +58,9 @@ public class GroupManager extends JavaPlugin {
     private boolean isReady = false;
     private static boolean isLoaded = false;
     protected GMConfiguration config;
+    
+    protected static GlobalGroups globalGroups;
+    
     private GMLoggerHandler ch;
     public static BukkitPermissions BukkitPermissions;
     private static  WorldListener WorldEvents;
@@ -92,8 +95,12 @@ public class GroupManager extends JavaPlugin {
         GroupManager.logger.addHandler(ch);
         logger.setLevel(Level.ALL);
         if (worldsHolder == null) {
+        	// Create the backup folder, if it doesn't exist.
             prepareFileFields();
+            // Load the config.yml
             prepareConfig();
+            // Load the global groups
+            globalGroups = new GlobalGroups(this);
             worldsHolder = new WorldsHolder(this);
         }
 
@@ -138,7 +145,7 @@ public class GroupManager extends JavaPlugin {
     }
 
     private void prepareFileFields() {
-        configFile = new File(this.getDataFolder(), "config.yml");
+        //configFile = new File(this.getDataFolder(), "config.yml");
         backupFolder = new File(this.getDataFolder(), "backup");
         if (!backupFolder.exists()) {
             getBackupFolder().mkdirs();
@@ -1537,6 +1544,9 @@ public class GroupManager extends JavaPlugin {
                     for (Group g : dataHolder.getGroupList()) {
                         auxString += g.getName() + ", ";
                     }
+                    for (Group g : getGlobalGroups().getGroupList()) {
+                        auxString += g.getName() + ", ";
+                    }
                     if (auxString.lastIndexOf(",") > 0) {
                         auxString = auxString.substring(0, auxString.lastIndexOf(","));
                     }
@@ -1796,4 +1806,9 @@ public class GroupManager extends JavaPlugin {
     public File getBackupFolder() {
         return backupFolder;
     }
+    
+    public static GlobalGroups getGlobalGroups() {
+    	return globalGroups;    	
+    	
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3