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.

---
 .../org/anjocaido/groupmanager/data/DataUnit.java  | 26 +++++++++++++++++++---
 .../src/org/anjocaido/groupmanager/data/Group.java | 10 +++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index 7b027a94d..6f2fdd3b3 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -26,7 +26,11 @@ public abstract class DataUnit {
         this.name = name;
     }
 
-    /**
+    public DataUnit(String name) {
+    	this.name = name;
+	}
+
+	/**
      * Every group is matched only by their names and DataSources names.
      * @param o
      * @return true if they are equal. false if not.
@@ -64,7 +68,15 @@ public abstract class DataUnit {
     }
 
     public void flagAsChanged() {
-        GroupManager.logger.finest("DataSource: " + getDataSource().getName() + " - DataUnit: " + getName() + " flagged as changed!");
+    	WorldDataHolder testSource = getDataSource();
+    	String source = "";
+    	
+    	if (testSource == null)
+    		source = "GlobalGroups";
+    	else
+    		source = testSource.getName();
+    	
+        GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as changed!");
 // for(StackTraceElement st: Thread.currentThread().getStackTrace()){
 // GroupManager.logger.finest(st.toString());
 // }
@@ -76,7 +88,15 @@ public abstract class DataUnit {
     }
 
     public void flagAsSaved() {
-        GroupManager.logger.finest("DataSource: " + getDataSource().getName() + " - DataUnit: " + getName() + " flagged as saved!");
+    	WorldDataHolder testSource = getDataSource();
+    	String source = "";
+    	
+    	if (testSource == null)
+    		source = "GlobalGroups";
+    	else
+    		source = testSource.getName();
+    	
+        GroupManager.logger.finest("DataSource: " + source + " - DataUnit: " + getName() + " flagged as saved!");
         changed = false;
     }
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index 84d4fceed..09eabb43f 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -27,12 +27,22 @@ public class Group extends DataUnit implements Cloneable {
     private GroupVariables variables = new GroupVariables(this);
 
     /**
+     * Constructor for individual World Groups.
      *
      * @param name
      */
     public Group(WorldDataHolder source, String name) {
         super(source, name);
     }
+    
+    /**
+     *  Constructor for Global Groups.
+     *  
+     * @param name
+     */
+    public Group(String name) {
+        super(name);
+    }
 
     /**
      * Clone this group
-- 
cgit v1.2.3