Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: cleaned up ClientGinjectorProvider
......................................................................
userportal, webadmin: cleaned up ClientGinjectorProvider
Removed getApplicationConstants(), getApplicationMessages(),
getApplicationTemplates(), getApplicationResources() from deprecated
ClientGinjectorProvider. Replaced all occurences with equivalent GWT.create
calls.
Also deleted a useless class, AbstractWebAdminImageResourceColumn, that
simply provided resources to its subclasses.
No functional changes -- just a refactor.
Change-Id: Ifafe5a16068452dac46208c6f06b05c113403443
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/UserPortalSimpleActionTable.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorProvider.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/cluster/SubTabClusterGeneralPresenter.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractMainTabTableView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/InterfaceEditor.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ExternalNetworkPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/UnassignedNetworksPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/macpool/SharedMacPoolView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ManagePolicyUnitPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/BondPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/StatisticsPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VersionRenderer.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/HostStatusCell.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/AbstractLineChartProgressBarColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractProgressBarColumn.java
D
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractWebAdminImageResourceColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ActionColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/DcStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterHookSyncStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusCell.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaDcStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RoleTypeColumn.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/table/column/StorageDomainSharedStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/TaskStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
70 files changed, 351 insertions(+), 313 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/38724/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
index 60e7fc2..735c430 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
@@ -17,6 +17,7 @@
import org.ovirt.engine.ui.uicompat.IEventListener;
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.BrowserEvents;
@@ -74,6 +75,8 @@
* Table row data type.
*/
public abstract class AbstractActionTable<T> extends AbstractActionPanel<T>
implements ActionTable<T> {
+
+ private final CommonApplicationConstants constants =
GWT.create(CommonApplicationConstants.class);
@UiField
@WithElementId
@@ -323,7 +326,7 @@
nextPageButton.setVisible(true);
}
- public void showSelectionCountTooltip(final CommonApplicationConstants
constants) {
+ public void showSelectionCountTooltip() {
this.selectionModel.addSelectionChangeHandler(new
SelectionChangeEvent.Handler() {
private PopupPanel tooltip = null;
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
index f8bb229..728929d 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
@@ -28,10 +28,6 @@
@Inject
static Provider<ApplicationResources> applicationResourcesProvider;
- public static ApplicationResources getApplicationResources() {
- return applicationResourcesProvider.get();
- }
-
@Inject
static Provider<ApplicationResourcesWithLookup>
applicationResourcesWithLookupProvider;
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/UserPortalSimpleActionTable.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/UserPortalSimpleActionTable.java
index a87398b..89fc08a 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/UserPortalSimpleActionTable.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/UserPortalSimpleActionTable.java
@@ -5,9 +5,10 @@
import org.ovirt.engine.ui.common.widget.refresh.AbstractRefreshManager;
import org.ovirt.engine.ui.common.widget.refresh.RefreshPanel;
import org.ovirt.engine.ui.common.widget.table.SimpleActionTable;
+import org.ovirt.engine.ui.userportal.ApplicationResources;
import org.ovirt.engine.ui.userportal.SideTabWithDetailsViewStyle;
-import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.cellview.client.CellTable.Resources;
@@ -15,11 +16,13 @@
private static final SideTabWithDetailsViewStyle style;
+ private static final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
static {
// it has to be static - the parent constructor invokes
// the getBarPanelStyleName and getTableContainerStyleName
// which already needs the style prepared
- style =
ClientGinjectorProvider.getApplicationResources().sideTabWithDetailsViewStyle();
+ style = resources.sideTabWithDetailsViewStyle();
style.ensureInjected();
}
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java
index 52dc4af..f480a77 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java
@@ -1,15 +1,10 @@
package org.ovirt.engine.ui.userportal.widget.table.column;
import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
-import org.ovirt.engine.ui.userportal.ApplicationResources;
import org.ovirt.engine.ui.userportal.ApplicationResourcesWithLookup;
import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider;
public abstract class AbstractUserPortalImageResourceColumn<T> extends
AbstractImageResourceColumn<T> {
-
- protected ApplicationResources getApplicationResources() {
- return ClientGinjectorProvider.getApplicationResources();
- }
protected ApplicationResourcesWithLookup
getApplicationResourcesWithLookup() {
return ClientGinjectorProvider.getApplicationResourcesWithLookup();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java
index bbc9e94..e5a57c1 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java
@@ -4,26 +4,23 @@
import org.ovirt.engine.ui.common.widget.ImageWithDecorator;
import
org.ovirt.engine.ui.common.widget.table.column.AbstractDecoratedImageColumn;
import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel;
-
-import com.google.gwt.resources.client.ImageResource;
-
import org.ovirt.engine.ui.userportal.ApplicationResources;
-import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ImageResource;
public class VmStatusColumn extends
AbstractDecoratedImageColumn<UserPortalItemModel> {
private static final int DECORATOR_POSITION_LEFT = 16;
private static final int DECORATOR_POSITION_TOP = -9;
- protected ApplicationResources getApplicationResources() {
- return ClientGinjectorProvider.getApplicationResources();
- }
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageWithDecorator getValue(UserPortalItemModel item) {
VM vm = item.getVM();
ImageResource changesImage = null;
if (vm != null && vm.isNextRunConfigurationExists()) {
- changesImage = getApplicationResources().vmDelta();
+ changesImage = resources.vmDelta();
}
return new ImageWithDecorator(getMainImage(item), changesImage,
DECORATOR_POSITION_LEFT, DECORATOR_POSITION_TOP);
}
@@ -33,44 +30,44 @@
case Up:
VM vm = item.getVM();
if (vm == null) {
- return getApplicationResources().vmStatusRunning();
+ return resources.vmStatusRunning();
}
if (vm.isRunOnce()) {
- return getApplicationResources().runOnceUpImage();
+ return resources.runOnceUpImage();
} else {
- return getApplicationResources().vmStatusRunning();
+ return resources.vmStatusRunning();
}
case MigratingFrom:
case MigratingTo:
- return getApplicationResources().migrationImage();
+ return resources.migrationImage();
case WaitForLaunch:
- return getApplicationResources().waitforlaunch();
+ return resources.waitforlaunch();
case ImageLocked:
case SavingState:
- return getApplicationResources().vmStatusWaiting();
+ return resources.vmStatusWaiting();
case PoweringUp:
- return getApplicationResources().vmStatusStarting();
+ return resources.vmStatusStarting();
case RebootInProgress:
- return getApplicationResources().rebooting();
+ return resources.rebooting();
case RestoringState:
- return getApplicationResources().vmStatusWaiting();
+ return resources.vmStatusWaiting();
case Paused:
- return getApplicationResources().vmStatusPaused();
+ return resources.vmStatusPaused();
case Suspended:
- return getApplicationResources().vmStatusSuspended();
+ return resources.vmStatusSuspended();
case NotResponding:
case Unassigned:
case Unknown:
- return getApplicationResources().vmStatusUnknown();
+ return resources.vmStatusUnknown();
case ImageIllegal:
case Down:
- return getApplicationResources().vmStatusStopped();
+ return resources.vmStatusStopped();
case PoweringDown:
- return getApplicationResources().vmStatusStopping();
+ return resources.vmStatusStopping();
default:
- return getApplicationResources().vmStatusUnknown();
+ return resources.vmStatusUnknown();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorProvider.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorProvider.java
index 5d5e73f..c9a658a 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorProvider.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorProvider.java
@@ -1,10 +1,6 @@
package org.ovirt.engine.ui.webadmin.gin;
import org.ovirt.engine.ui.common.system.ClientStorage;
-import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.ApplicationMessages;
-import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
import com.google.gwt.event.shared.EventBus;
import com.google.inject.Inject;
@@ -24,34 +20,6 @@
public static EventBus getEventBus() {
return eventBusProvider.get();
- }
-
- @Inject
- static Provider<ApplicationConstants> applicationConstantsProvider;
-
- public static ApplicationConstants getApplicationConstants() {
- return applicationConstantsProvider.get();
- }
-
- @Inject
- static Provider<ApplicationMessages> applicationMessagesProvider;
-
- public static ApplicationMessages getApplicationMessages() {
- return applicationMessagesProvider.get();
- }
-
- @Inject
- static Provider<ApplicationTemplates> applicationTemplatesProvider;
-
- public static ApplicationTemplates getApplicationTemplates() {
- return applicationTemplatesProvider.get();
- }
-
- @Inject
- static Provider<ApplicationResources> applicationResourcesProvider;
-
- public static ApplicationResources getApplicationResources() {
- return applicationResourcesProvider.get();
}
@Inject
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/cluster/SubTabClusterGeneralPresenter.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/cluster/SubTabClusterGeneralPresenter.java
index 33fbb34..768f4a7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/cluster/SubTabClusterGeneralPresenter.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/cluster/SubTabClusterGeneralPresenter.java
@@ -14,9 +14,9 @@
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationMessages;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.ClusterSelectionChangeEvent;
+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;
@@ -31,12 +31,13 @@
import com.gwtplatform.mvp.client.annotations.ProxyEvent;
import com.gwtplatform.mvp.client.annotations.TabInfo;
import com.gwtplatform.mvp.client.proxy.PlaceManager;
-import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
import com.gwtplatform.mvp.client.proxy.TabContentProxyPlace;
+import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
public class SubTabClusterGeneralPresenter extends
AbstractSubTabPresenter<VDSGroup, ClusterListModel<Void>, ClusterGeneralModel,
SubTabClusterGeneralPresenter.ViewDef, SubTabClusterGeneralPresenter.ProxyDef> {
- private final ApplicationConstants constants;
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
+ private final ApplicationMessages messages =
GWT.create(ApplicationMessages.class);
@ProxyCodeSplit
@NameToken(WebAdminApplicationPlaces.clusterGeneralSubTabPlace)
@@ -59,8 +60,6 @@
void addAlert(Widget widget);
}
- private final ApplicationMessages messages;
-
@TabInfo(container = ClusterSubTabPanelPresenter.class)
static TabData getTabData(ApplicationConstants applicationConstants,
DetailModelProvider<ClusterListModel<Void>, ClusterGeneralModel>
modelProvider) {
@@ -69,12 +68,9 @@
@Inject
public SubTabClusterGeneralPresenter(EventBus eventBus, ViewDef view,
ProxyDef proxy,
- PlaceManager placeManager,
DetailModelProvider<ClusterListModel<Void>, ClusterGeneralModel> modelProvider,
ApplicationConstants constants) {
+ PlaceManager placeManager,
DetailModelProvider<ClusterListModel<Void>, ClusterGeneralModel> modelProvider)
{
super(eventBus, view, proxy, placeManager, modelProvider,
ClusterSubTabPanelPresenter.TYPE_SetTabContent);
- // Inject a reference to the messages:
- messages = ClientGinjectorProvider.getApplicationMessages();
- this.constants = constants;
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractMainTabTableView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractMainTabTableView.java
index 3407d9e..0de0cc8 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractMainTabTableView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractMainTabTableView.java
@@ -33,7 +33,7 @@
this.table.showRefreshButton();
this.table.showPagingButtons();
this.table.showItemsCount();
-
this.table.showSelectionCountTooltip(ClientGinjectorProvider.getApplicationConstants());
+ this.table.showSelectionCountTooltip();
}
protected SimpleActionTable<T> createActionTable() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/InterfaceEditor.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/InterfaceEditor.java
index a3c0c17b..edcdf87 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/InterfaceEditor.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/InterfaceEditor.java
@@ -7,7 +7,6 @@
import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
@@ -62,7 +61,7 @@
private final Driver driver = GWT.create(Driver.class);
- private static final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
public InterfaceEditor() {
protocolEditor = new ValueListBox<NetworkBootProtocol>(new
EnumRenderer<NetworkBootProtocol>());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java
index c999e38..ac8f217 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/BondPanel.java
@@ -5,7 +5,9 @@
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.BondNetworkInterfaceModel;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTMLTable.ColumnFormatter;
import com.google.gwt.user.client.ui.Image;
@@ -15,6 +17,8 @@
public class BondPanel extends NicPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public BondPanel(BondNetworkInterfaceModel item, NetworkPanelsStyle style)
{
super(item, style, true);
actionButton.setStyleName(style.actionButtonBond());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java
index 17edb7d..1424058 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ConnectorPanel.java
@@ -3,22 +3,23 @@
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
public class ConnectorPanel extends FlexTable {
- private final ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+
public ConnectorPanel(NetworkInterfaceModel nicModel, NetworkPanelsStyle
style) {
super();
int networkSize = nicModel.getTotalItemSize();
if (networkSize == 0) {
return;
}
- ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
setCellPadding(0);
setCellSpacing(0);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ExternalNetworkPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ExternalNetworkPanel.java
index c13b965..f44171f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ExternalNetworkPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ExternalNetworkPanel.java
@@ -1,11 +1,15 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.host.panels;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
public class ExternalNetworkPanel extends NetworkPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public ExternalNetworkPanel(LogicalNetworkModel item, NetworkPanelsStyle
style) {
super(item, style, false);
getElement().addClassName(style.disabledNetworkPanel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
index 8546d4e..e1a479b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworkPanel.java
@@ -2,10 +2,15 @@
import org.ovirt.engine.core.common.businessentities.network.NetworkStatus;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
public class InternalNetworkPanel extends NetworkPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public InternalNetworkPanel(LogicalNetworkModel item, NetworkPanelsStyle
style) {
this(item, style, true);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java
index 61cd734..8478c67 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/InternalNetworksPanel.java
@@ -4,13 +4,17 @@
import java.util.List;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel;
+import org.ovirt.engine.ui.webadmin.ApplicationConstants;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.VerticalPanel;
public class InternalNetworksPanel extends UnassignedNetworksPanel {
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
+
private final VerticalPanel requiredPanel = new VerticalPanel();
private final VerticalPanel nonRequiredPanel = new VerticalPanel();
private final List<VerticalPanel> unassignNetworksList = new
ArrayList<VerticalPanel>();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
index 234aa8c..4011870 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
@@ -15,8 +15,8 @@
import org.ovirt.engine.ui.webadmin.ApplicationMessages;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
@@ -27,10 +27,12 @@
private final FlexTable contents = new FlexTable();
private static final EnumRenderer<NetworkBootProtocol> RENDERER = new
EnumRenderer<NetworkBootProtocol>();
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
- private final ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationMessages messages =
ClientGinjectorProvider.getApplicationMessages();
+
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
+ private final ApplicationMessages messages =
GWT.create(ApplicationMessages.class);
+
SafeHtml mgmtNetworkImage =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.mgmtNetwork())
.getHTML());
SafeHtml vmImage =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkVm()).getHTML());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java
index cacce68..93211b9 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkGroup.java
@@ -12,8 +12,8 @@
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkLabelModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.DragDropEventBase;
import com.google.gwt.event.dom.client.DragEnterEvent;
@@ -36,7 +36,7 @@
private final NetworkPanelsStyle style;
private final NetworkInterfaceModel nicModel;
private final FlexTable table;
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
public NetworkGroup(NetworkInterfaceModel nicModel, final
NetworkPanelsStyle style) {
super();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
index cb61326..1968a63 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
@@ -12,10 +12,9 @@
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkItemModel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap;
-import org.ovirt.engine.ui.webadmin.ApplicationMessages;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -40,8 +39,9 @@
public static final String SETUP_NETWORKS_DATA = "SetupNetworksData";
//$NON-NLS-1$
public static final String SETUP_NETWORKS_TYPE = "SetupNetworksType";
//$NON-NLS-1$
- final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- final ApplicationMessages messages =
ClientGinjectorProvider.getApplicationMessages();
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
final Image dragImage = new Image(resources.itemDraggable());
final PushButton actionButton;
final NetworkItemModel<?> item;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java
index e0544b3..030709e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkLabelPanel.java
@@ -6,7 +6,9 @@
import org.ovirt.engine.ui.common.widget.label.LabelWithTextTruncation;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.LogicalNetworkModel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkLabelModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTMLTable.ColumnFormatter;
import com.google.gwt.user.client.ui.Image;
@@ -15,6 +17,8 @@
public class NetworkLabelPanel extends NetworkItemPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public NetworkLabelPanel(NetworkLabelModel item, NetworkPanelsStyle style)
{
super(item, style, false);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java
index fd0caff..433a53a 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkPanel.java
@@ -5,7 +5,10 @@
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkCommand;
import org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperation;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkOperationFactory.OperationMap;
+import org.ovirt.engine.ui.webadmin.ApplicationMessages;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.ui.Grid;
@@ -18,6 +21,9 @@
public abstract class NetworkPanel extends NetworkItemPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationMessages messages =
GWT.create(ApplicationMessages.class);
+
Label titleLabel;
public NetworkPanel(LogicalNetworkModel item, NetworkPanelsStyle style,
boolean draggable) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java
index 46b4030..7d88d48 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NicPanel.java
@@ -1,7 +1,9 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.host.panels;
import
org.ovirt.engine.ui.uicommonweb.models.hosts.network.NetworkInterfaceModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTMLTable.ColumnFormatter;
@@ -11,6 +13,8 @@
public class NicPanel extends NetworkItemPanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public NicPanel(NetworkInterfaceModel item, NetworkPanelsStyle style) {
this(item, style, true);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/UnassignedNetworksPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/UnassignedNetworksPanel.java
index 8fe1998..d5e4360 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/UnassignedNetworksPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/UnassignedNetworksPanel.java
@@ -3,8 +3,6 @@
import java.util.List;
import org.ovirt.engine.ui.uicommonweb.models.hosts.HostSetupNetworksModel;
-import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import org.ovirt.engine.ui.webadmin.widget.editor.AnimatedVerticalPanel;
import com.google.gwt.dom.client.Element;
@@ -22,7 +20,6 @@
public abstract class UnassignedNetworksPanel extends FocusPanel {
- protected final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
protected final AnimatedVerticalPanel animatedPanel = new
AnimatedVerticalPanel();
protected NetworkPanelsStyle style;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/macpool/SharedMacPoolView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/macpool/SharedMacPoolView.java
index 169b479..9d209f6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/macpool/SharedMacPoolView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/macpool/SharedMacPoolView.java
@@ -7,6 +7,7 @@
import org.ovirt.engine.ui.common.MainTableResources;
import org.ovirt.engine.ui.common.system.ClientStorage;
import org.ovirt.engine.ui.common.widget.table.SimpleActionTable;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn;
import
org.ovirt.engine.ui.common.widget.uicommon.permissions.PermissionListModelTable;
import org.ovirt.engine.ui.uicommonweb.UICommand;
@@ -17,7 +18,6 @@
import org.ovirt.engine.ui.webadmin.uicommon.model.PermissionModelProvider;
import org.ovirt.engine.ui.webadmin.uicommon.model.SharedMacPoolModelProvider;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
-import
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.resources.client.ImageResource;
@@ -103,7 +103,7 @@
tableResources,
eventBus,
clientStorage);
- macPoolTable.addColumn(new
AbstractWebAdminImageResourceColumn<MacPool>() {
+ macPoolTable.addColumn(new AbstractImageResourceColumn<MacPool>() {
@Override
public ImageResource getValue(MacPool macPool) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyView.java
index 02b3343..75e56a1 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyView.java
@@ -6,6 +6,7 @@
import org.ovirt.engine.ui.common.MainTableResources;
import org.ovirt.engine.ui.common.system.ClientStorage;
import org.ovirt.engine.ui.common.widget.table.SimpleActionTable;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn;
import org.ovirt.engine.ui.uicommonweb.UICommand;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
@@ -13,7 +14,6 @@
import
org.ovirt.engine.ui.webadmin.uicommon.model.ClusterPolicyClusterModelProvider;
import org.ovirt.engine.ui.webadmin.uicommon.model.ClusterPolicyModelProvider;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
-import
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
@@ -87,7 +87,7 @@
table = new
SimpleActionTable<ClusterPolicy>(clusterPolicyModelProvider,
getTableHeaderlessResources(), getTableResources(), eventBus,
clientStorage);
- table.addColumn(new
AbstractWebAdminImageResourceColumn<ClusterPolicy>() {
+ table.addColumn(new AbstractImageResourceColumn<ClusterPolicy>() {
@Override
public ImageResource getValue(ClusterPolicy object) {
if (object.isLocked()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ManagePolicyUnitPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ManagePolicyUnitPopupView.java
index ffb5c96..adcf1da 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ManagePolicyUnitPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ManagePolicyUnitPopupView.java
@@ -6,6 +6,7 @@
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.ListModelObjectCellTable;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
import
org.ovirt.engine.ui.uicommonweb.models.configure.scheduling.ManagePolicyUnitModel;
@@ -15,7 +16,6 @@
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.popup.scheduling.ManagePolicyUnitPopupPresenterWidget;
import org.ovirt.engine.ui.webadmin.widget.table.cell.NullableButtonCell;
-import
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn;
import com.google.gwt.cell.client.FieldUpdater;
import com.google.gwt.core.client.GWT;
@@ -72,7 +72,7 @@
policyUnitTable.enableColumnResizing();
policyUnitTableContainer.add(policyUnitTable);
- policyUnitTable.addColumn(new
AbstractWebAdminImageResourceColumn<PolicyUnit>() {
+ policyUnitTable.addColumn(new
AbstractImageResourceColumn<PolicyUnit>() {
@Override
public ImageResource getValue(PolicyUnit object) {
if (object.isInternal()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
index c4529d9..3114420 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
@@ -7,7 +7,6 @@
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
import org.ovirt.engine.ui.uicommonweb.models.storage.GlusterStorageModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
@@ -34,6 +33,8 @@
interface ViewIdHandler extends ElementIdHandler<GlusterStorageView> {
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
}
+
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@UiField
WidgetStyle style;
@@ -76,7 +77,7 @@
public GlusterStorageView() {
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
- localize(ClientGinjectorProvider.getApplicationConstants());
+ localize();
ViewIdHandler.idHandler.generateAndSetIds(this);
addStyles();
Driver.driver.initialize(this);
@@ -86,8 +87,7 @@
pathEditor.addContentWidgetContainerStyleName(style.pathEditorContent());
}
- void localize(ApplicationConstants constants) {
-
+ void localize() {
pathLabel.setText(constants.storagePopupPosixPathLabel());
pathHintLabel.setText(constants.storagePopupGlusterPathHintLabel());
vfsTypeLabel.setText(constants.storagePopupVfsTypeLabel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.java
index 9d84d26..5d3b21e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.java
@@ -6,7 +6,6 @@
import org.ovirt.engine.ui.common.widget.uicommon.storage.AbstractStorageView;
import org.ovirt.engine.ui.uicommonweb.models.storage.LocalStorageModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
@@ -30,6 +29,8 @@
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
}
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
+
@UiField
WidgetStyle style;
@@ -46,7 +47,7 @@
@Inject
public LocalStorageView() {
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
- localize(ClientGinjectorProvider.getApplicationConstants());
+ localize();
ViewIdHandler.idHandler.generateAndSetIds(this);
addStyles();
driver.initialize(this);
@@ -56,7 +57,7 @@
localPathEditor.addContentWidgetContainerStyleName(style.localPathContentWidget());
}
- void localize(ApplicationConstants constants) {
+ void localize() {
localPathEditor.setLabel(constants.storagePopupLocalPathLabel());
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java
index 2428d7a..0743c36 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java
@@ -1,17 +1,14 @@
package org.ovirt.engine.ui.webadmin.section.main.view.popup.storage;
import org.ovirt.engine.core.common.businessentities.NfsVersion;
-import org.ovirt.engine.ui.common.CommonApplicationConstants;
-import org.ovirt.engine.ui.common.CommonApplicationResources;
-import org.ovirt.engine.ui.common.CommonApplicationTemplates;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.widget.Align;
import org.ovirt.engine.ui.common.widget.VisibilityRenderer;
import org.ovirt.engine.ui.common.widget.dialog.AdvancedParametersExpander;
+import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxOnlyEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.EntityModelTextBoxOnlyEditor;
-import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxOnlyEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.ShortEntityModelTextBoxOnlyEditor;
import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxOnlyEditor;
import org.ovirt.engine.ui.common.widget.uicommon.storage.AbstractStorageView;
@@ -21,7 +18,8 @@
import org.ovirt.engine.ui.uicompat.IEventListener;
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
@@ -129,15 +127,15 @@
private final Driver driver = GWT.create(Driver.class);
- protected static final CommonApplicationConstants constants =
GWT.create(CommonApplicationConstants.class);
- protected static final CommonApplicationResources resources =
GWT.create(CommonApplicationResources.class);
- protected static final CommonApplicationTemplates templates =
GWT.create(CommonApplicationTemplates.class);
+ protected static final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
+ protected static final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ protected static final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
@Inject
public NfsStorageView() {
initEditors();
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
- localize(ClientGinjectorProvider.getApplicationConstants());
+ localize();
initExpander();
ViewIdHandler.idHandler.generateAndSetIds(this);
addStyles();
@@ -167,8 +165,7 @@
overrideEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new
VisibilityRenderer.SimpleVisibilityRenderer(), true);
}
- void localize(ApplicationConstants constants) {
-
+ void localize() {
pathLabel.setText(constants.storagePopupNfsPathLabel());
pathHintLabel.setText(constants.storagePopupNfsPathHintLabel());
warningLabel.setText(constants.advancedOptionsLabel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java
index 8ca2c48..d639cf3 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java
@@ -10,7 +10,6 @@
import org.ovirt.engine.ui.uicompat.EventArgs;
import org.ovirt.engine.ui.uicompat.IEventListener;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
@@ -37,6 +36,8 @@
interface ViewIdHandler extends ElementIdHandler<PosixStorageView> {
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
}
+
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@UiField
WidgetStyle style;
@@ -83,7 +84,7 @@
@Inject
public PosixStorageView() {
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
- localize(ClientGinjectorProvider.getApplicationConstants());
+ localize();
ViewIdHandler.idHandler.generateAndSetIds(this);
addStyles();
driver.initialize(this);
@@ -93,8 +94,7 @@
pathEditor.addContentWidgetContainerStyleName(style.pathEditorContent());
}
- void localize(ApplicationConstants constants) {
-
+ void localize() {
pathLabel.setText(constants.storagePopupPosixPathLabel());
pathHintLabel.setText(constants.storagePopupPosixPathHintLabel());
vfsTypeLabel.setText(constants.storagePopupVfsTypeLabel());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
index 1f745dc..e1b4388 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
@@ -46,7 +46,6 @@
import org.ovirt.engine.ui.webadmin.widget.table.cell.CustomSelectionCell;
import
org.ovirt.engine.ui.webadmin.widget.table.column.IsProblematicImportVmColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.VmTypeColumn;
-import
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn;
import com.google.gwt.cell.client.FieldUpdater;
import com.google.gwt.core.client.GWT;
@@ -306,7 +305,7 @@
table.addColumn(originColumn, constants.originVm(), "100px");
//$NON-NLS-1$
table.addColumn(
- new AbstractWebAdminImageResourceColumn<Object>() {
+ new AbstractImageResourceColumn<Object>() {
@Override
public com.google.gwt.resources.client.ImageResource
getValue(Object object) {
return new VmTypeColumn().getValue(((ImportVmData)
object).getVm());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java
index bd4aa1b..00b65a2 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java
@@ -14,7 +14,6 @@
import org.ovirt.engine.ui.uicommonweb.models.disks.DiskGeneralModel;
import org.ovirt.engine.ui.uicommonweb.models.disks.DiskListModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.disk.SubTabDiskGeneralPresenter;
import com.google.gwt.core.client.GWT;
@@ -53,7 +52,7 @@
private final Driver driver = GWT.create(Driver.class);
- private static final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Inject
public SubTabDiskGeneralView(DetailModelProvider<DiskListModel,
DiskGeneralModel> modelProvider) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java
index 22a0480..11dc65b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java
@@ -2,13 +2,6 @@
import javax.inject.Inject;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.editor.client.Editor;
-import com.google.gwt.editor.client.SimpleBeanEditorDriver;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.ValueLabel;
-import com.google.gwt.user.client.ui.Widget;
import org.ovirt.engine.core.common.businessentities.network.NetworkView;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.WithElementId;
@@ -24,9 +17,16 @@
import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkGeneralModel;
import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.network.SubTabNetworkGeneralPresenter;
import org.ovirt.engine.ui.webadmin.widget.renderer.MtuRenderer;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.editor.client.Editor;
+import com.google.gwt.editor.client.SimpleBeanEditorDriver;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.ValueLabel;
+import com.google.gwt.user.client.ui.Widget;
public class SubTabNetworkGeneralView extends
AbstractSubTabFormView<NetworkView, NetworkListModel, NetworkGeneralModel>
implements SubTabNetworkGeneralPresenter.ViewDef, Editor<NetworkGeneralModel> {
@@ -41,7 +41,7 @@
interface Driver extends SimpleBeanEditorDriver<NetworkGeneralModel,
SubTabNetworkGeneralView> {
}
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
TextBoxLabel name = new TextBoxLabel();
GuidLabel id = new GuidLabel();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
index 215f259..bcf82f6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
@@ -13,6 +13,7 @@
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider;
import org.ovirt.engine.ui.common.view.ViewRadioGroup;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import
org.ovirt.engine.ui.common.widget.table.column.AbstractNullableNumberColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractRxTxRateColumn;
import
org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlWithSafeHtmlTooltipColumn;
@@ -29,7 +30,6 @@
import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView;
import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
import org.ovirt.engine.ui.webadmin.widget.host.InterfaceStatusImage;
-import
org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn;
import org.ovirt.engine.ui.webadmin.widget.table.column.HostStatusColumn;
import com.google.gwt.core.client.GWT;
@@ -113,7 +113,7 @@
}
};
- AbstractWebAdminImageResourceColumn<PairQueryable<VdsNetworkInterface,
VDS>> nicStatusColumn = new
AbstractWebAdminImageResourceColumn<PairQueryable<VdsNetworkInterface, VDS>>(){
+ AbstractImageResourceColumn<PairQueryable<VdsNetworkInterface, VDS>>
nicStatusColumn = new
AbstractImageResourceColumn<PairQueryable<VdsNetworkInterface, VDS>>(){
@Override
public ImageResource getValue(PairQueryable<VdsNetworkInterface, VDS>
object) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
index b188f25..e6d4878 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
@@ -16,7 +16,6 @@
import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderGeneralModel;
import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderListModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.provider.SubTabProviderGeneralPresenter;
import com.google.gwt.core.client.GWT;
@@ -40,7 +39,7 @@
interface Driver extends SimpleBeanEditorDriver<ProviderGeneralModel,
SubTabProviderGeneralView> { }
private final Driver driver = GWT.create(Driver.class);
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
TextBoxLabel name = new TextBoxLabel();
ValueLabel<ProviderType> type = new ValueLabel<ProviderType>(new
EnumRenderer<ProviderType>());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java
index f2f577c..3ceaba1 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java
@@ -12,7 +12,6 @@
import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineGeneralPresenter;
import com.google.gwt.core.client.GWT;
@@ -34,8 +33,7 @@
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
}
- // We need this in order to find the icon for alert messages:
- private final ApplicationResources resources;
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@UiField(provided = true)
@WithElementId
@@ -57,9 +55,6 @@
public
SubTabVirtualMachineGeneralView(DetailModelProvider<VmListModel<Void>,
VmGeneralModel> modelProvider, ApplicationConstants constants) {
super(modelProvider);
this.form = new VmGeneralModelForm(modelProvider, constants);
-
- // Inject a reference to the resources:
- resources = ClientGinjectorProvider.getApplicationResources();
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
clearAlerts();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
index 5d69b99..0caafa6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
@@ -55,7 +55,7 @@
@Override
protected CellList<Bookmark> createDataDisplayWidget(BookmarkModelProvider
modelProvider) {
- ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
+ ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
final CellList<Bookmark> display = new CellList<Bookmark>(new
BookmarkListItemCell(templates));
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/BondPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/BondPanel.java
index 2d9a071..9c67aa5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/BondPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/BondPanel.java
@@ -3,8 +3,9 @@
import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus;
import org.ovirt.engine.ui.common.widget.TogglePanel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceLineModel;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.BorderStyle;
import com.google.gwt.dom.client.Style.Unit;
@@ -12,6 +13,8 @@
import com.google.gwt.user.client.ui.Label;
public class BondPanel extends TogglePanel {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
public BondPanel(HostInterfaceLineModel lineModel, boolean
isSelectionEnabled) {
super(lineModel);
@@ -32,9 +35,9 @@
// Bond icon
Image bondIcon;
if
(InterfaceStatus.UP.equals(lineModel.getInterface().getStatistics().getStatus()))
{
- bondIcon = new
Image(ClientGinjectorProvider.getApplicationResources().splitUpImage());
+ bondIcon = new Image(resources.splitUpImage());
} else {
- bondIcon = new
Image(ClientGinjectorProvider.getApplicationResources().splitDownImage());
+ bondIcon = new Image(resources.splitDownImage());
}
add(bondIcon);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
index 0d06f90..bf2162a 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
@@ -2,14 +2,15 @@
import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.ui.Image;
public class InterfaceStatusImage extends Image {
- private static ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
+ private static final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
public InterfaceStatusImage(InterfaceStatus status) {
super();
setResource(getResource(status));
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/StatisticsPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/StatisticsPanel.java
index b6b533b..3643fb4 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/StatisticsPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/StatisticsPanel.java
@@ -7,9 +7,10 @@
import org.ovirt.engine.ui.common.widget.renderer.RxTxRateRenderer;
import org.ovirt.engine.ui.common.widget.renderer.SumUpRenderer;
import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterface;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.widget.label.NullableNumberLabel;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.BorderStyle;
import com.google.gwt.dom.client.Style.Unit;
@@ -27,6 +28,8 @@
}
class StatisticsElementPanel extends TogglePanel {
+
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
private final NullableNumberLabel<Long> rxTotalLabel;
private final NullableNumberLabel<Long> txTotalLabel;
@@ -67,7 +70,7 @@
if (hostInterface.getSpeed() != null) {
setText(String.valueOf(hostInterface.getSpeed()));
} else {
-
setText(ClientGinjectorProvider.getApplicationConstants().unAvailablePropertyLabel());
+ setText(constants.unAvailablePropertyLabel());
}
}
});
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java
index b0c0cf2..94de78d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java
@@ -4,9 +4,10 @@
import org.ovirt.engine.ui.common.widget.TogglePanel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceLineModel;
import org.ovirt.engine.ui.uicommonweb.models.hosts.HostVLan;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.widget.renderer.HostVLanNameRenderer;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.BorderStyle;
import com.google.gwt.dom.client.Style.FontWeight;
@@ -45,6 +46,8 @@
class VLanElementPanel extends TogglePanel {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
private boolean isSelectionAvailable = false;
public VLanElementPanel(HostVLan hostVLan, boolean isSelectionEnabled) {
@@ -79,7 +82,7 @@
if (isSelectionAvailable) {
chekboxPanel.add(getCheckBox());
}
- chekboxPanel.add(new
Image(ClientGinjectorProvider.getApplicationResources().splitRotateImage()));
+ chekboxPanel.add(new Image(resources.splitRotateImage()));
chekboxPanel.add(new Label(new
HostVLanNameRenderer().render(hostVLan)));
row.setWidget(0, 0, chekboxPanel);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VersionRenderer.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VersionRenderer.java
index c4bdd3d..92b3985 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VersionRenderer.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VersionRenderer.java
@@ -2,11 +2,14 @@
import org.ovirt.engine.core.compat.RpmVersion;
import org.ovirt.engine.ui.common.widget.renderer.EmptyValueRenderer;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationConstants;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.text.shared.AbstractRenderer;
public class VersionRenderer extends AbstractRenderer<RpmVersion> {
+
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public String render(RpmVersion version) {
@@ -14,7 +17,6 @@
String formattedVersion;
formattedVersion = version.getRpmName();
- return new
EmptyValueRenderer<String>(ClientGinjectorProvider.getApplicationConstants()
- .unAvailablePropertyLabel()).render(formattedVersion);
+ return new
EmptyValueRenderer<String>(constants.unAvailablePropertyLabel()).render(formattedVersion);
}
}
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 5ae2e94..5ee7906 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
@@ -5,9 +5,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -16,11 +16,9 @@
public class BrickStatusCell extends AbstractCell<GlusterBrickEntity> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
-
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
-
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, GlusterBrickEntity brick,
SafeHtmlBuilder sb) {
@@ -55,7 +53,7 @@
// Generate the HTML for the image:
SafeHtml statusImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(statusImage).getHTML());
- sb.append(applicationTemplates.statusTemplate(statusImageHtml,
tooltip));
+ sb.append(templates.statusTemplate(statusImageHtml, tooltip));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
index b38e0e0..6193474 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
@@ -3,9 +3,9 @@
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -14,15 +14,14 @@
public class HostStatusCell extends AbstractCell<VDS> {
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+
@Override
public void render(Context context, VDS vds, SafeHtmlBuilder sb) {
// Nothing to render if no host is provided:
if (vds == null) {
return;
}
-
- // Get a reference to the application resources:
- ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
// Find the image corresponding to the status of the host:
VDSStatus status = vds.getStatus();
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 2053298..52d21b9 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
@@ -4,10 +4,10 @@
import org.ovirt.engine.ui.common.widget.action.MenuPanelPopup;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.cell.client.ValueUpdater;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.BrowserEvents;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.EventTarget;
@@ -24,8 +24,8 @@
public class MenuCell<T> extends AbstractCell<T> {
- private final ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
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 38b1d2e..1d67323 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
@@ -4,13 +4,13 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmPauseStatus;
-import org.ovirt.engine.ui.common.CommonApplicationConstants;
import org.ovirt.engine.ui.uicompat.EnumTranslator;
+import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -19,8 +19,8 @@
public class VmStatusCell extends AbstractCell<VM> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final CommonApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, VM vm, SafeHtmlBuilder sb) {
@@ -107,7 +107,7 @@
// Find the image corresponding to the alert
SafeHtml alertImageHtml = getResourceImage(vm);
- ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ ApplicationTemplates applicationTemplates =
GWT.create(ApplicationTemplates.class);
if (alertImageHtml != null) {
// this already has the tooltip set
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 ed62fbb..5784c99 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
@@ -5,9 +5,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -16,9 +16,9 @@
public class VolumeActivityStatusCell<T extends GlusterTaskSupport> extends
AbstractCell<T> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, T value, SafeHtmlBuilder sb) {
@@ -92,7 +92,7 @@
// Generate the HTML for the image:
SafeHtml activityImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(taskImage).getHTML());
- sb.append(applicationTemplates.image(activityImageHtml, tooltip));
+ sb.append(templates.image(activityImageHtml, tooltip));
}
}
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 db3e96e..f4fe041 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
@@ -4,9 +4,9 @@
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -15,8 +15,8 @@
public class VolumeBrickStatusCell extends AbstractCell<GlusterVolumeEntity> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public void render(Context context, GlusterVolumeEntity volume,
SafeHtmlBuilder sb) {
@@ -42,6 +42,6 @@
// Generate the HTML for the images
SafeHtml upImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(upImage).getHTML());
SafeHtml downImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(downImage).getHTML());
- sb.append(applicationTemplates.volumeBrickStatusTemplate(upImageHtml,
upBricks, downImageHtml, downBricks));
+ sb.append(templates.volumeBrickStatusTemplate(upImageHtml, upBricks,
downImageHtml, downBricks));
}
}
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 d00358a..cc8e8bd3 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
@@ -3,15 +3,15 @@
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeSizeInfo;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
public class VolumeCapacityCell extends AbstractCell<GlusterVolumeEntity> {
- private final ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
@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 fdee247..627ac12 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
@@ -6,9 +6,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -17,9 +17,9 @@
public class VolumeStatusCell extends AbstractCell<GlusterVolumeEntity> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
protected ImageResource downImage = resources.downImage();
protected ImageResource upImage = resources.upImage();
@@ -70,6 +70,6 @@
// Generate the HTML for the image:
SafeHtml statusImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(statusImage).getHTML());
- sb.append(applicationTemplates.statusTemplate(statusImageHtml,
tooltip));
+ sb.append(templates.statusTemplate(statusImageHtml, tooltip));
}
}
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 e64d802..1f76cbc 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
@@ -5,9 +5,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -16,9 +16,9 @@
public class VolumeTaskWaitingCell<T extends GlusterTaskSupport> extends
AbstractCell<T> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, T value, SafeHtmlBuilder sb) {
@@ -35,7 +35,7 @@
// Generate the HTML for the image:
SafeHtml activityImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(taskImage).getHTML());
- sb.append(applicationTemplates.image(activityImageHtml, tooltip));
+ sb.append(templates.image(activityImageHtml, tooltip));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
index 66277a0..6096da3 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
@@ -1,16 +1,17 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
-import com.google.gwt.canvas.client.Canvas;
-import com.google.gwt.canvas.dom.client.Context2d;
-import com.google.gwt.safehtml.shared.SafeHtml;
-import com.google.gwt.safehtml.shared.UriUtils;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn;
-import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
+import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
+
+import com.google.gwt.canvas.client.Canvas;
+import com.google.gwt.canvas.dom.client.Context2d;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.UriUtils;
/**
* An implementation of the SafeHtmlColumn which renders a list of integers as
a line chart to a HTML5 canvas. If the
@@ -29,7 +30,7 @@
*/
public abstract class AbstractLineChartProgressBarColumn<T> extends
AbstractSafeHtmlColumn<T> {
- private static final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private static final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
private static final int stepMax = 15;
@@ -100,7 +101,7 @@
String dataUrl = canvas.toDataUrl();
- return applicationTemplates.lineChart(
+ return templates.lineChart(
UriUtils.fromTrustedString(dataUrl),
rightMargin,
textWidth,
@@ -113,7 +114,7 @@
}
// if the chart does not fit in, show at least the text
- return applicationTemplates.lineChartWithoutImage(
+ return templates.lineChartWithoutImage(
textWidth,
textColor,
fontWeight,
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractProgressBarColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractProgressBarColumn.java
index 3df854d..d6d0aa9 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractProgressBarColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractProgressBarColumn.java
@@ -3,8 +3,9 @@
import java.util.Comparator;
import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtml;
/**
@@ -14,6 +15,8 @@
* Table row data type.
*/
public abstract class AbstractProgressBarColumn<T> extends
AbstractSafeHtmlColumn<T> {
+
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
public static enum ProgressBarColors {
GREEN("#669966"), //$NON-NLS-1$
@@ -41,7 +44,7 @@
// Choose color by progress
String color = getColorByProgress(progress);
- return
ClientGinjectorProvider.getApplicationTemplates().progressBar(progress, text,
color, getStyle());
+ return templates.progressBar(progress, text, color, getStyle());
}
protected String getStyle() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractWebAdminImageResourceColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractWebAdminImageResourceColumn.java
deleted file mode 100644
index 4d2d9aa..0000000
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractWebAdminImageResourceColumn.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.ovirt.engine.ui.webadmin.widget.table.column;
-
-import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
-import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
-
-public abstract class AbstractWebAdminImageResourceColumn<T> extends
AbstractImageResourceColumn<T> {
-
- protected ApplicationResources getApplicationResources() {
- return ClientGinjectorProvider.getApplicationResources();
- }
-
-}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ActionColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ActionColumn.java
index 5081bd7..04171b5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ActionColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ActionColumn.java
@@ -5,7 +5,6 @@
import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.ActionCell;
import com.google.gwt.cell.client.ActionCell.Delegate;
@@ -13,6 +12,7 @@
import com.google.gwt.cell.client.CompositeCell;
import com.google.gwt.cell.client.HasCell;
import com.google.gwt.cell.client.ValueUpdater;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.resources.client.ImageResource;
@@ -101,7 +101,7 @@
*/
private static class FloatingActionCell<C> extends ActionCell<C> {
private final ActionCellDelegate<C> delegate;
- private final ApplicationTemplates templates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
public FloatingActionCell(ActionCellDelegate<C> delegate) {
super("", delegate); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java
index ac296cf..41686fc 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java
@@ -1,23 +1,28 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.Commented;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class CommentColumn<T extends Commented> extends
AbstractWebAdminImageResourceColumn<T> {
+public class CommentColumn<T extends Commented> extends
AbstractImageResourceColumn<T> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(T value) {
setTitle(value.getComment());
if (value.getComment() != null && !value.getComment().isEmpty()) {
- return getApplicationResources().commentImage();
+ return resources.commentImage();
}
return null;
}
@Override
public ImageResource getDefaultImage() {
- return getApplicationResources().commentImage();
+ return resources.commentImage();
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/DcStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/DcStatusColumn.java
index da63684..9e6f1a7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/DcStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/DcStatusColumn.java
@@ -1,25 +1,30 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.StoragePool;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class DcStatusColumn extends
AbstractWebAdminImageResourceColumn<StoragePool> {
+public class DcStatusColumn extends AbstractImageResourceColumn<StoragePool> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(StoragePool dc) {
setEnumTitle(dc.getStatus());
switch (dc.getStatus()) {
case Contend:
- return getApplicationResources().waitImage();
+ return resources.waitImage();
case Maintenance:
- return getApplicationResources().maintenanceImage();
+ return resources.maintenanceImage();
case NotOperational:
case NonResponsive:
case Uninitialized:
- return getApplicationResources().downImage();
+ return resources.downImage();
case Up:
- return getApplicationResources().upImage();
+ return resources.upImage();
default:
break;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterHookSyncStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterHookSyncStatusColumn.java
index 6545e44..66edb27 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterHookSyncStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterHookSyncStatusColumn.java
@@ -1,16 +1,21 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class GlusterHookSyncStatusColumn extends
AbstractWebAdminImageResourceColumn<GlusterHookEntity> {
+public class GlusterHookSyncStatusColumn extends
AbstractImageResourceColumn<GlusterHookEntity> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(GlusterHookEntity hookEntity) {
if (hookEntity.hasConflicts()) {
- return getApplicationResources().alertImage();
+ return resources.alertImage();
}
return null;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusCell.java
index b86e13e..d40a1b6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusCell.java
@@ -5,9 +5,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -16,11 +16,9 @@
public class GlusterVolumeSnapshotStatusCell extends
AbstractCell<GlusterVolumeSnapshotEntity> {
- private static final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
-
- private static final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
-
- private static final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, GlusterVolumeSnapshotEntity snapshot,
SafeHtmlBuilder sb) {
@@ -55,6 +53,6 @@
// Generate the HTML for the image:
SafeHtml statusImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(statusImage).getHTML());
- sb.append(applicationTemplates.statusTemplate(statusImageHtml,
tooltip));
+ sb.append(templates.statusTemplate(statusImageHtml, tooltip));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java
index f1cdcab..3f70726 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java
@@ -1,18 +1,23 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.Role;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code PermissionTypeDataTemplate}.
*/
-public class IsLockedImageTypeColumn extends
AbstractWebAdminImageResourceColumn<Role> {
+public class IsLockedImageTypeColumn extends AbstractImageResourceColumn<Role>
{
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(Role role) {
if (role.isReadonly()) {
- return getApplicationResources().lockImage();
+ return resources.lockImage();
}
return null;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java
index 0fa91e0..e4b15c7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java
@@ -3,13 +3,18 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.VM;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code PermissionTypeDataTemplate}.
*/
-public class IsProblematicImportVmColumn extends
AbstractWebAdminImageResourceColumn<Object> {
+public class IsProblematicImportVmColumn extends
AbstractImageResourceColumn<Object> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
private final List<VM> problematicItems;
@@ -20,7 +25,7 @@
@Override
public ImageResource getValue(Object vm) {
if (problematicItems.contains(vm)) {
- return getApplicationResources().alertImage();
+ return resources.alertImage();
}
return null;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
index 908debc..3d8b041 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
@@ -3,13 +3,13 @@
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
import org.ovirt.engine.core.common.utils.PairQueryable;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import com.google.gwt.resources.client.ImageResource;
-public class NetworkClusterStatusColumn extends
AbstractWebAdminImageResourceColumn<PairQueryable<VDSGroup, NetworkCluster>>{
+public class NetworkClusterStatusColumn extends
AbstractImageResourceColumn<PairQueryable<VDSGroup, NetworkCluster>>{
private final NetworkStatusColumn networkStatusColumn = new
NetworkStatusColumn();
-
@Override
public ImageResource getValue(PairQueryable<VDSGroup, NetworkCluster>
object) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkStatusColumn.java
index 07c12c0..841dcbb7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkStatusColumn.java
@@ -2,10 +2,15 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.businessentities.network.NetworkCluster;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class NetworkStatusColumn extends
AbstractWebAdminImageResourceColumn<Network> {
+public class NetworkStatusColumn extends AbstractImageResourceColumn<Network> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(Network nwk) {
@@ -16,11 +21,11 @@
setEnumTitle(net_cluster.getStatus());
switch (net_cluster.getStatus()) {
case OPERATIONAL:
- return getApplicationResources().upImage();
+ return resources.upImage();
case NON_OPERATIONAL:
- return getApplicationResources().downImage();
+ return resources.downImage();
default:
- return getApplicationResources().downImage();
+ return resources.downImage();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaDcStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaDcStatusColumn.java
index b75c393..5b23dc6 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaDcStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaDcStatusColumn.java
@@ -1,30 +1,35 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.Quota;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code QuotaDcStatusColumn}.
*/
-public class QuotaDcStatusColumn extends
AbstractWebAdminImageResourceColumn<Quota> {
+public class QuotaDcStatusColumn extends AbstractImageResourceColumn<Quota> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(Quota quota) {
if (quota.getQuotaEnforcementType() == null) {
- return getApplicationResources().iconDisable();
+ return resources.iconDisable();
}
setEnumTitle(quota.getQuotaEnforcementType());
switch (quota.getQuotaEnforcementType()) {
case HARD_ENFORCEMENT:
- return getApplicationResources().iconEnforce();
+ return resources.iconEnforce();
case SOFT_ENFORCEMENT:
- return getApplicationResources().iconAudit();
+ return resources.iconAudit();
case DISABLED:
- return getApplicationResources().iconDisable();
+ return resources.iconDisable();
default:
- return getApplicationResources().iconDisable();
+ return resources.iconDisable();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
index eb2c792..846a98f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
@@ -2,15 +2,17 @@
import org.ovirt.engine.core.common.businessentities.QuotaStorage;
import org.ovirt.engine.core.common.businessentities.QuotaVdsGroup;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class QuotaUtilizationStatusColumn<IVdcQueryable> extends
AbstractWebAdminImageResourceColumn<IVdcQueryable> {
+public class QuotaUtilizationStatusColumn<IVdcQueryable> extends
AbstractImageResourceColumn<IVdcQueryable> {
- private static final ApplicationConstants applicationConstants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public ImageResource getValue(IVdcQueryable quota) {
@@ -24,10 +26,10 @@
}
if (quotaExceeded) {
- setTitle(applicationConstants.quotaExceeded());
+ setTitle(constants.quotaExceeded());
}
- return quotaExceeded ? getResources().alertImage() : null;
+ return quotaExceeded ? resources.alertImage() : null;
}
private boolean getQuotaExceeded(QuotaStorage quota) {
@@ -45,8 +47,4 @@
&& quota.getVirtualCpu() < quota.getVirtualCpuUsage());
}
- private ApplicationResources getResources() {
- // Get a reference to the application resources:
- return ClientGinjectorProvider.getApplicationResources();
- }
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RoleTypeColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RoleTypeColumn.java
index 44cb262..0c6d49b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RoleTypeColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/RoleTypeColumn.java
@@ -1,23 +1,28 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.Role;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code PermissionTypeDataTemplate}.
*/
-public class RoleTypeColumn extends AbstractWebAdminImageResourceColumn<Role> {
+public class RoleTypeColumn extends AbstractImageResourceColumn<Role> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(Role role) {
switch (role.getType()) {
case ADMIN:
- return getApplicationResources().adminImage();
+ return resources.adminImage();
case USER:
- return getApplicationResources().userImage();
+ return resources.userImage();
}
- return getApplicationResources().adminImage();
+ return resources.adminImage();
}
}
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 e4cd624..f710d5d 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
@@ -4,9 +4,9 @@
import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
import org.ovirt.engine.ui.webadmin.ApplicationTemplates;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
import com.google.gwt.cell.client.AbstractCell;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -15,9 +15,9 @@
public class StorageDeviceStatusCell extends AbstractCell<StorageDevice> {
- private final ApplicationResources resources =
ClientGinjectorProvider.getApplicationResources();
- private final ApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
- private final ApplicationTemplates applicationTemplates =
ClientGinjectorProvider.getApplicationTemplates();
+ private final ApplicationTemplates templates =
GWT.create(ApplicationTemplates.class);
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public void render(Context context, StorageDevice device, SafeHtmlBuilder
sb) {
@@ -35,7 +35,7 @@
// Generate the HTML for the image:
SafeHtml statusImageHtml =
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(statusImage).getHTML());
- sb.append(applicationTemplates.statusTemplate(statusImageHtml,
tooltip));
+ sb.append(templates.statusTemplate(statusImageHtml, tooltip));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java
index ceeb338..e267fb7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainSharedStatusColumn.java
@@ -3,10 +3,15 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StorageType;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class StorageDomainSharedStatusColumn extends
AbstractWebAdminImageResourceColumn<StorageDomain> {
+public class StorageDomainSharedStatusColumn extends
AbstractImageResourceColumn<StorageDomain> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(StorageDomain sp) {
@@ -15,20 +20,20 @@
switch (sp.getStorageDomainSharedStatus()) {
case Unattached:
if (sp.getStorageType() == StorageType.GLANCE) {
- return getApplicationResources().openstackImage();
+ return resources.openstackImage();
} else {
- return getApplicationResources().tornChainImage();
+ return resources.tornChainImage();
}
case Active:
- return getApplicationResources().upImage();
+ return resources.upImage();
case Inactive:
- return getApplicationResources().downImage();
+ return resources.downImage();
case Mixed:
- return getApplicationResources().upalertImage();
+ return resources.upalertImage();
case Locked:
- return getApplicationResources().lockImage();
+ return resources.lockImage();
default:
- return getApplicationResources().downImage();
+ return resources.downImage();
}
}
else {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java
index 49dfe21..727ecf5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDomainStatusColumn.java
@@ -2,10 +2,15 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageType;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
-public class StorageDomainStatusColumn extends
AbstractWebAdminImageResourceColumn<StorageDomain> {
+public class StorageDomainStatusColumn extends
AbstractImageResourceColumn<StorageDomain> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(StorageDomain sp) {
@@ -13,25 +18,25 @@
switch (sp.getStatus()) {
case Unattached:
if (sp.getStorageType() == StorageType.GLANCE) {
- return getApplicationResources().openstackImage();
+ return resources.openstackImage();
} else {
- return getApplicationResources().tornChainImage();
+ return resources.tornChainImage();
}
case Active:
- return getApplicationResources().upImage();
+ return resources.upImage();
case Inactive:
- return getApplicationResources().downImage();
+ return resources.downImage();
case Uninitialized:
- return getApplicationResources().unconfiguredImage();
+ return resources.unconfiguredImage();
case Activating:
case Locked:
case PreparingForMaintenance:
case Detaching:
- return getApplicationResources().lockImage();
+ return resources.lockImage();
case Maintenance:
- return getApplicationResources().maintenanceImage();
+ return resources.maintenanceImage();
default:
- return getApplicationResources().downImage();
+ return resources.downImage();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/TaskStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/TaskStatusColumn.java
index 070adb7..1fa2907 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/TaskStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/TaskStatusColumn.java
@@ -3,14 +3,19 @@
import org.ovirt.engine.core.common.job.Job;
import org.ovirt.engine.core.common.job.JobExecutionStatus;
import org.ovirt.engine.core.common.job.Step;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code HistorySeverityTemplate}.
*/
-public class TaskStatusColumn extends
AbstractWebAdminImageResourceColumn<EntityModel> {
+public class TaskStatusColumn extends AbstractImageResourceColumn<EntityModel>
{
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(EntityModel jobOrStep) {
@@ -26,15 +31,15 @@
setEnumTitle(jobExecutionStatus);
switch (jobExecutionStatus) {
case STARTED:
- return getApplicationResources().waitImage();
+ return resources.waitImage();
case FINISHED:
- return getApplicationResources().logNormalImage();
+ return resources.logNormalImage();
case FAILED:
- return getApplicationResources().logErrorImage();
+ return resources.logErrorImage();
case ABORTED:
- return getApplicationResources().alertImage();
+ return resources.alertImage();
case UNKNOWN:
- return getApplicationResources().questionMarkImage();
+ return resources.questionMarkImage();
default:
return null;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java
index 6a747e1..cf46789 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java
@@ -1,23 +1,28 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.aaa.DbUser;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationResources;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code UserStatusTemplate}.
*/
-public class UserStatusColumn extends
AbstractWebAdminImageResourceColumn<DbUser> {
+public class UserStatusColumn extends AbstractImageResourceColumn<DbUser> {
+
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
@Override
public ImageResource getValue(DbUser user) {
if (user.isAdmin()) {
- return getApplicationResources().adminImage();
+ return resources.adminImage();
}
if (user.isGroup()) {
- return getApplicationResources().userGroupImage();
+ return resources.userGroupImage();
}
- return getApplicationResources().userImage();
+ return resources.userImage();
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
index f32bc2e..72068c8 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
@@ -1,30 +1,34 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
-import com.google.gwt.resources.client.ImageResource;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmType;
import org.ovirt.engine.ui.common.CommonApplicationConstants;
+import
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
+import org.ovirt.engine.ui.webadmin.ApplicationConstants;
import org.ovirt.engine.ui.webadmin.ApplicationResources;
-import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ImageResource;
/**
* Image column that corresponds to XAML {@code VmTypeTemplate}.
*/
-public class VmTypeColumn extends AbstractWebAdminImageResourceColumn<VM> {
+public class VmTypeColumn extends AbstractImageResourceColumn<VM> {
- private static final CommonApplicationConstants constants =
ClientGinjectorProvider.getApplicationConstants();
+ private final ApplicationResources resources =
GWT.create(ApplicationResources.class);
+ private final ApplicationConstants constants =
GWT.create(ApplicationConstants.class);
@Override
public ImageResource getValue(VM vm) {
if (vm.getVmPoolId() == null) {
VmTypeConfig config = VmTypeConfig.from(vm.getVmType(),
vm.isStateless(), vm.isNextRunConfigurationExists());
setTitle(config.getTooltip(constants));
- return config.getImageResource(getApplicationResources());
+ return config.getImageResource(resources);
} else {
if (!vm.isNextRunConfigurationExists()) {
- return getApplicationResources().manyDesktopsImage();
+ return resources.manyDesktopsImage();
} else {
- return
getApplicationResources().manyDesktopsChangesImage();
+ return resources.manyDesktopsChangesImage();
}
}
--
To view, visit https://gerrit.ovirt.org/38724
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifafe5a16068452dac46208c6f06b05c113403443
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
