Merge branch 'master' of github.com:gluster/console

6 files changed, 15 insertions, 25 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 49946668..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
@@ -408,9 +408,9 @@ public class CreateVolumePage1 extends WizardPage {
 
 		VOLUME_TYPE volumeType = (VOLUME_TYPE) ((IStructuredSelection) typeComboViewer
 				.getSelection()).getFirstElement();
-		if (volumeType == VOLUME_TYPE.DISTRIBUTED_REPLICATE && diskCount % 2 != 0) {
+		if ((volumeType == VOLUME_TYPE.DISTRIBUTED_REPLICATE || volumeType == VOLUME_TYPE.REPLICATE ) && diskCount % 2 != 0) {
 			setError("Mirror type volume requires bricks in multiples of two");
-		} else if (volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE && diskCount % 4 != 0) {
+		} else if ((volumeType == VOLUME_TYPE.DISTRIBUTED_STRIPE || volumeType == VOLUME_TYPE.STRIPE) && diskCount % 4 != 0) {
 			setError("Stripe type volume requires bricks in multiples of four");
 		}
 	}
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 {