Done code audit fixes on console project

33 files changed, 46 insertions, 68 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
index fcbe3fcf..8d6c81da 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
@@ -65,7 +65,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if(event.getProperty().equals(PreferenceConstants.P_DATA_SYNC_INTERVAL)) {
-					JOB_INTERVAL = (Integer)event.getNewValue() * 1000l;
+					JOB_INTERVAL = (Integer)event.getNewValue() * 1000L;
 				}
 			}
 		};
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
index 83986745..e43bcbae 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
@@ -331,7 +331,7 @@ public class GlusterDataModelManager {
 			device.setStatus(status);
 			device.setType(DEVICE_TYPE.DATA);
 			for (ClusterListener listener : listeners) {
-				listener.serverChanged((GlusterServer) server, new Event(EVENT_TYPE.DEVICES_CHANGED, device));
+				listener.serverChanged(server, new Event(EVENT_TYPE.DEVICES_CHANGED, device));
 			}
 		}
 	}
@@ -676,7 +676,7 @@ public class GlusterDataModelManager {
 		cluster.addDiscoveredServer(server);
 		
 		for (ClusterListener listener : listeners) {
-			listener.discoveredServerAdded(server);;
+			listener.discoveredServerAdded(server);
 		}
 	}
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
index 2f49d2b3..d733701c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
@@ -20,7 +20,7 @@ package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
 
-import com.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
+import static com.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
 import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.console.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
