Daniel Erez has uploaded a new change for review.
Change subject: webadmin: Disks VMs Templates sub-tabs resizable columns
......................................................................
webadmin: Disks VMs Templates sub-tabs resizable columns
VMs/Templates sub-tabs under Disks main-tab
now support resizable columns.
* Invoked enableColumnResizing() on each sub-tab.
* Added a static width value for each column.
Change-Id: Ic7db506c95ec3642d7247f64b632e6ec7333d94f
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java
4 files changed, 47 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/14280/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
index 8f24216..089c99e 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java
@@ -4,6 +4,7 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DiskInterface;
+import org.ovirt.engine.core.common.businessentities.ImageStatus;
import org.ovirt.engine.core.common.businessentities.VolumeType;
import org.ovirt.engine.ui.common.CommonApplicationConstants;
import org.ovirt.engine.ui.common.system.ClientStorage;
@@ -28,13 +29,15 @@
@Override
public void initTable(CommonApplicationConstants constants) {
- TextColumnWithTooltip<DiskImage> nameColumn = new
TextColumnWithTooltip<DiskImage>() {
+ getTable().enableColumnResizing();
+
+ TextColumnWithTooltip<DiskImage> aliasColumn = new
TextColumnWithTooltip<DiskImage>() {
@Override
public String getValue(DiskImage object) {
- return object.getDiskAlias(); //$NON-NLS-1$
+ return object.getDiskAlias();
}
};
- getTable().addColumn(nameColumn, constants.nameDisk());
+ getTable().addColumn(aliasColumn, constants.aliasDisk(), "150px");
//$NON-NLS-1$
TextColumnWithTooltip<DiskImage> provisionedSizeColumn = new
TextColumnWithTooltip<DiskImage>() {
@Override
@@ -42,7 +45,7 @@
return String.valueOf(object.getSizeInGigabytes()) + " GB";
//$NON-NLS-1$
}
};
- getTable().addColumn(provisionedSizeColumn,
constants.provisionedSizeDisk());
+ getTable().addColumn(provisionedSizeColumn,
constants.provisionedSizeDisk(), "150px"); //$NON-NLS-1$
DiskSizeColumn<DiskImage> actualSizeColumn = new
DiskSizeColumn<DiskImage>(DiskSizeUnit.GIGABYTE) {
@Override
@@ -51,7 +54,16 @@
}
};
- getTable().addColumn(actualSizeColumn, constants.sizeDisk());
+ getTable().addColumn(actualSizeColumn, constants.sizeDisk(), "150px");
//$NON-NLS-1$
+
+ TextColumnWithTooltip<DiskImage> statusColumn = new
EnumColumn<DiskImage, ImageStatus>() {
+ @Override
+ protected ImageStatus getRawValue(DiskImage object) {
+ return object.getImageStatus();
+ }
+ };
+
+ getTable().addColumn(statusColumn, constants.statusDisk(), "150px");
//$NON-NLS-1$
TextColumnWithTooltip<DiskImage> allocationColumn = new
EnumColumn<DiskImage, VolumeType>() {
@Override
@@ -59,7 +71,7 @@
return VolumeType.forValue(object.getVolumeType().getValue());
}
};
- getTable().addColumn(allocationColumn, constants.allocationDisk());
+ getTable().addColumn(allocationColumn, constants.allocationDisk(),
"150px"); //$NON-NLS-1$
TextColumnWithTooltip<DiskImage> interfaceColumn = new
EnumColumn<DiskImage, DiskInterface>() {
@Override
@@ -67,7 +79,7 @@
return object.getDiskInterface();
}
};
- getTable().addColumn(interfaceColumn, constants.interfaceDisk());
+ getTable().addColumn(interfaceColumn, constants.interfaceDisk(),
"150px"); //$NON-NLS-1$
TextColumnWithTooltip<DiskImage> dateCreatedColumn = new
FullDateTimeColumn<DiskImage>() {
@Override
@@ -76,7 +88,16 @@
}
};
- getTable().addColumn(dateCreatedColumn, constants.creationDateDisk());
+ getTable().addColumn(dateCreatedColumn, constants.creationDateDisk(),
"150px"); //$NON-NLS-1$
+
+ TextColumnWithTooltip<DiskImage> descriptionColumn = new
TextColumnWithTooltip<DiskImage>() {
+ @Override
+ public String getValue(DiskImage object) {
+ return object.getDescription();
+ }
+ };
+
+ getTable().addColumn(descriptionColumn, constants.descriptionDisk(),
"150px"); //$NON-NLS-1$
}
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
index d0be2e4..8c90a1b 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
@@ -78,7 +78,7 @@
DisksViewColumns.diskStatusColumn, constants.empty(), all ||
images || luns, "30px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
- DisksViewColumns.aliasColumn, constants.aliasDisk(), all ||
images || luns, "80px"); //$NON-NLS-1$
+ DisksViewColumns.aliasColumn, constants.aliasDisk(), all ||
images || luns, "120px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
DisksViewColumns.bootableDiskColumn,
@@ -93,16 +93,16 @@
DisksViewColumns.lunDiskColumn.getHeaderHtml(), all, "30px");
//$NON-NLS-1$
getTable().ensureColumnPresent(
- DisksViewColumns.sizeColumn, constants.provisionedSizeDisk(),
all || images || luns, "100px"); //$NON-NLS-1$
+ DisksViewColumns.sizeColumn, constants.provisionedSizeDisk(),
all || images || luns, "110px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
- DisksViewColumns.actualSizeColumn, constants.sizeDisk(),
images, "120px"); //$NON-NLS-1$
+ DisksViewColumns.actualSizeColumn, constants.sizeDisk(),
images, "110px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
DisksViewColumns.allocationColumn, constants.allocationDisk(),
images, "125px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
- DisksViewColumns.storageDomainsColumn,
constants.storageDomainDisk(), images, "165px"); //$NON-NLS-1$
+ DisksViewColumns.storageDomainsColumn,
constants.storageDomainDisk(), images, "125px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
DisksViewColumns.dateCreatedColumn,
constants.creationDateDisk(), images, "120px"); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
index fe33dea..6369fc6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java
@@ -35,13 +35,15 @@
}
void initTable(ApplicationConstants constants) {
+ getTable().enableColumnResizing();
+
TextColumnWithTooltip<VmTemplate> nameColumn = new
TextColumnWithTooltip<VmTemplate>() {
@Override
public String getValue(VmTemplate object) {
return object.getName();
}
};
- getTable().addColumn(nameColumn, constants.nameTemplate());
+ getTable().addColumn(nameColumn, constants.nameTemplate(), "200px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> disksColumn = new
TextColumnWithTooltip<VmTemplate>() {
@Override
@@ -49,7 +51,7 @@
return String.valueOf(object.getDiskMap().size());
}
};
- getTable().addColumn(disksColumn, constants.disksTemplate());
+ getTable().addColumn(disksColumn, constants.disksTemplate(), "200px");
//$NON-NLS-1$
DiskSizeColumn<VmTemplate> sizeColumn = new
DiskSizeColumn<VmTemplate>() {
@Override
@@ -58,7 +60,7 @@
}
};
- getTable().addColumn(sizeColumn, constants.actualSizeTemplate());
+ getTable().addColumn(sizeColumn, constants.actualSizeTemplate(),
"200px"); //$NON-NLS-1$
FullDateTimeColumn<VmTemplate> dateColumn = new
FullDateTimeColumn<VmTemplate>() {
@Override
@@ -66,7 +68,7 @@
return object.getCreationDate();
}
};
- getTable().addColumn(dateColumn, constants.creationDateTemplate());
+ getTable().addColumn(dateColumn, constants.creationDateTemplate(),
"200px"); //$NON-NLS-1$
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java
index 613e76d..7d66f04 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskVmView.java
@@ -56,7 +56,7 @@
return object.getName();
}
};
- getTable().addColumn(nameColumn, constants.nameVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(nameColumn, constants.nameVm(), "140px");
//$NON-NLS-1$
getTable().addColumn(new VmTypeColumn(), constants.empty(), "30px");
//$NON-NLS-1$
@@ -66,7 +66,7 @@
return object.getVdsGroupName();
}
};
- getTable().addColumn(clusterColumn, constants.clusterVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(clusterColumn, constants.clusterVm(), "140px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> ipColumn = new TextColumnWithTooltip<VM>() {
@Override
@@ -74,7 +74,7 @@
return object.getVmIp();
}
};
- getTable().addColumn(ipColumn, constants.ipVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(ipColumn, constants.ipVm(), "140px");
//$NON-NLS-1$
PercentColumn<VM> memColumn = new PercentColumn<VM>() {
@Override
@@ -82,7 +82,7 @@
return object.getUsageMemPercent();
}
};
- getTable().addColumn(memColumn, constants.memoryVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(memColumn, constants.memoryVm(), "140px");
//$NON-NLS-1$
PercentColumn<VM> cpuColumn = new PercentColumn<VM>() {
@Override
@@ -90,7 +90,7 @@
return object.getUsageCpuPercent();
}
};
- getTable().addColumn(cpuColumn, constants.cpuVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(cpuColumn, constants.cpuVm(), "140px");
//$NON-NLS-1$
PercentColumn<VM> netColumn = new PercentColumn<VM>() {
@Override
@@ -98,7 +98,7 @@
return object.getUsageNetworkPercent();
}
};
- getTable().addColumn(netColumn, constants.networkVm());
+ getTable().addColumn(netColumn, constants.networkVm(), "140px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> statusColumn = new EnumColumn<VM,
VMStatus>() {
@Override
@@ -106,7 +106,7 @@
return object.getStatus();
}
};
- getTable().addColumn(statusColumn, constants.statusVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(statusColumn, constants.statusVm(), "140px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> hostColumn = new UptimeColumn<VM>() {
@Override
@@ -114,7 +114,7 @@
return object.getRoundedElapsedTime();
}
};
- getTable().addColumn(hostColumn, constants.uptimeVm(), "160px");
//$NON-NLS-1$
+ getTable().addColumn(hostColumn, constants.uptimeVm(), "140px");
//$NON-NLS-1$
}
}
--
To view, visit http://gerrit.ovirt.org/14280
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7db506c95ec3642d7247f64b632e6ec7333d94f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
