Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: add 'private final' to constants, messages, templates ......................................................................
userportal, webadmin: add 'private final' to constants, messages, templates Marked all naked declarations of (Common)?ApplicationConstants, (Common)?ApplicationResources, (Common)?ApplicationResources, and (Common)?ApplicationTemplates 'private final' where possible. No functional changes -- just a refactor. Change-Id: Ie7c7223edb2d818b0281a96486fa0baca8d4c04c Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AddRemoveRowWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/VncKeyMapRenderer.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/ClusterTypeRenderer.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCreatePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.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/presenter/popup/pool/BasePoolPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GeoRepActionConfirmPopUpView.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/RemoveBrickStatusPopupView.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/host/HostConfigureLocalStoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/BrickStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/MenuCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeBrickStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeTaskWaitingCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ReasonColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java 33 files changed, 63 insertions(+), 73 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/38723/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AddRemoveRowWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AddRemoveRowWidget.java index 418b9b7..00e8fff 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AddRemoveRowWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AddRemoveRowWidget.java @@ -58,7 +58,7 @@ @UiField public WidgetStyle style; - private CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); + private final CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); private final List<Pair<T, V>> items; private final IEventListener<EventArgs> itemsChangedListener; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/VncKeyMapRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/VncKeyMapRenderer.java index eaacb6f..0c75192 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/VncKeyMapRenderer.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/VncKeyMapRenderer.java @@ -9,7 +9,7 @@ public class VncKeyMapRenderer extends AbstractRenderer<String> { final String globalLayout; - CommonApplicationMessages messages; + private final CommonApplicationMessages messages; public VncKeyMapRenderer( CommonApplicationMessages messages) { globalLayout = (String) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.VncKeyboardLayout); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/ClusterTypeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/ClusterTypeRenderer.java index 5118eba..916057e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/ClusterTypeRenderer.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/ClusterTypeRenderer.java @@ -7,7 +7,7 @@ public class ClusterTypeRenderer extends AbstractRenderer<ClusterGeneralModel.ClusterType> { - private CommonApplicationConstants constants; + private final CommonApplicationConstants constants; public ClusterTypeRenderer(CommonApplicationConstants constants) { this.constants = constants; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java index 1d03496..e29daab 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/NicActivateStatusColumn.java @@ -16,9 +16,9 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; public class NicActivateStatusColumn<T> extends AbstractSafeHtmlWithSafeHtmlTooltipColumn<T> { - CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); - CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); - CommonApplicationTemplates templates = GWT.create(CommonApplicationTemplates.class); + private final CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); + private final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); + private final CommonApplicationTemplates templates = GWT.create(CommonApplicationTemplates.class); private ImageResource getImage(T object) { VmNetworkInterface vnic = null; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java index 10c05f0..fa938bc 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewRadioGroup.java @@ -13,7 +13,7 @@ public class DisksViewRadioGroup extends Composite { - CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); + private final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); RadioButton allButton; RadioButton imagesButton; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCreatePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCreatePopupWidget.java index 96dbf5f..51d9c48 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCreatePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCreatePopupWidget.java @@ -78,9 +78,9 @@ SimplePanel warningPanel; private final Driver driver = GWT.create(Driver.class); - private CommonApplicationTemplates templates; - private CommonApplicationResources resources; - private CommonApplicationConstants constants; + private final CommonApplicationTemplates templates; + private final CommonApplicationResources resources; + private final CommonApplicationConstants constants; public VmSnapshotCreatePopupWidget(CommonApplicationConstants constants, CommonApplicationTemplates templates, CommonApplicationResources resources) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java index fc4b3fe..65d700b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java @@ -54,7 +54,7 @@ private final Driver driver = GWT.create(Driver.class); - private CommonApplicationConstants constants; + private final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); private String elementId = DOM.createUniqueId(); @@ -74,7 +74,6 @@ } public DisksAllocationView(CommonApplicationConstants constants) { - this.constants = constants; initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); } 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 7b294d5..02782c5 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 @@ -14,6 +14,7 @@ import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.EventBus; @@ -21,7 +22,7 @@ public class BaseVmDiskListModelTable<T extends VmDiskListModelBase<?>> extends AbstractModelBoundTableWidget<Disk, T> { - private CommonApplicationConstants constants; + private final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); private DisksViewRadioGroup disksViewRadioGroup; private static AbstractTextColumn<Disk> aliasColumn; @@ -64,7 +65,6 @@ @Override public void initTable(CommonApplicationConstants constants) { - this.constants = constants; initTableColumns(); initTableOverhead(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/pool/BasePoolPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/pool/BasePoolPopupPresenterWidget.java index 00c14fe..cfff8af 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/pool/BasePoolPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/pool/BasePoolPopupPresenterWidget.java @@ -15,7 +15,7 @@ public abstract class BasePoolPopupPresenterWidget<V extends AbstractVmBasedPopupPresenterWidget.ViewDef> extends AbstractVmBasedPopupPresenterWidget<V> { - private CommonApplicationMessages messages; + private final CommonApplicationMessages messages; public BasePoolPopupPresenterWidget(EventBus eventBus, V view, CommonApplicationMessages messages, ClientStorage clientStorage) { super(eventBus, view, clientStorage); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java index 83018fb..7901128 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportVmsPopupView.java @@ -82,7 +82,7 @@ private ImportVmsModel model; - private ApplicationMessages messages; + private final ApplicationMessages messages; @UiHandler("refreshButton") void handleRefreshButtonClick(ClickEvent event) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GeoRepActionConfirmPopUpView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GeoRepActionConfirmPopUpView.java index fd1cfeb..5cb3816 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GeoRepActionConfirmPopUpView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GeoRepActionConfirmPopUpView.java @@ -68,9 +68,9 @@ @WithElementId Label errorMsg; - private ApplicationConstants constants; - private ApplicationResources resources; - private CommonApplicationTemplates templates; + private final ApplicationConstants constants; + private final ApplicationResources resources; + private final CommonApplicationTemplates templates; private final Driver driver = GWT.create(Driver.class); 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 b93f5c3..e804264 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 @@ -44,7 +44,7 @@ @WithElementId EntityModelCellTable<ListModel<EntityModel<Pair<Boolean, GlusterGeoRepSessionConfiguration>>>> geoReplicationConfigTable; - private ApplicationConstants constants; + private final ApplicationConstants constants; private final Driver driver = GWT.create(Driver.class); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java index b53be9a..a1c8829 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java @@ -5,11 +5,14 @@ import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.gluster.RemoveBrickStatusPopupPresenterWidget; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; public class RemoveBrickStatusPopupView extends VolumeRebalanceStatusPopupView implements RemoveBrickStatusPopupPresenterWidget.ViewDef { + private final ApplicationConstants constants = GWT.create(ApplicationConstants.class); + @Inject public RemoveBrickStatusPopupView(EventBus eventBus, ApplicationResources resources, 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 4dccc81..9ad7dfe 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 @@ -92,9 +92,8 @@ @WithElementId VerticalPanel stopTimePanel; - ApplicationMessages messages; - - ApplicationConstants constants; + private final ApplicationMessages messages; + private final ApplicationConstants constants; private final Driver driver = GWT.create(Driver.class); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java index fa0d481..3ab95e2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java @@ -60,7 +60,7 @@ private final ApplicationConstants constants; - private ApplicationConstants getConstants() { + private final ApplicationConstants getConstants() { return constants; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java index 57349b3..4094ff4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java @@ -50,7 +50,7 @@ } private final Driver driver = GWT.create(Driver.class); - private ApplicationConstants constants; + private final ApplicationConstants constants; @UiField @Path(value = "name.entity") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java index 13c954f..2bc80cb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java @@ -34,11 +34,9 @@ ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class); } - private ApplicationConstants constants; - - private ApplicationMessages messages; - - private ApplicationTemplates templates; + private final ApplicationConstants constants; + private final ApplicationMessages messages; + private final ApplicationTemplates templates; @UiField @Path(value = "name.entity") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java index 9d7a15f..6ee086a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java @@ -55,7 +55,8 @@ int maxSpmPriority; int defaultSpmPriority; - ApplicationConstants constants; + + private final ApplicationConstants constants; @Inject public MainTabHostView(MainModelProvider<VDS, HostListModel<Void>> modelProvider, ApplicationConstants constants) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java index 20a7a6e..7f6cabc 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java @@ -9,7 +9,7 @@ public class RebalanceFileSizeRenderer<T extends Number> extends AbstractRenderer<T> { - private ApplicationMessages messages; + private final ApplicationMessages messages; @Override public String render(T size) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java index cb8ddcc..530021a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java @@ -24,7 +24,7 @@ public class TemplatesTree<M extends SearchableListModel> extends AbstractSubTabTree<M, VmTemplate, DiskImage> { - ApplicationResources resources; + private final ApplicationResources resources; public TemplatesTree(CommonApplicationResources resources, CommonApplicationConstants constants, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java index a7ba45a..a176c61 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/VMsTree.java @@ -30,8 +30,8 @@ public class VMsTree<M extends SearchableListModel> extends AbstractSubTabTree<M, VM, Disk> { - ApplicationResources resources; - ApplicationConstants constants; + private final ApplicationResources resources; + private final ApplicationConstants constants; public VMsTree(CommonApplicationResources resources, CommonApplicationConstants constants, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/BrickStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/BrickStatusCell.java index 170e9a2..5ae2e94 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/BrickStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/BrickStatusCell.java @@ -16,11 +16,11 @@ public class BrickStatusCell extends AbstractCell<GlusterBrickEntity> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, GlusterBrickEntity brick, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/MenuCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/MenuCell.java index f040b9e..2053298 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/MenuCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/MenuCell.java @@ -24,9 +24,8 @@ public class MenuCell<T> extends AbstractCell<T> { - private ApplicationTemplates templates = ClientGinjectorProvider.getApplicationTemplates(); - - private ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationTemplates templates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); private MenuPanelPopup menuPanelPopup; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java index d4cb84c..38b1d2e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VmStatusCell.java @@ -19,8 +19,8 @@ public class VmStatusCell extends AbstractCell<VM> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - CommonApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final CommonApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); @Override public void render(Context context, VM vm, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java index 3e419c5..ed62fbb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java @@ -16,11 +16,9 @@ public class VolumeActivityStatusCell<T extends GlusterTaskSupport> extends AbstractCell<T> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - - ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); - - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, T value, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeBrickStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeBrickStatusCell.java index 7dcfabe..db3e96e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeBrickStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeBrickStatusCell.java @@ -15,9 +15,8 @@ public class VolumeBrickStatusCell extends AbstractCell<GlusterVolumeEntity> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, GlusterVolumeEntity volume, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java index eaca548..d00358a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeCapacityCell.java @@ -11,7 +11,7 @@ public class VolumeCapacityCell extends AbstractCell<GlusterVolumeEntity> { - private ApplicationTemplates templates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationTemplates templates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, GlusterVolumeEntity object, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeStatusCell.java index cfce337..fdee247 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeStatusCell.java @@ -17,11 +17,9 @@ public class VolumeStatusCell extends AbstractCell<GlusterVolumeEntity> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - - ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); - - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); protected ImageResource downImage = resources.downImage(); protected ImageResource upImage = resources.upImage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeTaskWaitingCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeTaskWaitingCell.java index 4fa0a39..e64d802 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeTaskWaitingCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeTaskWaitingCell.java @@ -16,11 +16,9 @@ public class VolumeTaskWaitingCell<T extends GlusterTaskSupport> extends AbstractCell<T> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - - ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); - - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, T value, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ReasonColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ReasonColumn.java index 0e40aff..e8601c5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ReasonColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ReasonColumn.java @@ -11,8 +11,8 @@ public abstract class ReasonColumn<T> extends AbstractSafeHtmlColumn<T> { - ApplicationResources resources = GWT.create(ApplicationResources.class); - ApplicationTemplates templates = GWT.create(ApplicationTemplates.class); + private final ApplicationResources resources = GWT.create(ApplicationResources.class); + private final ApplicationTemplates templates = GWT.create(ApplicationTemplates.class); @Override public SafeHtml getValue(T value) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusCell.java index e3c4b84..e4cd624 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusCell.java @@ -15,11 +15,9 @@ public class StorageDeviceStatusCell extends AbstractCell<StorageDevice> { - ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); - - ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); - - ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); + private final ApplicationResources resources = ClientGinjectorProvider.getApplicationResources(); + private final ApplicationConstants constants = ClientGinjectorProvider.getApplicationConstants(); + private final ApplicationTemplates applicationTemplates = ClientGinjectorProvider.getApplicationTemplates(); @Override public void render(Context context, StorageDevice device, SafeHtmlBuilder sb) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java index 9f022cc..557ab97 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java @@ -30,8 +30,8 @@ public class DisksTree extends AbstractSubTabTree<TemplateDiskListModel, DiskImage, StorageDomain> { - ApplicationResources resources; - ApplicationConstants constants; + private final ApplicationResources resources; + private final ApplicationConstants constants; public DisksTree(ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { super(resources, constants, templates); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java index 26abfd8..375fcf6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java @@ -30,8 +30,8 @@ public class StoragesTree extends AbstractSubTabTree<TemplateStorageListModel, StorageDomainModel, DiskModel> { - ApplicationResources resources; - ApplicationConstants constants; + private final ApplicationResources resources; + private final ApplicationConstants constants; public StoragesTree(ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { super(resources, constants, templates); -- To view, visit https://gerrit.ovirt.org/38723 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7c7223edb2d818b0281a96486fa0baca8d4c04c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches