CIFS feature UI Changes

2 files changed, 32 insertions, 7 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
index cd2de837..9d74f71d 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
@@ -65,6 +65,7 @@ public class CreateVolumePage1 extends WizardPage {
 	private Text txtAccessControl;
 	private Volume volume = new Volume();
 	private Button btnNfs;
+	private Button btnCIFS;
 	private Button btnStartVolume;
 	private Link linkCustomize;
 	private List<Device> allDevices;
@@ -116,6 +117,9 @@ public class CreateVolumePage1 extends WizardPage {
 		createNasProtocolLabel(container);
 		createNasProtocolCheckboxes(container);
 		
+		createCifsUserLabel(container);
+		createCifsUserText(container);
+		
 		createAccessControlLabel(container);
 		createAccessControlText(container);
 
@@ -166,6 +170,20 @@ public class CreateVolumePage1 extends WizardPage {
 		lblAccessControl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
 		lblAccessControl.setText("Access Control: ");
 	}
+	
+	private void createCifsUserLabel(Composite container) {
+		Label lblAccessControl = new Label(container, SWT.NONE);
+		lblAccessControl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		lblAccessControl.setText("CIFS Users: ");
+	}
+	
+	private void createCifsUserText(Composite container) {
+		txtAccessControl = new Text(container, SWT.BORDER);
+		txtAccessControl.setText("testuser1,testuser2,testuser3");
+		GridData accessControlData = new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1);
+		accessControlData.widthHint = 300;
+		txtAccessControl.setLayoutData(accessControlData);		
+	}
 
 	private void createNasProtocolCheckboxes(Composite container) {
 		Button btnGluster = new Button(container, SWT.CHECK);
@@ -175,15 +193,21 @@ public class CreateVolumePage1 extends WizardPage {
 		createEmptyLabel(container);
 		
 		btnNfs = new Button(container, SWT.CHECK);
-		btnNfs.setEnabled(false);
+		btnNfs.setEnabled(true);
 		btnNfs.setSelection(true);
 		btnNfs.setText("NFS");
+		createEmptyLabel(container);
+		
+		btnCIFS = new Button(container, SWT.CHECK);
+		btnCIFS.setEnabled(true);
+		btnCIFS.setSelection(true);
+		btnCIFS.setText("CIFS");
 	}
 
 	private void createNasProtocolLabel(Composite container) {
 		Label lblNasProtocol = new Label(container, SWT.RIGHT);
 		lblNasProtocol.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblNasProtocol.setText("NAS Protocol: ");
+		lblNasProtocol.setText("Access Protocol: ");
 	}
 
 	private void createDisksCustomizeLink(Composite container) {
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 8c4d2572..ead83275 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
@@ -350,22 +350,23 @@ public class VolumeSummaryView extends ViewPart {
 	}
 
 	private void createNASProtocolField(Composite section) {
-		toolkit.createLabel(section, "NAS Protocols: ", SWT.NONE);
+		toolkit.createLabel(section, "Access Protocols: ", SWT.NONE);
 
 		Composite nasProtocolsComposite = toolkit.createComposite(section);
 		nasProtocolsComposite.setLayout(new FillLayout());
 
-		createCheckbox(nasProtocolsComposite, "Gluster", true);
+		createCheckbox(nasProtocolsComposite, "Gluster", true, false);
 		final Button nfsCheckBox = createCheckbox(nasProtocolsComposite, "NFS",
-				volume.getNASProtocols().contains(NAS_PROTOCOL.NFS));
+				volume.getNASProtocols().contains(NAS_PROTOCOL.NFS), true);
+		createCheckbox(nasProtocolsComposite, "CIFS", false, true);
 
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 		// createChangeLinkForNASProtocol(section, nfsCheckBox);
 	}
 
-	private Button createCheckbox(Composite parent, String label, boolean selected) {
+	private Button createCheckbox(Composite parent, String label, boolean selected, boolean enabled) {
 		final Button checkBox = toolkit.createButton(parent, label, SWT.CHECK);
-		checkBox.setEnabled(false);
+		checkBox.setEnabled(enabled);
 		checkBox.setSelection(selected);
 		return checkBox;
 	}