Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: cleanup console utils usage ......................................................................
userportal,webadmin: cleanup console utils usage Following cleanups: - removed code which was copy/pasted to configurator - created an interface to ConsoleUtils so can be used from uicommonweb - moved common configurator configuration from UtilsModule to BaseUtilsModule Change-Id: If073bd036a46d9bae3aa21f088cc76c83af613ee Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseUtilsModule.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleManager.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleOptionsFrontendPersisterImpl.java R frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtilsImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ConsoleUtils.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UtilsModule.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicListItemPresenterWidget.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ConsoleButtonCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UtilsModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabVirtualMachinePresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java 19 files changed, 75 insertions(+), 80 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/13576/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseUtilsModule.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseUtilsModule.java index 2e6861b..c341102 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseUtilsModule.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/gin/BaseUtilsModule.java @@ -1,7 +1,10 @@ package org.ovirt.engine.ui.common.gin; +import org.ovirt.engine.ui.common.utils.ConsoleManager; import org.ovirt.engine.ui.common.utils.ConsoleOptionsFrontendPersisterImpl; +import org.ovirt.engine.ui.common.utils.ConsoleUtilsImpl; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import com.google.gwt.inject.client.AbstractGinModule; import com.google.inject.Singleton; @@ -11,6 +14,8 @@ @Override protected void configure() { bind(ConsoleOptionsFrontendPersister.class).to(ConsoleOptionsFrontendPersisterImpl.class).in(Singleton.class); + bind(ConsoleUtils.class).to(ConsoleUtilsImpl.class).in(Singleton.class); + bind(ConsoleManager.class).in(Singleton.class); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java index e3ad2ed..70611d0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java @@ -2,8 +2,8 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.ConsolePopupModel; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java index e57c3c3..ec0bf72 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java @@ -2,6 +2,7 @@ import org.ovirt.engine.ui.uicommonweb.Configurator; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.ILogger; import org.ovirt.engine.ui.uicommonweb.ITimer; import org.ovirt.engine.ui.uicommonweb.ITypeResolver; @@ -16,12 +17,14 @@ private final Configurator configurator; private final ILogger logger; private final ConsoleOptionsFrontendPersister consoleOptionsFrontendPersister; + private final ConsoleUtils consoleUtils; @Inject - public UiCommonDefaultTypeResolver(Configurator configurator, ILogger logger, ConsoleOptionsFrontendPersister consoleOptionsFrontendPersister) { + public UiCommonDefaultTypeResolver(Configurator configurator, ILogger logger, ConsoleOptionsFrontendPersister consoleOptionsFrontendPersister, ConsoleUtils consoleUtils) { this.configurator = configurator; this.logger = logger; this.consoleOptionsFrontendPersister = consoleOptionsFrontendPersister; + this.consoleUtils = consoleUtils; } @SuppressWarnings("rawtypes") @@ -41,6 +44,8 @@ return new IRdpImpl(); } else if (type == ConsoleOptionsFrontendPersister.class) { return consoleOptionsFrontendPersister; + } else if (type == ConsoleUtils.class) { + return consoleUtils; } throw new RuntimeException("UiCommon Resolver cannot resolve type: " + type); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleManager.java index df3cd28..56b41f9 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleManager.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleManager.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.common.utils; import org.ovirt.engine.ui.common.CommonApplicationMessages; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; import org.ovirt.engine.ui.uicommonweb.models.HasConsoleModel; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleOptionsFrontendPersisterImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleOptionsFrontendPersisterImpl.java index aeeed2e..d49068c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleOptionsFrontendPersisterImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleOptionsFrontendPersisterImpl.java @@ -2,6 +2,7 @@ import org.ovirt.engine.ui.common.system.ClientStorage; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; import org.ovirt.engine.ui.uicommonweb.models.HasConsoleModel; import org.ovirt.engine.ui.uicommonweb.models.vms.IRdp; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtils.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtilsImpl.java similarity index 93% rename from frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtils.java rename to frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtilsImpl.java index b5a6291..04f8491 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtils.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/ConsoleUtilsImpl.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.uicommon.ClientAgentType; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; import org.ovirt.engine.ui.uicommonweb.models.HasConsoleModel; @@ -17,7 +18,7 @@ import com.google.gwt.regexp.shared.RegExp; import com.google.inject.Inject; -public class ConsoleUtils { +public class ConsoleUtilsImpl implements ConsoleUtils { private Boolean spiceAvailable; private Boolean rdpAvailable; @@ -28,7 +29,7 @@ private final ClientAgentType clientAgentType; @Inject - public ConsoleUtils(ClientAgentType clientAgentType, CommonApplicationConstants constants) { + public ConsoleUtilsImpl(ClientAgentType clientAgentType, CommonApplicationConstants constants) { this.clientAgentType = clientAgentType; VNC_NOT_SUPPORTED_MESSAGE = constants.vncNotSupportedMsg(); @@ -145,10 +146,6 @@ return isSpiceAvailable || isRdpAvailable || isVncAvailable; } - /** - * The ctrl+alt+del is enabled for all OS except windows newer than 7 - * @return false if and only if the client OS type is Windows 7 or newer otherwise returns true - */ public boolean isCtrlAltDelEnabled() { if (!isWindowsClient()) { return true; @@ -178,9 +175,6 @@ return -1; } - /** - * Returns true if the smartcard is enabled for the specific VM entity (edit VM popup) - */ public boolean isSmartcardGloballyEnabled(HasConsoleModel item) { ConsoleModel consoleModel = item.getDefaultConsoleModel(); if (consoleModel instanceof SpiceConsoleModel) { @@ -190,9 +184,6 @@ return false; } - /** - * Returns true if the smartcard is locally disabled from the edit console options popup - */ public boolean isSmartcardEnabledOverriden(HasConsoleModel item) { ConsoleModel consoleModel = item.getDefaultConsoleModel(); if (consoleModel instanceof SpiceConsoleModel) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java index d3f7ca6..fe7263a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java @@ -17,8 +17,6 @@ import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; import com.google.gwt.i18n.client.LocaleInfo; -import com.google.gwt.regexp.shared.MatchResult; -import com.google.gwt.regexp.shared.RegExp; /** * Provides configuration values for client side. @@ -366,45 +364,6 @@ public Version parseVersion(String versionStr) { return new Version(versionStr.replace(',', '.').replace("\n", "")); //$NON-NLS-1$ //$NON-NLS-2$ } - - // This code is copy-pasted from ConsoleUtils. The ConsoleUtils with lots of other - // console related logic is being extracted to common code. As soon as this - // effort will be finished, this code will have to be deleted and the corresponding - // logic will have to be called. - // TODO tjelinek: as soon as the console extraction will be done, get rid of this code - public boolean isCtrlAltDeleteEnabled() { - if (!clientOsType().equalsIgnoreCase("Windows")) { //$NON-NLS-1$ - return true; - } - - float ntVersion = extractNtVersion(getUserAgentString()); - - // For Windows 7 and Windows Server 2008 R2 it is NT 6.1 - // For Windows 8 and Windows Server 2012 it is NT 6.2 - // The passing of ctrl+alt+del is enabled only on windows older - // than Windows 7, so NT less than 6.1 - if (ntVersion >= 6.1f) { - return false; - } - - return true; - } - - private float extractNtVersion(String userAgentType) { - RegExp pattern = RegExp.compile(".*windows nt (\\d+\\.\\d+).*"); //$NON-NLS-1$ - MatchResult matcher = pattern.exec(userAgentType.toLowerCase()); - boolean matchFound = (matcher != null); - if (matchFound) { - return Float.parseFloat(matcher.getGroup(1)); - } - - return -1; - } - - public native String getUserAgentString() /*-{ - var userAgent = navigator.userAgent; - return userAgent; - }-*/; protected abstract Event getSpiceVersionFileFetchedEvent(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ConsoleUtils.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ConsoleUtils.java new file mode 100644 index 0000000..8342f7c --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ConsoleUtils.java @@ -0,0 +1,46 @@ +package org.ovirt.engine.ui.uicommonweb; + +import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; +import org.ovirt.engine.ui.uicommonweb.models.HasConsoleModel; + +/** + * Common interface for the console utils so it can be used both from uicommonweb and from gin managed componets + */ +public interface ConsoleUtils { + + boolean isSpiceProxyDefined(); + + boolean isWanOptionsAvailable(HasConsoleModel model); + + /** + * Returns true if the smartcard is locally disabled from the edit console options popup + */ + boolean isSmartcardEnabledOverriden(HasConsoleModel item); + + /** + * Returns true if the smartcard is enabled for the specific VM entity (edit VM popup) + */ + boolean isSmartcardGloballyEnabled(HasConsoleModel item); + + /** + * The ctrl+alt+del is enabled for all OS except windows newer than 7 + * + * @return false if and only if the client OS type is Windows 7 or newer otherwise returns true + */ + boolean isCtrlAltDelEnabled(); + + boolean canShowConsole(ConsoleProtocol selectedProtocol, HasConsoleModel item); + + ConsoleProtocol determineConnectionProtocol(HasConsoleModel item); + + String determineProtocolMessage(HasConsoleModel item); + + boolean canOpenRDPConsole(HasConsoleModel item); + + boolean canOpenSpiceConsole(HasConsoleModel item); + + boolean isRDPAvailable(); + + boolean isSpiceAvailable(); + +} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index bab072e..a78200c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -36,7 +36,7 @@ import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.BaseCommandTarget; -import org.ovirt.engine.ui.uicommonweb.Configurator; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.ILogger; import org.ovirt.engine.ui.uicommonweb.TypeResolver; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -149,8 +149,8 @@ } // make sure to not send the ctrl+alt+delete and TaskMgrExecution if not supported - Configurator configurator = (Configurator) TypeResolver.getInstance().Resolve(Configurator.class); - if (!configurator.isCtrlAltDeleteEnabled()) { + ConsoleUtils consoleUtils = (ConsoleUtils) TypeResolver.getInstance().Resolve(ConsoleUtils.class); + if (!consoleUtils.isCtrlAltDelEnabled()) { getspice().setSendCtrlAltDelete(false); getspice().setNoTaskMgrExecution(false); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UtilsModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UtilsModule.java index b61b13a..9a1a167 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UtilsModule.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UtilsModule.java @@ -1,8 +1,6 @@ package org.ovirt.engine.ui.userportal.gin; import org.ovirt.engine.ui.common.gin.BaseUtilsModule; -import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.userportal.section.login.presenter.ConnectAutomaticallyProvider; import org.ovirt.engine.ui.userportal.utils.ConnectAutomaticallyManager; import org.ovirt.engine.ui.userportal.widget.basic.MainTabBasicListItemMessagesTranslator; @@ -14,11 +12,9 @@ @Override protected void configure() { super.configure(); - bind(ConsoleUtils.class).in(Singleton.class); bind(MainTabBasicListItemMessagesTranslator.class).in(Singleton.class); bind(ConnectAutomaticallyProvider.class).in(Singleton.class); bind(ConnectAutomaticallyManager.class).in(Singleton.class); - bind(ConsoleManager.class).in(Singleton.class); } } 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 a736c08..632e7e2 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 @@ -4,8 +4,8 @@ import org.ovirt.engine.core.common.businessentities.VMStatus; 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.utils.ConsoleUtils; import org.ovirt.engine.ui.common.widget.HasEditorDriver; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.models.HasConsoleModel; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalBasicListModel; diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicListItemPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicListItemPresenterWidget.java index f2905bb..70d4fab 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicListItemPresenterWidget.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicListItemPresenterWidget.java @@ -4,9 +4,9 @@ import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.common.widget.HasEditorDriver; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister.ConsoleContext; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalBasicListModel; diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java index 384930d..091192e 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java @@ -9,10 +9,10 @@ import org.ovirt.engine.ui.common.presenter.popup.ConsolePopupPresenterWidget; import org.ovirt.engine.ui.common.system.ErrorPopupManager; import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.common.utils.ElementIdUtils; import org.ovirt.engine.ui.common.widget.table.SimpleActionTable; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister.ConsoleContext; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java index 4ea8c95..014749c 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java @@ -7,10 +7,10 @@ import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent.UiCommonInitHandler; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Configurator; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.vms.ISpice; import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ConsoleButtonCell.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ConsoleButtonCell.java index df9b4fe..f258524 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ConsoleButtonCell.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/extended/vm/ConsoleButtonCell.java @@ -1,7 +1,7 @@ package org.ovirt.engine.ui.userportal.widget.extended.vm; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.common.utils.ElementIdUtils; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.models.ConsoleProtocol; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UtilsModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UtilsModule.java index ef40b9b..c8f1e71 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UtilsModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UtilsModule.java @@ -1,10 +1,6 @@ package org.ovirt.engine.ui.webadmin.gin; import org.ovirt.engine.ui.common.gin.BaseUtilsModule; -import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; - -import com.google.inject.Singleton; public class UtilsModule extends BaseUtilsModule { @@ -12,8 +8,7 @@ @Override protected void configure() { super.configure(); - bind(ConsoleUtils.class).in(Singleton.class); - bind(ConsoleManager.class).in(Singleton.class); + // empty for now, but for symmetry with UP it is here } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabVirtualMachinePresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabVirtualMachinePresenter.java index 1e02b42..48908b4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabVirtualMachinePresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabVirtualMachinePresenter.java @@ -7,9 +7,9 @@ import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent; import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister.ConsoleContext; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; import org.ovirt.engine.ui.uicompat.Event; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java index 22c4781..be8d93b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java @@ -10,11 +10,11 @@ import org.ovirt.engine.ui.common.system.ErrorPopupManager; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.utils.ConsoleManager; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition; import org.ovirt.engine.ui.common.widget.action.CommandLocation; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.ReportInit; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; @@ -40,9 +40,7 @@ ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); } - private final ConsoleManager consoleManager; private final CommonApplicationConstants commonConstants; - private final ErrorPopupManager errorPopupManager; @Inject public MainTabVirtualMachineView(MainModelProvider<VM, VmListModel> modelProvider, @@ -53,9 +51,7 @@ ErrorPopupManager errorPopupManager) { super(modelProvider); - this.consoleManager = consoleManager; this.commonConstants = commonConstants; - this.errorPopupManager = errorPopupManager; ViewIdHandler.idHandler.generateAndSetIds(this); initTable(resources, constants); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java index 65b8284..72b4580 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java @@ -7,8 +7,8 @@ import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent; import org.ovirt.engine.ui.common.uicommon.model.UiCommonInitEvent.UiCommonInitHandler; -import org.ovirt.engine.ui.common.utils.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.Configurator; +import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.models.vms.ISpice; import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects; import org.ovirt.engine.ui.uicompat.Event; -- To view, visit http://gerrit.ovirt.org/13576 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If073bd036a46d9bae3aa21f088cc76c83af613ee 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
