conflict fixes

8 files changed, 56 insertions, 34 deletions

diff --git a/src/com.gluster.storage.management.console/plugin.properties b/src/com.gluster.storage.management.console/plugin.properties
index 6a93e73d..4ef7da70 100644
--- a/src/com.gluster.storage.management.console/plugin.properties
+++ b/src/com.gluster.storage.management.console/plugin.properties
@@ -3,4 +3,5 @@ Version: 1.0.0\n\n\
 Copyright (c) 2011 Gluster, Inc.\n\ 
 Visit http://www.gluster.com/\n\n\
 This product includes software developed by the\n\
-Eclipse Foundation http://eclipse.org/
\ No newline at end of file
+Eclipse Foundation http://eclipse.org/\n\
+RichClientGUI http://www.richclientgui.com/
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 675b7e52..9cadd537 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -175,15 +175,6 @@
             name="Tasks"
             restorable="true">
       </view>
-      <view
-            allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="org.eclipse.tm.internal.terminal.view.TerminalView"
-            icon="icons/tango/16x16/utilities-terminal.png"
-            id="com.gluster.storage.management.console.views.TerminalView"
-            name="Terminal"
-            restorable="true">
-      </view>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -1419,7 +1410,7 @@
          </view>
          <view
                closeable="true"
-               id="com.gluster.storage.management.console.views.TerminalView"
+               id="org.eclipse.tm.terminal.view.TerminalView"
                minimized="false"
                moveable="false"
                ratio="0.60f"
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TerminalView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java
index d99ac513..9dce2539 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TerminalView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package com.gluster.storage.management.console;
 
 /**
- * 
+ *
  */
