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, 37 insertions, 34 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
index ab2fd605b..5a56cd9fc 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java
@@ -7,43 +7,46 @@ package org.anjocaido.groupmanager.utils;
 import java.util.Comparator;
 
 /**
- *
+ * 
  * @author gabrielcouto
  */
 public class StringPermissionComparator implements Comparator<String> {
 
-    @Override
-    public int compare(String permA, String permB) {
-        boolean ap = permA.startsWith("+");
-        boolean bp = permB.startsWith("+");
-        boolean am = permA.startsWith("-");
-        boolean bm = permB.startsWith("-");
-        if (ap && bp) {
-            return 0;
-        }
-        if (ap && !bp) {
-            return -1;
-        }
-        if (!ap && bp) {
-            return 1;
-        }
-        if (am && bm) {
-            return 0;
-        }
-        if (am && !bm) {
-            return -1;
-        }
-        if (!am && bm) {
-            return 1;
-        }
-        return permA.compareToIgnoreCase(permB);
-    }
-    private static StringPermissionComparator instance;
+	@Override
+	public int compare(String permA, String permB) {
 
-    public static StringPermissionComparator getInstance() {
-        if (instance == null) {
-            instance = new StringPermissionComparator();
-        }
-        return instance;
-    }
+		boolean ap = permA.startsWith("+");
+		boolean bp = permB.startsWith("+");
+		boolean am = permA.startsWith("-");
+		boolean bm = permB.startsWith("-");
+		if (ap && bp) {
+			return 0;
+		}
+		if (ap && !bp) {
+			return -1;
+		}
+		if (!ap && bp) {
+			return 1;
+		}
+		if (am && bm) {
+			return 0;
+		}
+		if (am && !bm) {
+			return -1;
+		}
+		if (!am && bm) {
+			return 1;
+		}
+		return permA.compareToIgnoreCase(permB);
+	}
+
+	private static StringPermissionComparator instance;
+
+	public static StringPermissionComparator getInstance() {
+
+		if (instance == null) {
+			instance = new StringPermissionComparator();
+		}
+		return instance;
+	}
 }