From acf88eed2426497065f79e4029aeb13349054d96 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Mon, 28 Nov 2011 18:37:54 +0530 Subject: Warnings issue fixed. --- .../console/ApplicationActionBarAdvisor.java | 4 - .../console/GlusterDataModelManager.java | 88 ++-------------------- .../console/ServerTableLabelProvider.java | 2 - .../management/console/actions/AddBrickAction.java | 2 - .../console/actions/AddServerAction.java | 1 - .../console/actions/StartVolumeAction.java | 4 - .../console/actions/StopVolumeAction.java | 1 - .../management/console/dialogs/AddBrickPage.java | 1 - .../console/dialogs/BricksSelectionPage.java | 12 +-- .../console/dialogs/GlusterSupportDialog.java | 2 - .../management/console/dialogs/LoginDialog.java | 1 - .../management/console/jobs/DataSyncJob.java | 2 - .../management/console/utils/ChartUtil.java | 2 - .../console/utils/GlusterChartPalette.java | 12 +-- .../console/views/GlusterServerSummaryView.java | 76 +------------------ .../management/console/views/VolumeLogsView.java | 1 - .../console/views/VolumeSummaryView.java | 6 -- .../views/pages/DiskTreeContentProvider.java | 1 + .../management/console/views/pages/DisksPage.java | 7 -- .../console/views/pages/ServerDisksPage.java | 2 - .../console/views/pages/ServerLogsPage.java | 3 - 21 files changed, 17 insertions(+), 213 deletions(-) (limited to 'src/org.gluster.storage.management.console/src') 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 getDummyTasks() { - List taskInfoList = new ArrayList(); - - // 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 getDummyAlerts(Cluster cluster) { - List alerts = new ArrayList(); - 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 startedVolumes = new ArrayList(); List failedVolumes = new ArrayList(); 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 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 availableDevices = new ArrayList(); - private List selectedDevices = new ArrayList(); 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 disks, Disk searchDisk) { - for (Disk disk : disks) { - if (disk.getQualifiedName().equals(searchDisk.getQualifiedName())) { - return disks.indexOf(disk); - } - } - return -1; - } - private void createPage(List allDevice, List 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 colorLib = new ArrayList( 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 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 el = getEntries( ); el.clear( ); if ( iIndex < 0 ) { // a rotation version of palette-0, rataion pos is the negatvie // index. - ArrayList al = new ArrayList( ); + ArrayList al = new ArrayList( ); 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 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 timestamps, List 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 timestamps = new ArrayList(); - List data = new ArrayList(); - 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) 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 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. -- cgit