Merge branch 'master' of git@github.com:Dhandapani/console

Conflicts:
	src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
	src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
	src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java

2 files changed, 38 insertions, 1 deletions

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 e5ed937e..1c413ca5 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
@@ -14,6 +14,9 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.layout.FillLayout;
@@ -46,6 +49,7 @@ import com.gluster.storage.management.core.model.Partition;
 import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import com.gluster.storage.management.core.model.VolumeOption;
 import com.gluster.storage.management.core.utils.NumberUtil;
 import com.gluster.storage.management.core.utils.StringUtil;
 import com.gluster.storage.management.core.utils.ValidationUtil;
@@ -347,7 +351,6 @@ public class VolumeSummaryView extends ViewPart {
 				}
 			}
 		});
-
 		GlusterDataModelManager.getInstance().addClusterListener(volumeChangedListener);
 		guiHelper.clearStatusMessage();
 		parent.update();
@@ -423,6 +426,39 @@ public class VolumeSummaryView extends ViewPart {
 		nfsLabel.setVisible(isNFSExported);
 	}
 
+//	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);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
index b7112c08..642198df 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
@@ -42,6 +42,7 @@ import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
 import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;