Tomas Jelinek has uploaded a new change for review. Change subject: userportal: changed Spice to SPICE ......................................................................
userportal: changed Spice to SPICE Removed the hardcoded Spice string from ConsoleProtocol. Change-Id: I7e610d12a2966ccff81e722d41c3bcde4c6a4be7 Bug-Url: https://bugzilla.redhat.com/876900 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsoleProtocol.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java 2 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/14400/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsoleProtocol.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsoleProtocol.java index 12e8142..4359192 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsoleProtocol.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsoleProtocol.java @@ -7,15 +7,13 @@ public enum ConsoleProtocol { - SPICE("SPICE", SpiceConsoleModel.class), //$NON-NLS-1$ - RDP("Remote Desktop", RdpConsoleModel.class), //$NON-NLS-1$ - VNC("VNC", VncConsoleModel.class); //$NON-NLS-1$ + SPICE(SpiceConsoleModel.class), //$NON-NLS-1$ + RDP(RdpConsoleModel.class), //$NON-NLS-1$ + VNC(VncConsoleModel.class); //$NON-NLS-1$ - public String displayName; private final Class<? extends ConsoleModel> model; - private ConsoleProtocol(String displayName, Class<? extends ConsoleModel> model) { - this.displayName = displayName; + private ConsoleProtocol(Class<? extends ConsoleModel> model) { this.model = model; } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java index ef8c47f..78a6279 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java @@ -1,7 +1,11 @@ package org.ovirt.engine.ui.userportal.section.main.presenter.tab.basic; +import java.util.HashMap; +import java.util.Map; + import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.VMStatus; +import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.presenter.popup.ConsoleModelChangedEvent; import org.ovirt.engine.ui.common.presenter.popup.ConsoleModelChangedEvent.ConsoleModelChangedHandler; import org.ovirt.engine.ui.common.widget.HasEditorDriver; @@ -47,16 +51,20 @@ private final ConsoleUtils consoleUtils; private final ApplicationMessages messages; + private final Map<ConsoleProtocol, String> consoleTypeToName = new HashMap<ConsoleProtocol, String>(); @Inject public MainTabBasicDetailsPresenterWidget(EventBus eventBus, ViewDef view, final UserPortalBasicListProvider modelProvider, final ConsoleUtils consoleUtils, - final ApplicationMessages messages) { + final ApplicationMessages messages, + final CommonApplicationConstants constants) { super(eventBus, view); this.consoleUtils = consoleUtils; this.messages = messages; + + initConsoleTypeToNameMap(constants); listenOnSelectedItemEvent(modelProvider); @@ -75,6 +83,12 @@ } }); + } + + private void initConsoleTypeToNameMap(CommonApplicationConstants constants) { + consoleTypeToName.put(ConsoleProtocol.SPICE, constants.spice()); + consoleTypeToName.put(ConsoleProtocol.RDP, constants.remoteDesktop()); + consoleTypeToName.put(ConsoleProtocol.VNC, constants.vnc()); } protected void listenOnConsoleModelChangeEvent(EventBus eventBus, final UserPortalBasicListProvider modelProvider) { @@ -163,10 +177,10 @@ private String determineProtocolMessage(ConsoleProtocol protocol, HasConsoleModel item) { if (consoleUtils.isSmartcardGloballyEnabled(item) && !consoleUtils.isSmartcardEnabledOverriden(item)) { - return messages.consoleWithSmartcard(protocol.displayName); + return messages.consoleWithSmartcard(consoleTypeToName.get(protocol)); } - return protocol.displayName; + return consoleTypeToName.get(protocol); } private boolean isEditConsoleEnabled(UserPortalItemModel item) { -- To view, visit http://gerrit.ovirt.org/14400 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e610d12a2966ccff81e722d41c3bcde4c6a4be7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
