Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: remove duplicate method in EntityModelCellTable ......................................................................
userportal, webadmin: remove duplicate method in EntityModelCellTable remove duplicate method 'addEntityModelColumn' in EntityModelCellTable and replaced calls with 'addColumn'. Change-Id: Id74cf2abc154da4df042df3fec2e6070b6a805cd Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/AbstractFindStoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/RecoveryStorageConfirmationPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/AbstractFindDcPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java 14 files changed, 55 insertions(+), 60 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/39099/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java index 91b6e7d..a021e16 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/EntityModelCellTable.java @@ -353,11 +353,6 @@ return editorAdapter; } - // TODO this is a duplicate -- remove - public void addEntityModelColumn(Column<EntityModel, ?> column, String headerString) { - super.addColumn(column, headerString); - } - public void setCustomSelectionColumn(Column customSelectionColumn, String width) { removeColumn(0); insertColumn(0, customSelectionColumn, SafeHtmlUtils.fromSafeConstant("<br/>")); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java index f6f50be..b0ff5c2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.java @@ -235,14 +235,14 @@ } private void initTableColumns() { - contentSourcesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerHook>() { + contentSourcesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerHook>() { @Override public String getText(GlusterServerHook entity) { return entity.getServerName(); } }, constants.sourceGlusterHook()); - contentSourcesTable.addEntityModelColumn(new AbstractEntityModelEnumColumn<GlusterServerHook, GlusterHookStatus>() { + contentSourcesTable.addColumn(new AbstractEntityModelEnumColumn<GlusterServerHook, GlusterHookStatus>() { @Override protected GlusterHookStatus getEnum(GlusterServerHook entity) { return entity.getStatus(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java index 7b0f06f..75ab2c0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ManageGlusterSwiftPopupView.java @@ -103,7 +103,7 @@ manageSwiftServerLevel = new EntityModelCheckBoxEditor(Align.RIGHT); hostServicesTable = new EntityModelCellTable<ListModel>(false, true); - hostServicesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { + hostServicesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { @Override public String getText(GlusterServerService entity) { return entity.getHostName(); @@ -152,7 +152,7 @@ } } }); - hostServicesTable.addEntityModelColumn(startSwiftColumn, constants.startGlusterSwift()); + hostServicesTable.addColumn(startSwiftColumn, constants.startGlusterSwift()); Column<EntityModel, Boolean> stopSwiftColumn = new Column<EntityModel, Boolean>(new RadioboxCell(false, true)) { @Override @@ -183,7 +183,7 @@ } } }); - hostServicesTable.addEntityModelColumn(stopSwiftColumn, constants.stopGlusterSwift()); + hostServicesTable.addColumn(stopSwiftColumn, constants.stopGlusterSwift()); Column<EntityModel, Boolean> restartSwiftColumn = new Column<EntityModel, Boolean>(new RadioboxCell(false, true)) { @@ -213,7 +213,7 @@ } } }); - hostServicesTable.addEntityModelColumn(restartSwiftColumn, constants.restartGlusterSwift()); + hostServicesTable.addColumn(restartSwiftColumn, constants.restartGlusterSwift()); } private void localize() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/AbstractFindStoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/AbstractFindStoragePopupView.java index aed1945..d7f80b8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/AbstractFindStoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/AbstractFindStoragePopupView.java @@ -37,14 +37,14 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); // Table Entity Columns - table.addEntityModelColumn(new AbstractEntityModelTextColumn<StorageDomain>() { + table.addColumn(new AbstractEntityModelTextColumn<StorageDomain>() { @Override public String getText(StorageDomain storage) { return storage.getStorageName(); } }, constants.nameStorage()); - table.addEntityModelColumn(new AbstractEntityModelEnumColumn<StorageDomain, StorageDomainType>() { + table.addColumn(new AbstractEntityModelEnumColumn<StorageDomain, StorageDomainType>() { @Override protected StorageDomainType getEnum(StorageDomain storage) { @@ -52,7 +52,7 @@ } }, constants.typeStorage()); - table.addEntityModelColumn(new AbstractEntityModelTextColumn<StorageDomain>() { + table.addColumn(new AbstractEntityModelTextColumn<StorageDomain>() { @Override public String getText(StorageDomain storage) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/RecoveryStorageConfirmationPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/RecoveryStorageConfirmationPopupView.java index 825151f..c924d78 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/RecoveryStorageConfirmationPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/RecoveryStorageConfirmationPopupView.java @@ -144,7 +144,7 @@ }; storageDomainItems.setColumnWidth(nameColumn, "280px"); //$NON-NLS-1$ - storageDomainItems.addEntityModelColumn(nameColumn, constants.nameStorage()); + storageDomainItems.addColumn(nameColumn, constants.nameStorage()); AbstractEntityModelTextColumn<StorageDomain> freeSpaceColumn = new AbstractEntityModelTextColumn<StorageDomain>() { @Override @@ -157,7 +157,7 @@ }; storageDomainItems.setColumnWidth(freeSpaceColumn, "80px"); //$NON-NLS-1$ - storageDomainItems.addEntityModelColumn(freeSpaceColumn, constants.freeSpaceStorage()); + storageDomainItems.addColumn(freeSpaceColumn, constants.freeSpaceStorage()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java index 19698ec..a732e7c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java @@ -177,14 +177,14 @@ protected void initTableColumns(){ // Table Entity Columns - bricksTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterBrickEntity>() { + bricksTable.addColumn(new AbstractEntityModelTextColumn<GlusterBrickEntity>() { @Override public String getText(GlusterBrickEntity entity) { return entity.getServerName(); } }, constants.serverBricks()); - bricksTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterBrickEntity>() { + bricksTable.addColumn(new AbstractEntityModelTextColumn<GlusterBrickEntity>() { @Override public String getText(GlusterBrickEntity entity) { return entity.getBrickDirectory(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java index 4bf538d..cadedee 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/BrickAdvancedDetailsPopupView.java @@ -235,84 +235,84 @@ } private void initTableColumns() { - clientsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { + clientsTable.addColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { @Override public String getText(GlusterClientInfo entity) { return entity.getHostname(); } }, constants.clientBrickAdvancedLabel()); - clientsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { + clientsTable.addColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { @Override public String getText(GlusterClientInfo entity) { return String.valueOf(entity.getClientPort()); } }, constants.clientPortBrickAdvancedLabel()); - clientsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { + clientsTable.addColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { @Override public String getText(GlusterClientInfo entity) { return String.valueOf(entity.getBytesRead()); } }, constants.bytesReadBrickAdvancedLabel()); - clientsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { + clientsTable.addColumn(new AbstractEntityModelTextColumn<GlusterClientInfo>() { @Override public String getText(GlusterClientInfo entity) { return String.valueOf(entity.getBytesWritten()); } }, constants.bytesWrittenBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return entity.getName(); } }, constants.nameBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getHotCount()); } }, constants.hotCountBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getColdCount()); } }, constants.coldCountBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getPadddedSize()); } }, constants.paddedSizeBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getAllocCount()); } }, constants.allocatedCountBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getMaxAlloc()); } }, constants.maxAllocatedBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getPoolMisses()); } }, constants.poolMissesBrickAdvancedLabel()); - memoryPoolsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Mempool>() { + memoryPoolsTable.addColumn(new AbstractEntityModelTextColumn<Mempool>() { @Override public String getText(Mempool entity) { return String.valueOf(entity.getMaxStdAlloc()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java index d299c93..cd1db4c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java @@ -67,7 +67,7 @@ protected void initTableColumns(){ // Table Entity Columns - hostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<String>() { + hostsTable.addColumn(new AbstractEntityModelTextColumn<String>() { @Override public String getText(String hostAddress) { return hostAddress; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java index 3efa08e..b4939d5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java @@ -61,7 +61,7 @@ geoReplicationConfigTable = new EntityModelCellTable<>(false, true); geoReplicationConfigTable.setSelectionModel(new NoSelectionModel()); - geoReplicationConfigTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Pair<Boolean, GlusterGeoRepSessionConfiguration>>() { + geoReplicationConfigTable.addColumn(new AbstractEntityModelTextColumn<Pair<Boolean, GlusterGeoRepSessionConfiguration>>() { @Override protected String getText(Pair<Boolean, GlusterGeoRepSessionConfiguration> entity) { return entity.getSecond().getKey(); @@ -69,7 +69,7 @@ }, constants.optionKeyVolumeParameter()); - geoReplicationConfigTable.addEntityModelColumn(new AbstractEntityModelTextColumn<Pair<Boolean, GlusterGeoRepSessionConfiguration>>() { + geoReplicationConfigTable.addColumn(new AbstractEntityModelTextColumn<Pair<Boolean, GlusterGeoRepSessionConfiguration>>() { @Override protected String getText(Pair<Boolean, GlusterGeoRepSessionConfiguration> entity) { return entity.getSecond().getDescription() == null ? constants.notAvailableLabel() : entity.getSecond() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java index 0d92503..d00c92c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java @@ -161,35 +161,35 @@ nfsServers = new ListModelListBoxEditor<>(new NameRenderer<GlusterVolumeProfileStats>()); volumeProfileStats = new EntityModelCellTable<ListModel>(false, true); - volumeProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getName(); } }, constants.fileOperation()); - volumeProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getHits() + ""; } }, constants.fOpInvocationCount()); - volumeProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond();//$NON-NLS-1$ } }, constants.fOpMaxLatency()); - volumeProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond();//$NON-NLS-1$ } }, constants.fOpMinLatency()); - volumeProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond();//$NON-NLS-1$ @@ -198,35 +198,35 @@ nfsServerProfileStats = new EntityModelCellTable<ListModel>(false, true); - nfsServerProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getName(); } }, constants.fileOperation()); - nfsServerProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getHits() + ""; } }, constants.fOpInvocationCount()); - nfsServerProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond();//$NON-NLS-1$ } }, constants.fOpMaxLatency()); - nfsServerProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond();//$NON-NLS-1$ } }, constants.fOpMinLatency()); - nfsServerProfileStats.addEntityModelColumn(new AbstractEntityModelTextColumn<FopStats>() { + nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() { @Override protected String getText(FopStats entity) { return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond();//$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java index fbc3d15..a4a694c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java @@ -130,21 +130,21 @@ stopTimeEditor = getInstanceOfDateEditor(); - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { return entity.getHostName(); } }, constants.rebalanceSessionHost()); - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { return entity.getFilesMoved() + ""; } }, getColumnHeaderForFilesMoved()); - rebalanceHostsTable.addEntityModelColumn(new AbstractRebalanceFileSizeColumn<EntityModel>() { + rebalanceHostsTable.addColumn(new AbstractRebalanceFileSizeColumn<EntityModel>() { @Override protected Long getRawValue(EntityModel object) { @@ -152,7 +152,7 @@ } }, constants.rebalanceSize()); - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { @@ -160,7 +160,7 @@ } }, constants.rebalanceScannedFileCount()); - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { return String.valueOf(entity.getFilesFailed()); @@ -168,7 +168,7 @@ }, constants.rebalanceFailedFileCount()); if (isSkippedFileCountNeeded()){ - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { return String.valueOf(entity.getFilesSkipped()); @@ -176,14 +176,14 @@ }, constants.rebalanceSkippedFileCount()); } - rebalanceHostsTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { + rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() { @Override protected String getText(GlusterVolumeTaskStatusForHost entity) { return entity.getStatus().toString(); } }, constants.rebalanceStatus()); - rebalanceHostsTable.addEntityModelColumn(new AbstractHumanReadableTimeColumn<EntityModel>() { + rebalanceHostsTable.addColumn(new AbstractHumanReadableTimeColumn<EntityModel>() { @Override protected Double getRawValue(EntityModel object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/AbstractFindDcPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/AbstractFindDcPopupView.java index 3b0a4b7..476e092 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/AbstractFindDcPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/AbstractFindDcPopupView.java @@ -35,14 +35,14 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); // Table Entity Columns - table.addEntityModelColumn(new AbstractEntityModelTextColumn<StoragePool>() { + table.addColumn(new AbstractEntityModelTextColumn<StoragePool>() { @Override public String getText(StoragePool storage) { return storage.getName(); } }, constants.nameDc()); - table.addEntityModelColumn(new AbstractEntityModelTextColumn<StoragePool>() { + table.addColumn(new AbstractEntityModelTextColumn<StoragePool>() { @Override protected String getText(StoragePool entity) { return entity.isLocal() ? constants.storageTypeLocal() : constants.storageTypeShared(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java index 494a60f..339b266 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java @@ -109,7 +109,7 @@ imageListPanel = new SimplePanel(); imageList = new EntityModelCellTable<>(SelectionMode.NONE, true); - imageList.addEntityModelColumn(new AbstractEntityModelTextColumn<Object>() { + imageList.addColumn(new AbstractEntityModelTextColumn<Object>() { @Override public String getText(Object image) { if (image instanceof RepoImage) { @@ -120,7 +120,7 @@ return constants.unknown(); } }, constants.fileNameIso()); - imageList.addEntityModelColumn(new AbstractEntityModelTextColumn<Object>() { + imageList.addColumn(new AbstractEntityModelTextColumn<Object>() { @Override public String getText(Object image) { if (image instanceof RepoImage) { @@ -131,7 +131,7 @@ return constants.unknown(); } }, constants.typeIso()); - imageList.addEntityModelColumn(new AbstractDiskSizeColumn<EntityModel>() { + imageList.addColumn(new AbstractDiskSizeColumn<EntityModel>() { @Override protected Long getRawValue(EntityModel object) { if (object.getEntity() instanceof RepoImage) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java index e9bf6f4..5b07c1c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java @@ -127,14 +127,14 @@ protected void initTableColumns() { // Table Entity Columns - servicesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { + servicesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { @Override public String getText(GlusterServerService entity) { return entity.getHostName(); } }, constants.hostService()); - servicesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { + servicesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { @Override public String getText(GlusterServerService entity) { return entity.getServiceType().name(); @@ -148,7 +148,7 @@ } }, constants.statusService()); - servicesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { + servicesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { @Override public String getText(GlusterServerService entity) { if (entity.getPort() != null && entity.getPort() > 0) { @@ -160,7 +160,7 @@ } }, constants.portService()); - servicesTable.addEntityModelColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { + servicesTable.addColumn(new AbstractEntityModelTextColumn<GlusterServerService>() { @Override public String getText(GlusterServerService entity) { return String.valueOf(entity.getPid()); -- To view, visit https://gerrit.ovirt.org/39099 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id74cf2abc154da4df042df3fec2e6070b6a805cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