-public class TerminalView extends org.eclipse.tm.internal.terminal.view.TerminalView {
-	public static final String ID = TerminalView.class.getName();
+public class ConsoleConstants {
+	public static final String TERMINAL_VIEW_ID = "org.eclipse.tm.terminal.view.TerminalView";
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
index 8fa27087..d7d98d24 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
@@ -362,7 +362,6 @@ public class CreateVolumePage1 extends WizardPage {
 		}
 		
 		addVolumeBricks();
-		
 		return volume;
 	}
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
index bfb29ee1..498723d9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
@@ -28,6 +28,7 @@ import com.gluster.storage.management.console.utils.GlusterLogger;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
 public class CreateVolumeWizard extends Wizard {
 	private static final String title = "Gluster Management Console - Create Volume";
@@ -51,8 +52,17 @@ public class CreateVolumeWizard extends Wizard {
 		
 		try {
 			volumesClient.createVolume(newVolume);
+
+			// Set proper volume type before assign to model
+			VOLUME_TYPE volumetype = newVolume.getVolumeType();
+			if (volumetype == VOLUME_TYPE.REPLICATE && newVolume.getBricks().size() > newVolume.getReplicaCount()) {
+				newVolume.setVolumeType(VOLUME_TYPE.DISTRIBUTED_REPLICATE);
+			} else if (volumetype == VOLUME_TYPE.STRIPE && newVolume.getBricks().size() > newVolume.getStripeCount()) {
+				newVolume.setVolumeType(VOLUME_TYPE.DISTRIBUTED_STRIPE);
+			}
+
 			handleSuccess(newVolume, volumesClient);
-		} catch(Exception e) {
+		} catch (Exception e) {
 			String errMsg = e.getMessage();
 			// the error could be in to post-volume-create processing. check if this is the case.
 			if (volumesClient.volumeExists(newVolume.getName())) {
@@ -62,7 +72,7 @@ public class CreateVolumeWizard extends Wizard {
 				return false;
 			}
 		}
-		
+
 		return true;
 	}
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
index 841d5a9d..f46f9ddf 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
@@ -80,11 +80,11 @@ import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.IProgressConstants;
 
 import com.gluster.storage.management.console.Application;
+import com.gluster.storage.management.console.ConsoleConstants;
 import com.gluster.storage.management.console.GlusterDataModelManager;
 import com.gluster.storage.management.console.IImageKeys;
 import com.gluster.storage.management.console.views.NavigationView;
 import com.gluster.storage.management.console.views.TasksView;
-import com.gluster.storage.management.console.views.TerminalView;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.utils.JavaUtil;
@@ -460,8 +460,7 @@ public class GUIHelper {
 	}
 	
 	public void showTerminalView() {
-		//showView("org.eclipse.tm.terminal.view.TerminalView");
-		showView(TerminalView.ID);
+		showView(ConsoleConstants.TERMINAL_VIEW_ID);
 	}
 	
 	public void showProgressView() {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
index 928bc7fc..05c30626 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
@@ -24,6 +24,7 @@ import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
+import com.gluster.storage.management.console.ConsoleConstants;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.Entity;
 import com.gluster.storage.management.core.model.EntityGroup;
@@ -44,6 +45,7 @@ public class GlusterViewsManager implements ViewsManager {
 	/* (non-Javadoc)
 	 * @see com.gluster.storage.management.console.views.ViewsManager#updateViews(com.gluster.storage.management.core.model.Entity)
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public void updateViews(Entity entity) {
 		closeAllViews();
@@ -65,13 +67,11 @@ public class GlusterViewsManager implements ViewsManager {
 		}
 	}
 
-	/**
-	 * 
-	 */
 	private void closeAllViews() {
 		IViewReference[] viewReferences = page.getViewReferences();
 		for (final IViewReference viewReference : viewReferences) {
-			if (!(viewReference.getId().equals(NavigationView.ID) || viewReference.getId().equals(TerminalView.ID))) {
+			if (!(viewReference.getId().equals(NavigationView.ID) || viewReference.getId().equals(
+					ConsoleConstants.TERMINAL_VIEW_ID))) {
 				page.hideView(viewReference);
 			}
 		}
@@ -80,7 +80,6 @@ public class GlusterViewsManager implements ViewsManager {
 	private void showViewsForCluster(Cluster cluster) throws PartInitException {
 		page.showView(ClusterSummaryView.ID);
 		page.showView(TasksView.ID, null, IWorkbenchPage.VIEW_CREATE);
-		//page.showView("org.eclipse.tm.terminal.view.TerminalView", null, IWorkbenchPage.VIEW_CREATE);
 	}
 
 	private void showViewsForVolume(Volume volume) throws PartInitException {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
index 5de35000..dfd0c669 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -3,6 +3,7 @@ package com.gluster.storage.management.console.views;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -403,8 +404,6 @@ public class VolumeSummaryView extends ViewPart {
 		guiHelper.setStatusMessage("Setting Cifs Configuration...");
 		parent.update();
 
-		final String cifsUsers = cifsUsersText.getText().trim();
-
 		// To check if no changes in the users list
 		if (!isvalidCifsUser()) {
 			MessageDialog.openError(Display.getDefault().getActiveShell(), "Cifs Configuration",
@@ -419,6 +418,7 @@ public class VolumeSummaryView extends ViewPart {
 				public void run() {
 					VolumesClient vc = new VolumesClient();
 					Volume newVolume = new Volume();
+					String cifsUsers = cifsUsersText.getText().trim();
 					try {
 						vc.setCifsConfig(volume.getName(), cifsCheckbox.getSelection(), cifsUsers);
 						enableCifsUsersControls(false);
@@ -665,7 +665,7 @@ public class VolumeSummaryView extends ViewPart {
 				|| volume.getVolumeType() == VOLUME_TYPE.DISTRIBUTED_REPLICATE) {
 			replicaCount = (double) volume.getReplicaCount();
 		}
-		totalDiskSpace.setText("" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024) / replicaCount));
+		totalDiskSpace.setText("" + NumberUtil.formatNumber(getTotalDiskSpace() / 1024));
 	}
 
 	private double getDiskSize(String serverName, String deviceName) {
@@ -692,16 +692,39 @@ public class VolumeSummaryView extends ViewPart {
 	}
 
 	private double getTotalDiskSpace() {
+		List<Double> diskSizes = getVolumeDiskSizes();
+		VOLUME_TYPE volumeType = volume.getVolumeType();
 		double diskSize = 0d;
+		if (volumeType == VOLUME_TYPE.DISTRIBUTE || volumeType == VOLUME_TYPE.STRIPE
+				|| volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE) {
+			for (Double size : diskSizes) {
+				diskSize += size;
+			}
+		} else { // Replicate or distributed replicate
+			int replicaCount = volume.getReplicaCount();
+			if (replicaCount == 0) {
+				replicaCount = Volume.DEFAULT_REPLICA_COUNT;
+			}
+			int startIndex = 0;
+			for (int i = 0; i < (diskSizes.size() / replicaCount); i++) {
+				startIndex = i * replicaCount;
+				diskSize += Collections.min(diskSizes.subList(startIndex, startIndex + replicaCount));
+			}
+		}
+		return diskSize;
+	}
+	
+	private List<Double> getVolumeDiskSizes() {
+		List<Double> diskSizes = new ArrayList<Double>();
 		Device device;
 		for (Brick brick : volume.getBricks()) {
 			device = modelManager.getDeviceForBrickDir(brick);
-			if (device != null) { // In case of off line server, device becomes null
-				diskSize += getDiskSize(brick.getServerName(), device.getName());
-			}
+			diskSizes.add( (device == null) ? 0d : getDiskSize(brick.getServerName(), device.getName()) );
 		}
-		return diskSize;
+		return diskSizes;
 	}
+	
+	
 
 	private void createDiskSpaceField(Composite section) {
 		Label diskSpaceLabel = toolkit.createLabel(section, "Total Disk Space (GB): ", SWT.NONE);
@@ -713,7 +736,7 @@ public class VolumeSummaryView extends ViewPart {
 			replicaCount = (double) Volume.DEFAULT_REPLICA_COUNT;
 		}
 		totalDiskSpace = toolkit.createLabel(section,
-				"" + NumberUtil.formatNumber((getTotalDiskSpace() / 1024) / replicaCount), SWT.NONE);
+				"" + NumberUtil.formatNumber(getTotalDiskSpace() / 1024), SWT.NONE);
 		toolkit.createLabel(section, "", SWT.NONE); // dummy
 	}