summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-07-28 06:35:57 -0700
committerShireesh Anjal <anjalshireesh@gmail.com>2011-07-28 06:35:57 -0700
commit7aacb647a5c06c845835dd7b4927939806bb6dc6 (patch)
treec06243bb1e3f6f9e59742b3d4e3c857f75d04be0 /src
parent7287ce7a7500629cede5446b30b2d4b9c8ff930e (diff)
parente7368403374ce9ab2156e093279ced8af159d22f (diff)
Merge pull request #164 from Dhandapani/master
Bug 3258 - GUI shows as NFS off even though it's on when the volume created from the backend
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java6
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java33
2 files changed, 3 insertions, 36 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index f224bd5a..0cb6e972 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -193,10 +193,10 @@ public class Volume extends Entity {
@XmlTransient
public boolean isNfsEnabled() {
String nfsDisabled = options.get(OPTION_NFS_DISABLE);
- if(nfsDisabled == null || nfsDisabled.equalsIgnoreCase(GlusterConstants.ON)) {
- return false;
- } else {
+ if(nfsDisabled == null || nfsDisabled.equalsIgnoreCase(GlusterConstants.OFF)) {
return true;
+ } else {
+ return false;
}
}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index a3d8aca7..20439aca 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -440,39 +440,6 @@ public class VolumeSummaryView extends ViewPart {
totalDiskSpace.setText("" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024)));
}
-// private void createChangeLinkForNASProtocol(Composite section, final Button nfsCheckBox) {
-// final Hyperlink nasChangeLink = toolkit.createHyperlink(section, "change", SWT.NONE);
-// nasChangeLink.addHyperlinkListener(new HyperlinkAdapter() {
-//
-// private void finishEdit() {
-// // TODO: Update value to back-end
-// if (nfsCheckBox.getSelection()) {
-// volume.enableNFS("");
-// } else {
-// volume.disableNFS("");
-// }
-// nfsCheckBox.setEnabled(false);
-// nasChangeLink.setText("change");
-// }
-//
-// private void startEdit() {
-// nfsCheckBox.setEnabled(true);
-// nasChangeLink.setText("update");
-// }
-//
-// @Override
-// public void linkActivated(HyperlinkEvent e) {
-// if (nfsCheckBox.isEnabled()) {
-// // we were already in edit mode.
-// finishEdit();
-// } else {
-// // Get in to edit mode
-// startEdit();
-// }
-// }
-// });
-// }
-
private double getDiskSize(String serverName, String deviceName) {
double diskSize = 0;
GlusterServer server = cluster.getServer(serverName);