diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-07 13:17:24 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-07 13:17:24 +0530 |
| commit | bcef8a077f87b760fd04be847676e7ab9000f6f3 (patch) | |
| tree | 7e3094a3a1e69f7de40637624690433a5103f644 /src/com.gluster.storage.management.gui | |
| parent | 3c93882d99b55b4cae1474ac28d61782f986e9c2 (diff) | |
| parent | 1e74112c748f1f872f80d2e539d29f7894f8ddc1 (diff) | |
Merge branch 'master' of github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
Diffstat (limited to 'src/com.gluster.storage.management.gui')
| -rw-r--r-- | src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java index e6145997..63cf65ed 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java @@ -40,6 +40,7 @@ import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.ImageHyperlink; import com.gluster.storage.management.client.GlusterServersClient; +import com.gluster.storage.management.core.constants.GlusterConstants; import com.gluster.storage.management.core.model.ClusterListener; import com.gluster.storage.management.core.model.DefaultClusterListener; import com.gluster.storage.management.core.model.Disk; @@ -204,7 +205,7 @@ public abstract class AbstractDisksPage extends AbstractTableViewerPage<Disk> im public void linkActivated(HyperlinkEvent e) { Integer formatOption = new MessageDialog(getShell(), "Initialize Disk", GUIHelper.getInstance().getImage( IImageKeys.DISK), "Please choose the file system to Initialize the disk?", MessageDialog.QUESTION, new String[] { - "Cancel", "Ext3", "Ext4", "Xfs" }, -1).open(); + "Cancel", GlusterConstants.FSTYPE_EXT_3, GlusterConstants.FSTYPE_EXT_4, GlusterConstants.FSTYPE_XFS }, -1).open(); if (formatOption <= 0) { // By Cancel button(0) or Escape key(-1) return; @@ -212,18 +213,18 @@ public abstract class AbstractDisksPage extends AbstractTableViewerPage<Disk> im String fsType = null; if (formatOption == 1) { - fsType = "ext3"; + fsType = GlusterConstants.FSTYPE_EXT_3; } else if (formatOption == 2) { - fsType = "ext4"; + fsType = GlusterConstants.FSTYPE_EXT_4; } else if (formatOption == 3) { - fsType = "xfs"; + fsType = GlusterConstants.FSTYPE_XFS; } - updateStatus(DISK_STATUS.INITIALIZING, true); - GlusterServersClient serversClient = new GlusterServersClient(); serversClient.initializeDisk(disk.getServerName(), disk.getName(), fsType); + updateStatus(DISK_STATUS.INITIALIZING, true); + guiHelper.showProgressView(); new InitializeDiskJob(disk).schedule(); } |