diff options
author | Dhandapani <dhandapani@gluster.com> | 2011-11-28 18:37:54 +0530 |
---|---|---|
committer | Dhandapani <dhandapani@gluster.com> | 2011-11-28 18:38:51 +0530 |
commit | acf88eed2426497065f79e4029aeb13349054d96 (patch) | |
tree | 135c3506671e38c0010762ef8675c6fce6bbf039 /src | |
parent | 5145756b18e65431328297c6a111162eca69860a (diff) |
Warnings issue fixed.
Diffstat (limited to 'src')
38 files changed, 33 insertions, 297 deletions
diff --git a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java index 46200c9a..f411985f 100644 --- a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java +++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java @@ -32,7 +32,6 @@ import org.gluster.storage.management.core.model.GlusterServer; import org.gluster.storage.management.core.model.ServerStats; import org.gluster.storage.management.core.response.FsTypeListResponse; import org.gluster.storage.management.core.response.GlusterServerListResponse; -import org.gluster.storage.management.core.response.StringListResponse; import org.gluster.storage.management.core.utils.GlusterCoreUtil; import com.sun.jersey.api.representation.Form; diff --git a/src/org.gluster.storage.management.console/plugin.xml b/src/org.gluster.storage.management.console/plugin.xml index f80c72e1..a19d6f0d 100644 --- a/src/org.gluster.storage.management.console/plugin.xml +++ b/src/org.gluster.storage.management.console/plugin.xml @@ -443,7 +443,6 @@ id="org.gluster.storage.management.console.actions.DeleteVolumeAction" label="&Delete Volume(s)" menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes" - pulldown="false" retarget="false" state="false" style="push" @@ -459,7 +458,6 @@ id="org.gluster.storage.management.console.actions.StopVolumeAction" label="S&top Volume(s)" menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes" - pulldown="false" retarget="false" state="false" style="push" @@ -475,7 +473,6 @@ id="org.gluster.storage.management.console.actions.StartVolumeAction" label="&Start Volume(s)" menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes" - pulldown="false" retarget="false" state="false" style="push" @@ -490,7 +487,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes" - pulldown="false" retarget="false" state="false" style="push" @@ -505,7 +501,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -543,7 +538,6 @@ id="org.gluster.storage.management.console.actions.LogRotateAction" label="L&og Rotate" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" state="true" style="push" toolbarPath="Normal" @@ -558,7 +552,6 @@ id="org.gluster.storage.management.console.actions.MigrateDiskAction" label="&Migrate Brick" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -579,7 +572,6 @@ id="org.gluster.storage.management.console.actions.DeleteVolumeAction" label="&Delete Volume" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -594,7 +586,6 @@ id="org.gluster.storage.management.console.actions.DownloadVolumeLogsAction" label="Download &Logs" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -610,7 +601,6 @@ id="org.gluster.storage.management.console.actions.ResetVolumeOptionsAction" label="Reset &Options" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -626,7 +616,6 @@ id="org.gluster.storage.management.console.actions.RebalanceVolumeAction" label="&Rebalance Volume" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -642,7 +631,6 @@ id="org.gluster.storage.management.console.actions.StopVolumeAction" label="S&top Volume" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -658,7 +646,6 @@ id="org.gluster.storage.management.console.actions.StartVolumeAction" label="&Start Volume" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -674,7 +661,6 @@ id="org.gluster.storage.management.console.actions.RemoveDiskAction" label="Remove Brick" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -690,7 +676,6 @@ id="org.gluster.storage.management.console.actions.AddDiskAction" label="&Add Brick" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -706,7 +691,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.volume/volume" - pulldown="false" retarget="false" state="false" style="push" @@ -721,7 +705,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.volume/volume" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -750,7 +733,6 @@ id="org.gluster.storage.management.console.actions.RemoveServerAction" label="&Remove Server(s)" menubarPath="org.gluster.storage.management.console.menu.servers/servers" - pulldown="false" retarget="false" state="false" style="push" @@ -765,7 +747,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.servers/servers" - pulldown="false" retarget="false" state="false" style="push" @@ -780,7 +761,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.servers/servers" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -809,7 +789,6 @@ id="org.gluster.storage.management.console.actions.RemoveServerAction" label="&Remove Server(s)" menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver" - pulldown="false" retarget="false" state="false" style="push" @@ -824,7 +803,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver" - pulldown="false" retarget="false" state="false" style="push" @@ -839,7 +817,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -867,7 +844,6 @@ id="org.gluster.storage.management.console.actions.AddServerAction" label="&Add Server(s)" menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers" - pulldown="false" retarget="false" state="false" style="push" @@ -882,7 +858,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers" - pulldown="false" retarget="false" state="false" style="push" @@ -897,7 +872,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -925,7 +899,6 @@ id="org.gluster.storage.management.console.actions.AddServerAction" label="&Add Server(s)" menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver" - pulldown="false" retarget="false" state="false" style="push" @@ -940,7 +913,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver" - pulldown="false" retarget="false" state="false" style="push" @@ -955,7 +927,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -984,7 +955,6 @@ id="org.gluster.storage.management.console.actions.Clear" label="&Clear Task" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1000,7 +970,6 @@ id="org.gluster.storage.management.console.actions.Commit" label="&Commit Task" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1016,7 +985,6 @@ id="org.gluster.storage.management.console.actions.Stop" label="&Stop Task" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1032,7 +1000,6 @@ id="org.gluster.storage.management.console.actions.Resume" label="&Resume Task" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1048,7 +1015,6 @@ id="org.gluster.storage.management.console.actions.Pause" label="&Pause Task" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1063,7 +1029,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.task/task" - pulldown="false" retarget="false" state="false" style="push" @@ -1091,7 +1056,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="Create &Volume" menubarPath="org.gluster.storage.management.console.menu.gluster/gluster" - pulldown="false" retarget="false" state="false" style="push" @@ -1106,7 +1070,6 @@ label="Add Server" menubarPath="org.gluster.storage.management.console.menu.gluster/gluster" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -1134,7 +1097,6 @@ id="org.gluster.storage.management.console.actions.RefreshDataAction" label="&Refresh" menubarPath="org.gluster.storage.management.console.menu.edit/edit" - pulldown="false" retarget="false" state="false" style="push" @@ -1149,7 +1111,6 @@ id="org.gluster.storage.management.console.actions.PreferencesAction" label="&Settings" menubarPath="org.gluster.storage.management.console.menu.edit/edit" - pulldown="false" retarget="false" state="false" style="push" @@ -1164,7 +1125,6 @@ id="org.gluster.storage.management.console.actions.TerminalAction" label="&Terminal" menubarPath="org.gluster.storage.management.console.menu.edit/edit" - pulldown="false" retarget="false" state="false" style="push" @@ -1179,7 +1139,6 @@ label="&Change Password" menubarPath="org.gluster.storage.management.console.menu.edit/edit" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -1193,7 +1152,6 @@ label="&Export Keys" menubarPath="org.gluster.storage.management.console.menu.edit/edit" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -1207,7 +1165,6 @@ label="&Import Keys" menubarPath="org.gluster.storage.management.console.menu.edit/edit" mode="FORCE_TEXT" - pulldown="false" retarget="false" state="false" style="push" @@ -1234,7 +1191,6 @@ id="org.gluster.storage.management.console.actions.SupportAction" label="&Support" menubarPath="help/helpEnd" - pulldown="false" retarget="false" state="true" style="push" @@ -1527,7 +1483,6 @@ id="org.gluster.storage.management.console.actions.MigrateDiskAction" label="&Migrate Disk" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1542,7 +1497,6 @@ id="org.gluster.storage.management.console.actions.DeleteVolumeAction" label="&Delete Volume" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1557,7 +1511,6 @@ id="org.gluster.storage.management.console.actions.RebalanceVolumeAction" label="&Rebalance Volume" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1572,7 +1525,6 @@ id="org.gluster.storage.management.console.actions.StopVolumeAction" label="S&top Volume" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1587,7 +1539,6 @@ id="org.gluster.storage.management.console.actions.StartVolumeAction" label="&Start Volume" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1606,7 +1557,6 @@ id="org.gluster.storage.management.console.actions.AddServerAction" label="&Add Server(s)" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1631,7 +1581,6 @@ id="org.gluster.storage.management.console.actions.CreateVolumeAction" label="&Create Volume" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" @@ -1645,7 +1594,6 @@ id="org.gluster.storage.management.console.actions.AddServerAction" label="&Add Server(s)" menubarPath="additions" - pulldown="false" retarget="false" state="false" style="push" diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java index df608eea..bd95cad1 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java @@ -31,7 +31,6 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; import org.eclipse.ui.application.ActionBarAdvisor; import org.eclipse.ui.application.IActionBarConfigurer; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.gluster.storage.management.console.utils.GUIHelper; /** @@ -39,7 +38,6 @@ import org.gluster.storage.management.console.utils.GUIHelper; * Each window will be populated with new actions. */ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { - private IWorkbenchWindow window; /* * Actions - important to allocate these only in makeActions, and then use them in the fill methods. This ensures * that the actions aren't recreated when fillActionBars is called with FILL_PROXY. @@ -48,14 +46,12 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { private IWorkbenchAction aboutAction; private IWorkbenchAction helpContentsAction; - private GUIHelper guiHelper = GUIHelper.getInstance(); public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { super(configurer); } protected void makeActions(final IWorkbenchWindow window) { - this.window = window; /* * Creates the actions and registers them. Registering is needed to ensure that key bindings work. The * corresponding commands keybindings are defined in the plugin.xml file. Registering also provides automatic diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java index 94d3c59c..bddb230e 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java @@ -35,30 +35,27 @@ import org.gluster.storage.management.console.utils.GlusterLogger; import org.gluster.storage.management.core.constants.GlusterConstants; import org.gluster.storage.management.core.exceptions.GlusterRuntimeException; import org.gluster.storage.management.core.model.Alert; +import org.gluster.storage.management.core.model.Alert.ALERT_TYPES; import org.gluster.storage.management.core.model.Brick; +import org.gluster.storage.management.core.model.Brick.BRICK_STATUS; import org.gluster.storage.management.core.model.Cluster; import org.gluster.storage.management.core.model.ClusterListener; import org.gluster.storage.management.core.model.Device; +import org.gluster.storage.management.core.model.Device.DEVICE_STATUS; +import org.gluster.storage.management.core.model.Device.DEVICE_TYPE; import org.gluster.storage.management.core.model.Disk; import org.gluster.storage.management.core.model.Event; +import org.gluster.storage.management.core.model.Event.EVENT_TYPE; import org.gluster.storage.management.core.model.GlusterDataModel; import org.gluster.storage.management.core.model.GlusterServer; import org.gluster.storage.management.core.model.Partition; import org.gluster.storage.management.core.model.Server; -import org.gluster.storage.management.core.model.Status; import org.gluster.storage.management.core.model.TaskInfo; -import org.gluster.storage.management.core.model.TaskStatus; import org.gluster.storage.management.core.model.Volume; -import org.gluster.storage.management.core.model.VolumeOptionInfo; -import org.gluster.storage.management.core.model.Alert.ALERT_TYPES; -import org.gluster.storage.management.core.model.Brick.BRICK_STATUS; -import org.gluster.storage.management.core.model.Device.DEVICE_STATUS; -import org.gluster.storage.management.core.model.Device.DEVICE_TYPE; -import org.gluster.storage.management.core.model.Event.EVENT_TYPE; -import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE; import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE; import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS; import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE; +import org.gluster.storage.management.core.model.VolumeOptionInfo; import org.gluster.storage.management.core.utils.GlusterCoreUtil; @@ -485,79 +482,6 @@ public class GlusterDataModelManager { cluster.setAggregatedNetworkStats(new GlusterServersClient().getAggregatedNetworkStats(networkStatsPeriod)); } - private List<TaskInfo> getDummyTasks() { - List<TaskInfo> taskInfoList = new ArrayList<TaskInfo>(); - - // Task #1 - TaskInfo taskInfo = new TaskInfo(); - taskInfo.setType(TASK_TYPE.BRICK_MIGRATE); - taskInfo.setName("Migrate Brick-music"); - taskInfo.setPauseSupported(true); - taskInfo.setStopSupported(true); - taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_PAUSE, ""))); - - taskInfo.getStatus().setMessage("Paused"); - taskInfo.setDescription("Migrate Brick on volume [Movies] from /export/adb/music to /export/sdc/music."); - taskInfoList.add(taskInfo); - - // Task #2 - taskInfo = new TaskInfo(); - taskInfo.setType(TASK_TYPE.DISK_FORMAT); - taskInfo.setName("Initialize disk [KVM-GVSA1:sdc]"); - taskInfo.setPauseSupported(false); - taskInfo.setStopSupported(false); - taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); - taskInfo.getStatus().setMessage("Format completed 80% ..."); - taskInfo.setDescription("Formatting disk [KVM-GVSA1:sdc]"); - taskInfoList.add(taskInfo); - - // Task #2 - taskInfo = new TaskInfo(); - taskInfo.setType(TASK_TYPE.VOLUME_REBALANCE); - taskInfo.setName("Rebalance volume [songs]"); - taskInfo.setPauseSupported(false); - taskInfo.setStopSupported(false); - taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); - taskInfo.getStatus().setMessage("Rebalance step1: layout fix in progress"); - taskInfo.setDescription("Rebalance volume [songs]"); - taskInfoList.add(taskInfo); - - return taskInfoList; - } - - private List<Alert> getDummyAlerts(Cluster cluster) { - List<Alert> alerts = new ArrayList<Alert>(); - for (Server server : cluster.getServers()) { - if (alerts.size() == 0) { - alerts.add(new Alert(ALERT_TYPES.CPU_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + " [93.42 %] in " - + server.getName())); - continue; - } - - if (alerts.size() == 1) { - alerts.add(new Alert(ALERT_TYPES.MEMORY_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + " [91.83 %] in " - + server.getName())); - continue; - } - - if (alerts.size() == 2) { - alerts.add(new Alert(ALERT_TYPES.OFFLINE_SERVERS_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_SERVERS_ALERT.ordinal()] + " " + server.getName())); - continue; - } - - if (alerts.size() == 3) { - alerts.add(new Alert(ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT, "songs", - Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT.ordinal()] - + " [KVM-GVSA4:/export/hdb4/songs] in volume [songs]")); - continue; - } - } - return alerts; - } - public void initializeAlerts(Cluster cluster) { AlertsManager alertsManager = new AlertsManager(cluster); alertsManager.buildAlerts(); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java index 1afbddac..f875d903 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java @@ -18,14 +18,12 @@ *******************************************************************************/ package org.gluster.storage.management.console; -import org.gluster.storage.management.console.utils.GUIHelper; import org.gluster.storage.management.console.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES; import org.gluster.storage.management.core.model.Server; import org.gluster.storage.management.core.utils.NumberUtil; public class ServerTableLabelProvider extends TableLabelProviderAdapter { - private GUIHelper guiHelper = GUIHelper.getInstance(); @Override public String getColumnText(Object element, int columnIndex) { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java index e67cf9ab..9ea3203b 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java @@ -24,14 +24,12 @@ package org.gluster.storage.management.console.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; -import org.gluster.storage.management.console.GlusterDataModelManager; import org.gluster.storage.management.console.dialogs.AddBrickWizard; import org.gluster.storage.management.core.model.Volume; public class AddBrickAction extends AbstractActionDelegate { private Volume volume; - private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance(); @Override public void dispose() { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java index 2a622384..ba2c1420 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java @@ -33,7 +33,6 @@ import org.gluster.storage.management.core.model.Server; public class AddServerAction extends AbstractMonitoredActionDelegate { - private GUIHelper guiHelper = GUIHelper.getInstance(); @Override protected void performAction(final IAction action, IProgressMonitor monitor) { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java index 4a8db975..8a7d777d 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java @@ -26,15 +26,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.osgi.internal.signedcontent.Base64; import org.gluster.storage.management.client.VolumesClient; -import org.gluster.storage.management.console.AlertsManager; import org.gluster.storage.management.console.GlusterDataModelManager; import org.gluster.storage.management.console.IImageKeys; import org.gluster.storage.management.console.utils.GUIHelper; import org.gluster.storage.management.core.constants.CoreConstants; import org.gluster.storage.management.core.model.Volume; -import org.gluster.storage.management.core.model.Alert.ALERT_TYPES; import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS; @@ -57,7 +54,6 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate { } VolumesClient vc = new VolumesClient(); - Volume newVolume = new Volume(); List<String> startedVolumes = new ArrayList<String>(); List<String> failedVolumes = new ArrayList<String>(); String errorMessage = ""; diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java index e1b67c1d..937d5b17 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java @@ -134,7 +134,6 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate { private void stopVolumes(List<Volume> volumes, Boolean force, IProgressMonitor monitor) { VolumesClient vc = new VolumesClient(); - Volume newVolume = new Volume(); stoppedVolumes.clear(); failedVolumes.clear(); errorMessage = ""; diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java index df42f12a..bc3fb510 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java @@ -43,7 +43,6 @@ import com.richclientgui.toolbox.duallists.IRemovableContentProvider; */ public class AddBrickPage extends WizardPage { private List<Device> availableDevices = new ArrayList<Device>(); - private List<Device> selectedDevices = new ArrayList<Device>(); private Volume volume = null; private BricksSelectionPage page = null; diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java index 99f6d201..4a33c4eb 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java @@ -41,9 +41,8 @@ import org.gluster.storage.management.console.TableLabelProviderAdapter; import org.gluster.storage.management.console.utils.EntityViewerFilter; import org.gluster.storage.management.console.utils.GUIHelper; import org.gluster.storage.management.core.model.Brick; -import org.gluster.storage.management.core.model.Device; -import org.gluster.storage.management.core.model.Disk; import org.gluster.storage.management.core.model.Brick.BRICK_STATUS; +import org.gluster.storage.management.core.model.Device; import org.gluster.storage.management.core.utils.NumberUtil; import com.richclientgui.toolbox.duallists.CustomTableDualListComposite; @@ -106,15 +105,6 @@ public class BricksSelectionPage extends Composite { }; } - private int indexOf(List<Disk> disks, Disk searchDisk) { - for (Disk disk : disks) { - if (disk.getQualifiedName().equals(searchDisk.getQualifiedName())) { - return disks.indexOf(disk); - } - } - return -1; - } - private void createPage(List<Device> allDevice, List<Device> selectedDevice, String volumeName) { setupPageLayout(); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java index 6eb414f5..75d1583a 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java @@ -44,7 +44,6 @@ public class GlusterSupportDialog extends FormDialog { private final GUIHelper guiHelper = GUIHelper.getInstance(); private FormToolkit toolkit; private ScrolledForm form; - private Composite parent; public GlusterSupportDialog(Shell shell) { super(shell); @@ -53,7 +52,6 @@ public class GlusterSupportDialog extends FormDialog { @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); - this.parent = newShell; newShell.setText("Gluster Management Console - Support Information"); } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java index ccbea44f..00b456ac 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java @@ -272,7 +272,6 @@ public class LoginDialog extends Dialog { // If the password is default, Let user to change the password if (password.equalsIgnoreCase(CoreConstants.DEFAULT_PASSWORD)) { - String oldSecurityTokeString = GlusterDataModelManager.getInstance().getSecurityToken(); ChangePasswordDialog dialog = new ChangePasswordDialog(getShell()); if (dialog.open() == Dialog.CANCEL) { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java index ee4daafe..2f704760 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.widgets.Display; import org.gluster.storage.management.console.GlusterDataModelManager; -import org.gluster.storage.management.console.utils.GlusterLogger; import org.gluster.storage.management.core.model.GlusterDataModel; @@ -32,7 +31,6 @@ import org.gluster.storage.management.core.model.GlusterDataModel; * */ public class DataSyncJob extends Job { - private static final GlusterLogger logger = GlusterLogger.getInstance(); public DataSyncJob(String name) { super(name); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java index b5d2a602..077593e0 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java @@ -201,7 +201,6 @@ public class ChartUtil { @Override public void linkActivated(HyperlinkEvent e) { super.linkActivated(e); - Composite section = ((Hyperlink) e.getSource()).getParent().getParent(); updatePreference(serverName); } @@ -222,7 +221,6 @@ public class ChartUtil { @Override protected void updatePreference(String serverName) { - ServerStats stats; if (serverName == null) { preferenceStore.setValue(PreferenceConstants.P_CPU_AGGREGATED_CHART_PERIOD, statsPeriod); } else { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java index 4c579103..314f1e3b 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java @@ -81,7 +81,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette private static ILogger logger = Logger.getLogger( "org.eclipse.birt.chart.engine/model.attribute.impl" ); //$NON-NLS-1$ - private static List colorLib = new ArrayList( 32 ); + private static List<ColorDefinition> colorLib = new ArrayList<ColorDefinition>( 32 ); static { colorLib.add( ColorDefinitionImpl.create ( 0, 1, 252) ); @@ -303,7 +303,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette * @param lst * @param pos */ - private static final void shiftList( final List lst, int pos ) + private static final void shiftList( final List<ColorDefinition> lst, int pos ) { int size = lst.size( ); @@ -322,7 +322,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette return; } - Object[] array = lst.toArray( ); + ColorDefinition[] array = lst.toArray(new ColorDefinition[0]); lst.clear( ); @@ -344,13 +344,13 @@ public class GlusterChartPalette extends EObjectImpl implements Palette */ public final void update( int iIndex ) { - final EList el = getEntries( ); + final EList<Fill> el = getEntries( ); el.clear( ); if ( iIndex < 0 ) { // a rotation version of palette-0, rataion pos is the negatvie // index. - ArrayList al = new ArrayList( ); + ArrayList<ColorDefinition> al = new ArrayList<ColorDefinition>( ); al.add( ColorDefinitionImpl.create( 80, 166, 218 ) ); al.add( ColorDefinitionImpl.create( 242, 88, 106 ) ); @@ -406,7 +406,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette */ public final void update( Fill f ) { - final EList el = getEntries( ); + final EList<Fill> el = getEntries( ); el.clear( ); el.add( f ); } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java index e5570ad9..11c8dd60 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java @@ -24,7 +24,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; -import org.eclipse.birt.chart.util.CDateTime; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -41,7 +40,6 @@ import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; @@ -49,7 +47,6 @@ import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.part.ViewPart; import org.gluster.storage.management.client.GlusterServersClient; @@ -61,21 +58,18 @@ import org.gluster.storage.management.console.NetworkInterfaceTableLabelProvider import org.gluster.storage.management.console.preferences.PreferenceConstants; import org.gluster.storage.management.console.toolbar.GlusterToolbarManager; import org.gluster.storage.management.console.utils.ChartUtil; -import org.gluster.storage.management.console.utils.ChartViewerComposite; +import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener; import org.gluster.storage.management.console.utils.GUIHelper; import org.gluster.storage.management.console.utils.GlusterLogger; -import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener; import org.gluster.storage.management.core.model.ClusterListener; import org.gluster.storage.management.core.model.DefaultClusterListener; import org.gluster.storage.management.core.model.Event; -import org.gluster.storage.management.core.model.GlusterServer; -import org.gluster.storage.management.core.model.ServerStats; -import org.gluster.storage.management.core.model.ServerStatsRow; import org.gluster.storage.management.core.model.Event.EVENT_TYPE; +import org.gluster.storage.management.core.model.GlusterServer; import org.gluster.storage.management.core.model.Server.SERVER_STATUS; +import org.gluster.storage.management.core.model.ServerStats; import org.gluster.storage.management.core.utils.NumberUtil; -import com.ibm.icu.util.Calendar; import com.richclientgui.toolbox.gauges.CoolGauge; public class GlusterServerSummaryView extends ViewPart { @@ -85,8 +79,6 @@ public class GlusterServerSummaryView extends ViewPart { private ScrolledForm form; private GlusterServer server; private ClusterListener clusterListener; - private static final int CHART_WIDTH = 350; - private static final int CHART_HEIGHT = 250; private static final GlusterLogger logger = GlusterLogger.getInstance(); private static final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore(); @@ -207,49 +199,6 @@ public class GlusterServerSummaryView extends ViewPart { preferenceStore.removePropertyChangeListener(propertyChangeListener); } - private void createAreaChart(Composite section, Calendar timestamps[], Double values[], String unit) { - ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit, "HH:mm", 100); - GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); - data.widthHint = CHART_WIDTH; - data.heightHint = CHART_HEIGHT; - chartViewerComposite.setLayoutData(data); - } - - private void extractChartData(ServerStats stats, List<Calendar> timestamps, List<Double> data, int dataColumnIndex) { - for(ServerStatsRow row : stats.getRows()) { - Double cpuUsage = row.getUsageData().get(dataColumnIndex); - if(!cpuUsage.isNaN()) { - timestamps.add(new CDateTime(row.getTimestamp() * 1000)); - data.add(cpuUsage); - } - } - } - - private void createAreaChartSection(ServerStats stats, String sectionTitle, int dataColumnIndex, String unit) { - List<Calendar> timestamps = new ArrayList<Calendar>(); - List<Double> data = new ArrayList<Double>(); - extractChartData(stats, timestamps, data, dataColumnIndex); - - if(timestamps.size() == 0) { - // Log a message saying no CPU stats available - return; - } - - Composite section = guiHelper.createSection(form, toolkit, sectionTitle, null, 1, false); - createAreaChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0]), unit); - -// Calendar[] timestamps = new Calendar[] { new CDateTime(1000l*1310468100), new CDateTime(1000l*1310468400), new CDateTime(1000l*1310468700), -// new CDateTime(1000l*1310469000), new CDateTime(1000l*1310469300), new CDateTime(1000l*1310469600), new CDateTime(1000l*1310469900), -// new CDateTime(1000l*1310470200), new CDateTime(1000l*1310470500), new CDateTime(1000l*1310470800), new CDateTime(1000l*1310471100), -// new CDateTime(1000l*1310471400), new CDateTime(1000l*1310471700), new CDateTime(1000l*1310472000), new CDateTime(1000l*1310472300), -// new CDateTime(1000l*1310472600), new CDateTime(1000l*1310472900), new CDateTime(1000l*1310473200), new CDateTime(1000l*1310473500), -// new CDateTime(1000l*1310473800) }; -// -// Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 89.31d, 57.39d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 21.43d, 16.45d, 14.86d, 15.27d }; -// createLineChart(section, timestamps, values, "%"); - createChartLinks(section, 4); - } - private void createMemoryUsageSection() { String memStatsPeriod = preferenceStore.getString(PreferenceConstants.P_MEM_CHART_PERIOD); memoryUsageSection = guiHelper.createSection(form, toolkit, "Memory Usage", null, 1, false); @@ -311,25 +260,6 @@ public class GlusterServerSummaryView extends ViewPart { networkChartPeriodLinkListener , -1, 5); } - private Composite createChartLinks(Composite section, int columnCount) { - GridLayout layout = new org.eclipse.swt.layout.GridLayout(columnCount, false); - layout.marginBottom = 0; - layout.marginTop = 0; - layout.marginLeft = (CHART_WIDTH - (50*columnCount)) / 2; - Composite graphComposite = toolkit.createComposite(section, SWT.NONE); - graphComposite.setLayout(layout); - GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); - data.widthHint = CHART_WIDTH; - graphComposite.setLayoutData(data); - - Label label1 = toolkit.createLabel(graphComposite, "1 day"); - Hyperlink link1 = toolkit.createHyperlink(graphComposite, "1 week", SWT.NONE); - Hyperlink link2 = toolkit.createHyperlink(graphComposite, "1 month", SWT.NONE); - Hyperlink link3 = toolkit.createHyperlink(graphComposite, "1 year", SWT.NONE); - - return graphComposite; - } - private void createSections(Composite parent) { String serverName = server.getName(); form = guiHelper.setupForm(parent, toolkit, "Server Summary [" + serverName + "]"); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java index eeffe6d5..1622dbfb 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java @@ -6,7 +6,6 @@ import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.part.ViewPart; import org.gluster.storage.management.console.utils.GUIHelper; import org.gluster.storage.management.console.views.pages.VolumeLogsPage; diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java index 2257c56f..5985c317 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java @@ -780,12 +780,6 @@ public class VolumeSummaryView extends ViewPart { lblStatusValue.redraw(); } - private void createTransportTypeField(Composite section) { - toolkit.createLabel(section, "Transport Type: ", SWT.NONE); - toolkit.createLabel(section, "" + volume.getTransportTypeStr(), SWT.NONE); - toolkit.createLabel(section, "", SWT.NONE); // dummy - } - private void createNumOfBricksField(Composite section) { toolkit.createLabel(section, "Number of Bricks: ", SWT.NONE); numberOfBricks = toolkit.createLabel(section, "" + volume.getNumOfBricks(), SWT.NONE); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java index a7518d3c..da50c6a6 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java @@ -40,6 +40,7 @@ public class DiskTreeContentProvider implements ITreeContentProvider { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @SuppressWarnings("unchecked") public Object[] getElements(Object inputElement) { return ((List<Disk>) inputElement).toArray(); } diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java index 21704d4c..54ef0a5d 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java @@ -34,17 +34,10 @@ public class DisksPage extends AbstractDisksPage { DISK, PARTITION, FREE_SPACE, TOTAL_SPACE, STATUS }; - private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Disk", "Partition", "Free Space (GB)", - "Total Space (GB)", "Status" }; - public DisksPage(final Composite parent, int style, IWorkbenchSite site, List<Disk> disks) { super(parent, style, site, disks); } - private String getDiskTableColumnDesc(DISK_TABLE_COLUMN_INDICES idx) { - return DISK_TABLE_COLUMN_NAMES[idx.ordinal()]; - } - @Override protected DeviceTableLabelProvider getLabelProvider() { return new DeviceTableLabelProvider(); diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java index da25e49f..ca9d1d0f 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java @@ -38,8 +38,6 @@ public class ServerDisksPage extends AbstractDisksPage { DISK, PARTITION, FREE_SPACE, TOTAL_SPACE, STATUS }; - private static final String[] SERVER_DISK_TABLE_COLUMN_NAMES = new String[] { "Disk", "Partition", "Free Space (GB)", - "Total Space (GB)", "Status" }; @Override protected int getStatusColumnIndex() { diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java index ec7c65c6..8dba3e7b 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java @@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; import org.gluster.storage.management.console.utils.GUIHelper; @@ -45,13 +44,11 @@ public class ServerLogsPage extends Composite { private final FormToolkit toolkit = new FormToolkit(Display.getCurrent()); private final GUIHelper guiHelper = GUIHelper.getInstance(); private Text text; - private Table table; public enum LOG_TABLE_COLUMN_INDICES { DATE, TIME, DISK, SEVERITY, MESSAGE }; - private static final String[] LOG_TABLE_COLUMN_NAMES = new String[] { "Date", "Time", "Disk", "Severity", "Message" }; /** * Create the composite. diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java index 0187eb87..ad75b2ff 100644 --- a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java +++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java @@ -4,18 +4,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.ByteArrayInputStream; import java.util.ArrayList; -import java.util.Collection; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; - -import org.gluster.storage.management.core.model.Device; -import org.gluster.storage.management.core.model.Disk; -import org.gluster.storage.management.core.model.Partition; -import org.gluster.storage.management.core.model.Server; import org.gluster.storage.management.core.model.Device.DEVICE_STATUS; import org.gluster.storage.management.core.model.Device.DEVICE_TYPE; import org.junit.After; diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java index db3dd177..d68ad9a1 100644 --- a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java +++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java @@ -145,7 +145,7 @@ public class FileUtilTest { throws Exception { File file = new File(""); - byte[] result = FileUtil.readFileAsByteArray(file); + FileUtil.readFileAsByteArray(file); } /** diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java index d39723c4..b6944894 100644 --- a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java +++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java @@ -107,7 +107,6 @@ public class StringUtilTest { public void testEnumToArray_1() throws Exception { - String[] expected = new String[] {"WINTER", "SPRING", "SUMMER", "FALL"}; List<String> result = StringUtil.enumToArray(Season.values()); assertNotNull(result); diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java index 58a11049..b086fe02 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java @@ -2,6 +2,7 @@ package org.gluster.storage.management.core.model; import org.eclipse.osgi.internal.signedcontent.Base64; +@SuppressWarnings("restriction") public class Alert extends Entity { public enum ALERT_TYPES { diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java index 927bbac4..8cb60379 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java @@ -30,7 +30,6 @@ import org.gluster.storage.management.core.utils.StringUtil; @XmlRootElement public class Entity extends PlatformObject implements Filterable { - private static final long serialVersionUID = 1L; protected String name; protected List<Entity> children = new ArrayList<Entity>(); diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java index 351e40e5..f50225d5 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java @@ -33,10 +33,12 @@ public class EntityGroup<T extends Entity> extends Entity { this.type = type; } + @SuppressWarnings("unchecked") public List<T> getEntities() { return (List<T>)children; } + @SuppressWarnings("unchecked") public void setEntities(List<T> entities) { children = (List<Entity>)entities; } diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java index 1bb3ddab..06c6d2d1 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java @@ -32,9 +32,9 @@ import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE; public class GlusterDummyModel { // private Server discoveredServer1, discoveredServer2, discoveredServer3, discoveredServer4, discoveredServer5; - private GlusterServer server1, server2, server3, server4, server5; + private GlusterServer server1, server2, server4, server5; private Volume volume1, volume2, volume3, volume4, volume5; - private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s3da, s4da, s5da, s5db; + private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s4da, s5da, s5db; private static List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>(); private static GlusterDummyModel instance = new GlusterDummyModel(); private GlusterDataModel model; @@ -57,7 +57,6 @@ public class GlusterDummyModel { double memoryInUse) { GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory, memoryInUse); - NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName); servers.add(glusterServer); return glusterServer; @@ -174,7 +173,6 @@ public class GlusterDummyModel { List<GlusterServer> servers = new ArrayList<GlusterServer>(); server1 = addGlusterServer(servers, cluster, "Server1", SERVER_STATUS.ONLINE, "eth0", 4, 56.3, 16, 8.4); server2 = addGlusterServer(servers, cluster, "Server2", SERVER_STATUS.ONLINE, "eth1", 8, 41.92, 32, 18.76); - server3 = addGlusterServer(servers, cluster, "Server3", SERVER_STATUS.OFFLINE, "eth0", -1, -1, -1, -1); server4 = addGlusterServer(servers, cluster, "Server4", SERVER_STATUS.ONLINE, "eth0", 1, 92.83, 4, 3.18); server5 = addGlusterServer(servers, cluster, "Server5", SERVER_STATUS.ONLINE, "inf0", 2, 87.24, 8, 7.23); diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java index 9ba7b886..4a24b3a7 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java @@ -200,6 +200,7 @@ public class Server extends Entity { * * @param server */ + @SuppressWarnings("unchecked") public void copyFrom(Server server) { setName(server.getName()); setParent(server.getParent()); diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java index 14eab4eb..fa3b84a1 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java @@ -21,7 +21,7 @@ package org.gluster.storage.management.core.response; import org.gluster.storage.management.core.model.Response; import org.gluster.storage.management.core.model.Status; -public abstract class AbstractResponse implements Response {
+public abstract class AbstractResponse implements Response<Object> {
private Status status;
@Override
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java index 55659d3c..242ed10e 100644 --- a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java +++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java @@ -84,7 +84,6 @@ public class ValidationUtil { } public static void main(String[] argv) { - String ip = "0.0.0.0"; // System.out.println("Is valid ip (" + ip + ")? " + isValidIp(ip)); String hostName = "myhost.q"; // System.out.println(isValidHostName(hostName)); diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java index ba197b92..1ba4b164 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java @@ -29,6 +29,7 @@ import javax.persistence.OneToMany; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.tool.hbm2ddl.SchemaExport; +@SuppressWarnings("deprecation") @Entity(name="cluster_info") public class ClusterInfo { @Id diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java index 3c9b3bd2..ae2196f3 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java @@ -37,7 +37,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.log4j.Logger; import org.gluster.storage.management.core.exceptions.GlusterValidationException; import org.gluster.storage.management.core.response.ClusterNameListResponse; import org.gluster.storage.management.gateway.data.ClusterInfo; @@ -56,7 +55,6 @@ import com.sun.jersey.spi.resource.Singleton; public class ClustersResource extends AbstractResource { @InjectParam private ClusterService clusterService; - private static final Logger logger = Logger.getLogger(ClustersResource.class); @GET @Produces(MediaType.APPLICATION_XML) diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java index 3063c23e..674e49e7 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java @@ -50,7 +50,6 @@ import com.sun.jersey.multipart.FormDataParam; @Path(RESOURCE_PATH_KEYS) public class KeysResource extends AbstractResource { private static final Logger logger = Logger.getLogger(KeysResource.class); - private ProcessUtil processUtil = new ProcessUtil(); @GET @Produces(MediaType.APPLICATION_OCTET_STREAM) @@ -78,17 +77,17 @@ public class KeysResource extends AbstractResource { } // Copy keys to temp folder - ProcessResult result = processUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile); + ProcessResult result = ProcessUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]"); } - result = processUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile); + result = ProcessUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]"); } // To compress the key files - result = processUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(), + result = ProcessUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(), SshUtil.PUBLIC_KEY_FILE.getName()); if (!result.isSuccess()) { throw new GlusterRuntimeException("Failed to compress key files! [" + result.getOutput() + "]"); @@ -96,7 +95,7 @@ public class KeysResource extends AbstractResource { // To remove the copied key files try { - processUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any + ProcessUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any } catch (Exception e) { logger.warn(e.toString()); } @@ -125,7 +124,7 @@ public class KeysResource extends AbstractResource { } } // Extract SSH private and public key files. - ProcessResult output = processUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C", + ProcessResult output = ProcessUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C", SshUtil.SSH_AUTHORIZED_KEYS_DIR_LOCAL); uploadedFile.delete(); if (!output.isSuccess()) { diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java index 58482958..df60e3cf 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java @@ -32,7 +32,6 @@ import org.gluster.storage.management.core.exceptions.GlusterValidationException import org.gluster.storage.management.core.model.GlusterServer; import org.gluster.storage.management.core.model.Server; import org.gluster.storage.management.core.model.Server.SERVER_STATUS; -import org.gluster.storage.management.core.response.StringListResponse; import org.gluster.storage.management.core.utils.GlusterCoreUtil; import org.gluster.storage.management.core.utils.ProcessUtil; import org.gluster.storage.management.core.utils.StringUtil; diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java index f65c5640..12e986b5 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java @@ -37,12 +37,10 @@ import org.gluster.storage.management.core.constants.CoreConstants; import org.gluster.storage.management.core.exceptions.ConnectionException; import org.gluster.storage.management.core.exceptions.GlusterRuntimeException; import org.gluster.storage.management.core.model.Server; -import org.gluster.storage.management.core.model.Status; import org.gluster.storage.management.core.model.Server.SERVER_STATUS; -import org.gluster.storage.management.core.response.StringListResponse; +import org.gluster.storage.management.core.model.Status; import org.gluster.storage.management.core.utils.ProcessResult; import org.gluster.storage.management.core.utils.ProcessUtil; -import org.gluster.storage.management.gateway.services.GlusterInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; @@ -333,6 +331,7 @@ public class ServerUtil { * Input string * @return Object of given expected class */ + @SuppressWarnings("unchecked") public <T> T unmarshal(Class<T> expectedClass, String input) { try { // create JAXB context and instantiate marshaller |