index 2befda7d..3de3f945 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
@@ -114,7 +114,7 @@ public class DeleteVolumeAction extends AbstractMonitoredActionDelegate {
 					+ "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Volumes " + deletedVolumeNames + " deleted successfully!";
-			if (errorMessage != "") {
+			if (!errorMessage.equals("")) {
 				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volumes " + failedVolumes
 						+ " could not be deleted! [" + errorMessage + "]";
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
index 4816871e..db416c07 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
@@ -54,7 +54,7 @@ public class MigrateBrickAction extends AbstractActionDelegate {
 		action.setEnabled(false);
 		if (selectedEntity instanceof Brick) {
 			bricks = GUIHelper.getInstance().getSelectedEntities(getWindow(), Brick.class);
-			brick = (Brick) bricks.iterator().next();
+			brick = bricks.iterator().next();
 			action.setEnabled(brick != null);
 		}
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
index 5ae93ede..016ffb8b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
@@ -51,7 +51,7 @@ public class RebalanceVolumeAction extends AbstractActionDelegate {
 			// Add the task to model
 			TasksClient taskClient = new TasksClient();
 			TaskInfo taskInfo = taskClient.getTaskInfo(uri);
-			if (taskInfo != null && taskInfo instanceof TaskInfo) {
+			if (taskInfo != null) {
 				GlusterDataModelManager.getInstance().addTask(taskInfo);
 			}
 			showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!");
@@ -68,7 +68,7 @@ public class RebalanceVolumeAction extends AbstractActionDelegate {
 
 		Volume selectedVolume = guiHelper.getSelectedEntity(getWindow(), Volume.class);
 		if (selectedVolume != null) {
-			volume = (Volume) selectedVolume;
+			volume = selectedVolume;
 			action.setEnabled(true);
 		} else {
 			action.setEnabled(false);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
index 01d70b21..4b747294 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
@@ -69,7 +69,7 @@ public class RemoveBrickAction extends AbstractActionDelegate {
 		super.selectionChanged(action, selection);
 
 		action.setEnabled(false);
-		volume = (Volume) guiHelper.getSelectedEntity(window, Volume.class);
+		volume = guiHelper.getSelectedEntity(window, Volume.class);
 		if (volume != null) {
 			// a volume is selected on navigation tree. Let's check if the currently open view is volume disks view
 			IWorkbenchPart view = guiHelper.getActiveView();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
index 8f52657c..7f33828a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
@@ -32,10 +32,12 @@ import org.eclipse.jface.viewers.ISelection;
 import com.gluster.storage.management.client.GlusterServersClient;
 import com.gluster.storage.management.console.GlusterDataModelManager;
 import com.gluster.storage.management.console.utils.GUIHelper;
+import com.gluster.storage.management.console.utils.GlusterLogger;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
 
 public class RemoveServerAction extends AbstractMonitoredActionDelegate {
+	private static final GlusterLogger logger = GlusterLogger.getInstance();
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 
@@ -64,12 +66,12 @@ public class RemoveServerAction extends AbstractMonitoredActionDelegate {
 			GlusterServersClient client = new GlusterServersClient();
 			try {
 				client.removeServer(server.getName());
-				GlusterServer glusterServer = (GlusterServer) server;
+				GlusterServer glusterServer = server;
 				modelManager.removeGlusterServer(glusterServer);
 				successServers.add(server);
 			} catch (Exception e) {
 				if (!serverExists(server.getName())) {
-					modelManager.removeGlusterServer((GlusterServer) server);
+					modelManager.removeGlusterServer(server);
 				}
 				errMsg += "[" + server.getName() + "] : " + e.getMessage() + CoreConstants.NEWLINE;
 			}
@@ -83,12 +85,9 @@ public class RemoveServerAction extends AbstractMonitoredActionDelegate {
 		try {
 			GlusterServersClient client = new GlusterServersClient();
 			GlusterServer server = client.getGlusterServer(serverName);
-			if (server != null && server.getName().length() > 0) {
-				return true;
-			} else {
-				return false;
-			}
+			return (server != null && server.getName().length() > 0);
 		} catch (Exception e) {
+			logger.error("Error while getting server info", e);
 			return false;
 		}
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
index 183b1668..99a7c887 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
@@ -53,11 +53,6 @@ public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		volume = GUIHelper.getInstance().getSelectedEntity(getWindow(), Volume.class);
-		
-		if (volume instanceof Volume) {
-			action.setEnabled(volume.getOptions().size() > 0);
-		} else {
-			action.setEnabled(false);
-		}
+		action.setEnabled(volume.getOptions().size() > 0);
 	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
index 03cdc4e8..0df91ab8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
@@ -111,7 +111,7 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 					+ CoreConstants.NEWLINE + "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Volumes " + startedVolumes + " started successfully!";
-			if (errorMessage != "") {
+			if (!errorMessage.equals("")) {
 				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volumes " + failedVolumes
 						+ " failed to start! [" + errorMessage + "]";
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
index aa2a0c7c..31f8d164 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
@@ -123,7 +123,7 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 					+ "Error: [" + errorMessage + "]");
 		} else {
 			String info = "Volumes " + stoppedVolumes + " stopped successfully!";
-			if (errorMessage != "") {
+			if (!errorMessage.equals("")) {
 				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volumes " + failedVolumes
 						+ " failed to stop! [" + errorMessage + "]";
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
index 0e697b73..4c538be4 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
@@ -8,13 +8,11 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
 
 import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.actions.AbstractActionDelegate;
 import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.console.views.VolumeBricksView;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 
 public class VolumeLogRotateAction extends AbstractActionDelegate {
@@ -51,7 +49,7 @@ public class VolumeLogRotateAction extends AbstractActionDelegate {
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		super.selectionChanged(action, selection);
-		volume = (Volume) guiHelper.getSelectedEntity(window, Volume.class);
+		volume = guiHelper.getSelectedEntity(window, Volume.class);
 
 		if (volume != null) {
 			// a volume is selected on navigation tree. Let's check if the currently open view is volume bricks view
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
index 06da5f55..1e4de2ef 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
@@ -308,7 +308,7 @@ public class BricksSelectionPage extends Composite {
 	}
 
 	public List<Device> getChosenDevices() {
-		Object[] devicesArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
+		Object[] devicesArr = chosenBricksContentProvider.getElements(dualTableViewer);
 		if (devicesArr != null) {
 			List<Device> devices = new ArrayList<Device>();
 			for (Object device : devicesArr) {
@@ -320,7 +320,7 @@ public class BricksSelectionPage extends Composite {
 	}
 
 	public Set<Brick> getChosenBricks(String volumeName) {
-		Object[] bricksArr = (Object[]) chosenBricksContentProvider.getElements(dualTableViewer);
+		Object[] bricksArr = chosenBricksContentProvider.getElements(dualTableViewer);
 
 		if (bricksArr != null) {
 			Set<Brick> bricks = new HashSet<Brick>();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
index 4bbcb36b..4622dc84 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
@@ -51,7 +51,7 @@ import com.gluster.storage.management.client.UsersClient;
 import com.gluster.storage.management.console.Activator;
 import com.gluster.storage.management.console.GlusterDataModelManager;
 import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
+import static com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
 import com.gluster.storage.management.console.preferences.PreferenceConstants;
 import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.console.validators.StringRequiredValidator;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
index 0dc06f6d..dfa0b352 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
@@ -152,10 +152,10 @@ public class MigrateBrickPage1 extends WizardPage {
 	}
 
 	private void setPageDescription(String source, String target) {
-		if (source == null || source == "") {
+		if (source == null || source.equals("")) {
 			source = "From Brick";
 		}
-		if (target == null || target == "") {
+		if (target == null || target.equals("")) {
 			target = "To Brick";
 		}
 		setDescription("Migrate volume data from \"" + source + "\" to \"" + target + "\"");
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index 21c66b35..589b065f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -78,7 +78,7 @@ public class MigrateBrickWizard extends Wizard {
 			// To get the object
 			TasksClient taskClient = new TasksClient();
 			TaskInfo taskInfo = taskClient.getTaskInfo(uri);
-			if (taskInfo != null && taskInfo instanceof TaskInfo) {
+			if (taskInfo != null) {
 				// cluster.addTaskInfo(taskInfo);
 				String volumeName = taskInfo.getReference().split("#")[0];
 				modelManager.addTask(taskInfo);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
index 5a5f6046..42c5e782 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
@@ -93,11 +93,7 @@ public class SelectDisksDialog extends Dialog {
 		return new Point(1024, 600);
 	}
 
-	@Override
-	protected void cancelPressed() {
-		super.cancelPressed();
-	}
-
+	
 	@Override
 	protected void okPressed() {
 		if (this.getSelectedDevices().size() == 0) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
index 577cf733..2fc8de0e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
@@ -70,7 +70,7 @@ public class GlusterPreferencePage
 		
 		String[][] clusterNamesArr = new String[clusterNames.size()][2];
 		for(int i = 0; i < clusterNames.size(); i++) {
-			String clusterName = clusterNames.get(i);;
+			String clusterName = clusterNames.get(i);
 			clusterNamesArr[i][0] = clusterName;
 			clusterNamesArr[i][1] = clusterName;
 		}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
index 96a2ca2a..abc9ec2f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
@@ -50,7 +50,7 @@ public class DiscoveredServerView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (server == null) {
-			server = (Server) guiHelper.getSelectedEntity(getSite(), Server.class);
+			server = guiHelper.getSelectedEntity(getSite(), Server.class);
 		}
 		createSections(parent);
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
index b0cf33b2..7ba1a88a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
@@ -23,7 +23,7 @@ public class DisksView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (servers == null) {
-			servers = (EntityGroup<GlusterServer>)guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
+			servers = guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
 		}
 		
 		page = new DisksPage(parent, SWT.NONE, getSite(), getAllDisks(servers));
@@ -32,7 +32,7 @@ public class DisksView extends ViewPart {
 
 	private List<Disk> getAllDisks(EntityGroup<GlusterServer> servers) {
 		List<Disk> disks = new ArrayList<Disk>();
-		for(GlusterServer server : (List<GlusterServer>)servers.getEntities()) {
+		for(GlusterServer server : servers.getEntities()) {
 			disks.addAll(server.getDisks());
 		}
 		return disks;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
index 951b5a91..d3cd98e8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
@@ -46,7 +46,7 @@ public class GlusterServerDisksView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (server == null) {
-			server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
+			server = guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
 		}
 		page = new ServerDisksPage(parent, SWT.NONE, getSite(), server.getDisks());
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
index 660da5a3..33c85be2 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
@@ -40,7 +40,7 @@ public class GlusterServerLogsView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (server == null) {
-			server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
+			server = guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
 		}
 		
 		page = new ServerLogsPage(parent, SWT.NONE, server);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
index 03c38df7..08344f84 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
@@ -111,7 +111,7 @@ public class GlusterServerSummaryView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (server == null) {
-			server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
+			server = guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
 		}
 		setPartName("Summary");
 		createSections(parent);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
index b3879e4f..ad2f6331 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
@@ -70,7 +70,7 @@ public class GlusterServersSummaryView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (servers == null) {
-			servers = (EntityGroup<GlusterServer>)guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
+			servers = guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
 		}
 		setPartName("Summary");
 		createSections(parent);
@@ -170,7 +170,7 @@ public class GlusterServersSummaryView extends ViewPart {
 	
 	private int getServerCountByStatus(EntityGroup<GlusterServer> servers, SERVER_STATUS status) {
 		int count = 0;
-		for (GlusterServer server : (List<GlusterServer>)servers.getEntities()) {
+		for (GlusterServer server : servers.getEntities()) {
 			if (server.getStatus() == status) {
 				count++;
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
index 566befc3..66017990 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
@@ -50,7 +50,7 @@ public class GlusterServersView extends ViewPart implements IDoubleClickListener
 	@Override
 	public void createPartControl(Composite parent) {
 		if (servers == null) {
-			servers = (EntityGroup<GlusterServer>) guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
+			servers = guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
 		}
 		
 		page = new GlusterServersPage(getSite(), parent, SWT.NONE, servers);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
index 0c494945..33cd1f38 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
@@ -17,7 +17,7 @@ public class VolumeBricksView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (volume == null) {
-			volume = (Volume) guiHelper.getSelectedEntity(getSite(), Volume.class);
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
 		}
 
 		createPage(parent);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
index e6a5370f..7f35d332 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
@@ -17,7 +17,7 @@ public class VolumeLogsView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (volume == null) {
-			volume = (Volume) guiHelper.getSelectedEntity(getSite(), Volume.class);
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
 		}
 
 		createPage(parent);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
index 7be16f48..7129df5d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
@@ -17,7 +17,7 @@ public class VolumeOptionsView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (volume == null) {
-			volume = (Volume) guiHelper.getSelectedEntity(getSite(), Volume.class);
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
 		}
 
 		createPage(parent);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
index e271623d..78c7caf2 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -93,7 +93,7 @@ public class VolumeSummaryView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (volume == null) {
-			volume = (Volume) guiHelper.getSelectedEntity(getSite(), Volume.class);
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
 		}
 
 		this.parent = parent;
@@ -436,7 +436,7 @@ public class VolumeSummaryView extends ViewPart {
 					}
 					
 					// If no cifs users and removing cifs config, nothing to do
-					if (!(!cifsCheckbox.getSelection() && volume.getCifsUsers().toString() == "[]" && (cifsUsers
+					if (!(!cifsCheckbox.getSelection() && volume.getCifsUsers().toString().equals("[]") && (cifsUsers
 							.isEmpty() || cifsUsers.equals(""))) && userAction == 1) {
 						try {
 							vc.setCifsConfig(volume.getName(), cifsCheckbox.getSelection(), cifsUsers);
@@ -850,11 +850,7 @@ public class VolumeSummaryView extends ViewPart {
 	private boolean isvalidCifsUser() {
 		if (cifsCheckbox.getSelection()) {
 			String cifsUserList = cifsUsersText.getText().trim();
-			if (cifsUserList.length() == 0) {
-				return false;
-			} else {
-				return true;
-			}
+			return (cifsUserList.length() != 0);
 		}
 		validateCifsUsers();
 		return true;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
index 0c9ef92b..ced9335b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
@@ -50,7 +50,7 @@ public class VolumeView extends ViewPart {
 	@Override
 	public void createPartControl(Composite parent) {
 		if (server == null) {
-			server = (Server) guiHelper.getSelectedEntity(getSite(), Server.class);
+			server = guiHelper.getSelectedEntity(getSite(), Server.class);
 		}
 		createSections(parent, server, toolkit);
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
index 79ebd84c..b5604643 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
@@ -20,8 +20,6 @@
  */
 package com.gluster.storage.management.console.views;
 
-import java.util.List;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.GridData;
@@ -243,7 +241,7 @@ public class VolumesSummaryView extends ViewPart {
 
 	private int getVolumeCountByStatus(EntityGroup<Volume> volumes, VOLUME_STATUS status) {
 		int count = 0;
-		for (Volume volume : (List<Volume>) volumes.getEntities()) {
+		for (Volume volume : volumes.getEntities()) {
 			if (volume.getStatus() == status) {
 				count++;
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
index 43853752..417e67ea 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
@@ -270,7 +270,7 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 				TasksClient taskClient = new TasksClient();
 				TaskInfo taskInfo = taskClient.getTaskInfo(uri);
 				
-				if (taskInfo != null && taskInfo instanceof TaskInfo) {
+				if (taskInfo != null) {
 					modelManager.addTask(taskInfo);
 				}
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
index 4081d614..79b54aa1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
@@ -111,11 +111,7 @@ public class DiskTreeContentProvider implements ITreeContentProvider {
 	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
 	 */
 	public boolean hasChildren(Object element) {
-		if(element instanceof Disk && ((Disk)element).getPartitions().size() > 0) {
-			return true;
-		} else {
-			return false;
-		}
+		return (element instanceof Disk && ((Disk)element).getPartitions().size() > 0);
 	}