Merge pull request #73 from ementalo/3.0

2.9 -> 3.0 merge

Metrics has been disable atm.
Everything eeds a thorough going over, settings are prob in wrong place etc.

1 files changed, 73 insertions, 66 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
index 19db58851..e08d1db7d 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
@@ -7,81 +7,88 @@ package org.anjocaido.groupmanager.data;
 import java.util.Map;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class GroupVariables extends Variables implements Cloneable {
 
-    private Group owner;
+	private Group owner;
 
-    public GroupVariables(Group owner) {
-        super(owner);
-        this.owner = owner;
-        addVar("prefix", "");
-        addVar("suffix", "");
-        addVar("build", false);
-    }
+	public GroupVariables(Group owner) {
 
-    public GroupVariables(Group owner, Map<String, Object> varList) {
-        super(owner);
-        variables = varList;
-        if (variables.get("prefix") == null) {
-            variables.put("prefix", "");
-            owner.flagAsChanged();
-        }
-        //thisGrp.prefix = infoNode.get("prefix").toString();
+		super(owner);
+		this.owner = owner;
+		addVar("prefix", "");
+		addVar("suffix", "");
+		addVar("build", false);
+	}
 
-        if (variables.get("suffix") == null) {
-            variables.put("suffix", "");
-            owner.flagAsChanged();
-        }
-        //thisGrp.suffix = infoNode.get("suffix").toString();
+	public GroupVariables(Group owner, Map<String, Object> varList) {
 
-        if (variables.get("build") == null) {
-            variables.put("build", false);
-            owner.flagAsChanged();
-        }
-        this.owner = owner;
-    }
+		super(owner);
+		variables = varList;
+		if (variables.get("prefix") == null) {
+			variables.put("prefix", "");
+			owner.flagAsChanged();
+		}
+		//thisGrp.prefix = infoNode.get("prefix").toString();
 
-    /**
-     * A clone of all vars here.
-     * @return GroupVariables clone
-     */
-    protected GroupVariables clone(Group newOwner) {
-        GroupVariables clone = new GroupVariables(newOwner);
-        for (String key : variables.keySet()) {
-            clone.variables.put(key, variables.get(key));
-        }
-        newOwner.flagAsChanged();
-        return clone;
-    }
+		if (variables.get("suffix") == null) {
+			variables.put("suffix", "");
+			owner.flagAsChanged();
+		}
+		//thisGrp.suffix = infoNode.get("suffix").toString();
 
-    /**
-     * Remove a var from the list
-     * @param name
-     */
-    @Override
-    public void removeVar(String name) {
-        try {
-            this.variables.remove(name);
-        } catch (Exception e) {
-        }
-        if (name.equals("prefix")) {
-            addVar("prefix", "");
-        } else if (name.equals("suffix")) {
-            addVar("suffix", "");
-        } else if (name.equals("build")) {
-            addVar("build", false);
-        }
-        owner.flagAsChanged();
-    }
+		if (variables.get("build") == null) {
+			variables.put("build", false);
+			owner.flagAsChanged();
+		}
+		this.owner = owner;
+	}
 
-    /**
-     * @return the owner
-     */
-    @Override
-    public Group getOwner() {
-        return owner;
-    }
+	/**
+	 * A clone of all vars here.
+	 * 
+	 * @return GroupVariables clone
+	 */
+	protected GroupVariables clone(Group newOwner) {
+
+		GroupVariables clone = new GroupVariables(newOwner);
+		for (String key : variables.keySet()) {
+			clone.variables.put(key, variables.get(key));
+		}
+		newOwner.flagAsChanged();
+		return clone;
+	}
+
+	/**
+	 * Remove a var from the list
+	 * 
+	 * @param name
+	 */
+	@Override
+	public void removeVar(String name) {
+
+		try {
+			this.variables.remove(name);
+		} catch (Exception e) {
+		}
+		if (name.equals("prefix")) {
+			addVar("prefix", "");
+		} else if (name.equals("suffix")) {
+			addVar("suffix", "");
+		} else if (name.equals("build")) {
+			addVar("build", false);
+		}
+		owner.flagAsChanged();
+	}
+
+	/**
+	 * @return the owner
+	 */
+	@Override
+	public Group getOwner() {
+
+		return owner;
+	}
 }