From 9767eba8d1da85749afa1b9dfb63ddfd3f5d5191 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Sun, 31 Jul 2011 16:43:00 +0530
Subject: Background task to periodically sync cluster-server mapping

---
 .../management/core/constants/GlusterConstants.java       |  2 ++
 .../storage/management/core/utils/GlusterCoreUtil.java    | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/com.gluster.storage.management.core')

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
index 51b53241..cbc51b10 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
@@ -38,6 +38,8 @@ public class GlusterConstants {
 	
 	public static final String ON = "on";
 	public static final String OFF = "off";
+	public static final String NONE = "none";
+	
 	public static final String STATS_PERIOD_1DAY = "1d";
 	public static final String STATS_PERIOD_1WEEK = "1w";
 	public static final String STATS_PERIOD_1MONTH = "1m";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
index 7b1eec36..e5624954 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -97,18 +97,17 @@ public class GlusterCoreUtil {
 			boolean caseInsensitive) {
 		return getEntity(entityList, searchEntity.getName(), caseInsensitive) != null;
 	}
+	
+	public static <T extends Entity> boolean containsEntityWithName(List<T> entityList, String searchName,
+			boolean caseInsensitive) {
+		return getEntity(entityList, searchName, caseInsensitive) != null;
+	}
 
 	public static <T extends Entity> T getEntity(Collection<T> entityList, String searchEntityName, boolean caseInsensitive) {
-		if (caseInsensitive) {
-			searchEntityName = searchEntityName.toUpperCase();
-		}
-
 		for (T entity : entityList) {
 			String nextEntityName = entity.getName();
-			if (caseInsensitive) {
-				nextEntityName = nextEntityName.toUpperCase();
-			}
-			if (nextEntityName.equals(searchEntityName)) {
+			if (nextEntityName.equals(searchEntityName)
+					|| (caseInsensitive && nextEntityName.equalsIgnoreCase(searchEntityName))) {
 				return entity;
 			}
 		}
-- 
cgit