anmolbabu has uploaded a new change for review.
Change subject: webadmin: Moved transport Type Column of Volume to the General
Sub Tab under Volumes Moved transport Type Column of Volume to the General Sub
Tab under Volumes
......................................................................
webadmin: Moved transport Type Column of Volume to the General Sub Tab under
Volumes
Moved transport Type Column of Volume to the General Sub Tab under Volumes
Change-Id: I47ee14b203448debf0ea13615c0c8834ff915555
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
3 files changed, 39 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/19423/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
index 498a487..8e5bb5b 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
@@ -1,9 +1,15 @@
package org.ovirt.engine.ui.uicommonweb.models.gluster;
+import java.util.Iterator;
+import java.util.Set;
+
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
+import org.ovirt.engine.core.common.businessentities.gluster.TransportType;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
+import org.ovirt.engine.ui.uicompat.EnumTranslator;
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
+import org.ovirt.engine.ui.uicompat.Translator;
public class VolumeGeneralModel extends EntityModel {
private String name;
@@ -14,6 +20,7 @@
private String numOfBricks;
private String glusterMountPoint;
private String nfsMountPoint;
+ private String transportTypes;
public String getName() {
return name;
@@ -106,6 +113,35 @@
setReplicaCount(entity.getReplicaCount() != null ?
Integer.toString(entity.getReplicaCount()) : null);
setStripeCount(entity.getStripeCount() != null ?
Integer.toString(entity.getStripeCount()) : null);
setNumOfBricks(entity.getBricks() != null ?
Integer.toString(entity.getBricks().size()) : null);
+ setTransportTypes(entity.getTransportTypes());
+ }
+
+ public String getTransportTypes() {
+ return transportTypes;
+ }
+
+ public void setTransportTypes(Set<TransportType> transportTypes) {
+ Translator transportTypeTranslator =
EnumTranslator.Create(TransportType.class);
+ StringBuilder transportTypesBuilder = new StringBuilder();
+ Iterator<TransportType> iterator = transportTypes.iterator();
+ while (iterator.hasNext())
+ {
+ TransportType transportType = iterator.next();
+ if (transportTypeTranslator.containsKey(transportType))
+ {
+
transportTypesBuilder.append(transportTypeTranslator.get(transportType));
+ }
+ else
+ {
+ transportTypesBuilder.append(transportType.toString());
+ }
+
+ if (iterator.hasNext())
+ {
+ transportTypesBuilder.append(", "); //$NON-NLS-1$
+ }
+ }
+ this.transportTypes = new String(transportTypesBuilder.toString());
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
index b7dd836..6d8c7c2 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.ui.webadmin.section.main.view.tab;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -83,35 +82,6 @@
}
};
getTable().addColumn(numOfBricksColumn,
constants.numberOfBricksVolume(), "150px"); //$NON-NLS-1$
-
- TextColumnWithTooltip<GlusterVolumeEntity> transportColumn =
- new TextColumnWithTooltip<GlusterVolumeEntity>() {
- @Override
- public String getValue(GlusterVolumeEntity object) {
- StringBuilder transportTypes = new StringBuilder();
- Iterator<TransportType> iterator =
object.getTransportTypes().iterator();
- while (iterator.hasNext())
- {
- TransportType transportType = iterator.next();
- if
(transportTypeTranslator.containsKey(transportType))
- {
-
transportTypes.append(transportTypeTranslator.get(transportType));
- }
- else
- {
-
transportTypes.append(transportType.toString());
- }
-
- if (iterator.hasNext())
- {
- transportTypes.append(", "); //$NON-NLS-1$
- }
- }
- return transportTypes.toString();
- }
-
- };
- getTable().addColumn(transportColumn,
constants.transportTypesVolume(), "150px"); //$NON-NLS-1$
getTable().addColumn(new VolumeActivityColumn(),
constants.activitiesOnVolume(), "100px"); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
index 7f0b605..ba166b6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
@@ -40,6 +40,7 @@
TextBoxLabel replicaCount = new TextBoxLabel();
TextBoxLabel stripeCount = new TextBoxLabel();
TextBoxLabel numOfBricks = new TextBoxLabel();
+ TextBoxLabel transportTypes = new TextBoxLabel();
FormBuilder formBuilder;
@@ -59,7 +60,7 @@
driver.initialize(this);
// Build a form using the FormBuilder
- formBuilder = new FormBuilder(formPanel, 1, 6);
+ formBuilder = new FormBuilder(formPanel, 1, 7);
formBuilder.addFormItem(new FormItem(constants.NameVolume(), name, 0,
0));
formBuilder.addFormItem(new FormItem(constants.volumeIdVolume(),
volumeId, 1, 0));
@@ -72,6 +73,7 @@
formBuilder.addFormItem(stripeFormItem);
formBuilder.addFormItem(new FormItem(constants.numberOfBricksVolume(),
numOfBricks, 5, 0));
+ formBuilder.addFormItem(new FormItem(constants.transportTypesVolume(),
transportTypes, 6, 0));
getDetailModel().getPropertyChangedEvent().addListener(new
IEventListener() {
@Override
--
To view, visit http://gerrit.ovirt.org/19423
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47ee14b203448debf0ea13615c0c8834ff915555
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
