Vinzenz Feenstra has uploaded a new change for review. Change subject: frontend: Implementation support for GuestOsInfo and Timezone reporting ......................................................................
frontend: Implementation support for GuestOsInfo and Timezone reporting Change-Id: Ia7f9ae95b2b9fe9affa27886a7981bcdffabee49 Bug-Url: https://bugzilla.redhat.com/869296 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGuestInfoModelForm.java D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSessionsModelForm.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuestInfoModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSessionsModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorExtension.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/place/ApplicationPlaces.java R frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmGuestInfoPresenter.java R frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.java R frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.ui.xml A frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmGuestInfoModelProvider.java D frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmSessionsModelProvider.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java R frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineGuestInfoPresenter.java R frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.java R frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.ui.xml 31 files changed, 448 insertions(+), 220 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/33376/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 1d23b84..6037572 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1947,4 +1947,19 @@ @DefaultStringValue("NUMA Pinning") String numaSupportButtonLabel(); + + @DefaultStringValue("Architecture") + String guestOsArchitecture(); + + @DefaultStringValue("Type") + String guestOsType(); + + @DefaultStringValue("Operating System") + String guestOperatingSystem(); + + @DefaultStringValue("Kernel Version") + String guestOsKernelInfo(); + + @DefaultStringValue("Timezone") + String guestOsTimezone(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java index 4e74816..33fbe41 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java @@ -37,6 +37,8 @@ TextBoxLabel compatibilityVersion = new TextBoxLabel(); TextBoxLabel vmId = new TextBoxLabel(); TextBoxLabel fqdn = new TextBoxLabel(); + TextBoxLabel consoleUserName = new TextBoxLabel(); + TextBoxLabel clientIp = new TextBoxLabel(); BooleanLabel isHighlyAvailable; @@ -57,6 +59,8 @@ formBuilder.addFormItem(new FormItem(constants.osVm(), oS, 3, 0)); formBuilder.addFormItem(new FormItem(constants.defaultDisplayTypeVm(), defaultDisplayType, 4, 0)); formBuilder.addFormItem(new FormItem(constants.priorityVm(), priority, 5, 0)); + formBuilder.addFormItem(new FormItem(constants.consoleConnectedUserVm(), consoleUserName, 6, 0)); + formBuilder.addFormItem(new FormItem(constants.consoleConnectedClientIp(), clientIp, 7, 0)); formBuilder.addFormItem(new FormItem(constants.definedMemoryVm(), definedMemory, 0, 1)); formBuilder.addFormItem(new FormItem(constants.physMemGauranteedVm(), minAllocatedMemory, 1, 1)); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGuestInfoModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGuestInfoModelForm.java new file mode 100644 index 0000000..23bf5a6 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGuestInfoModelForm.java @@ -0,0 +1,46 @@ +package org.ovirt.engine.ui.common.widget.uicommon.vm; + +import org.ovirt.engine.ui.common.CommonApplicationConstants; +import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; +import org.ovirt.engine.ui.common.widget.form.FormItem; +import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; +import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.editor.client.SimpleBeanEditorDriver; + +public class VmGuestInfoModelForm extends AbstractModelBoundFormWidget<VmGuestInfoModel> { + + interface Driver extends SimpleBeanEditorDriver<VmGuestInfoModel, VmGuestInfoModelForm> { + } + + private final Driver driver = GWT.create(Driver.class); + + TextBoxLabel guestUserName = new TextBoxLabel(); + TextBoxLabel guestOsArch = new TextBoxLabel(); + TextBoxLabel guestOsType = new TextBoxLabel(); + TextBoxLabel guestOsNamedVersion = new TextBoxLabel(); + TextBoxLabel guestOsKernelVersion = new TextBoxLabel(); + TextBoxLabel guestOsTimezone = new TextBoxLabel(); + + public VmGuestInfoModelForm(ModelProvider<VmGuestInfoModel> modelProvider, CommonApplicationConstants constants) { + super(modelProvider, 5, 3); + driver.initialize(this); + + formBuilder.addFormItem(new FormItem(constants.guestOsType(), guestOsType, 0, 0)); + formBuilder.addFormItem(new FormItem(constants.guestOsArchitecture(), guestOsArch, 0, 1)); + formBuilder.addFormItem(new FormItem(constants.guestOperatingSystem(), guestOsNamedVersion, 0, 2)); + formBuilder.addFormItem(new FormItem(constants.guestOsKernelInfo(), guestOsKernelVersion, 0, 3)); + + formBuilder.addFormItem(new FormItem(constants.guestOsTimezone(), guestOsTimezone, 1, 0)); + + formBuilder.addFormItem(new FormItem(constants.loggedInUserVm(), guestUserName, 2, 0)); + } + + @Override + protected void doEdit(VmGuestInfoModel model) { + driver.edit(model); + } + +} diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSessionsModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSessionsModelForm.java deleted file mode 100644 index 1b1b64c..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSessionsModelForm.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ovirt.engine.ui.common.widget.uicommon.vm; - -import org.ovirt.engine.ui.common.CommonApplicationConstants; -import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; -import org.ovirt.engine.ui.common.widget.form.FormItem; -import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; -import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.editor.client.SimpleBeanEditorDriver; - -public class VmSessionsModelForm extends AbstractModelBoundFormWidget<VmSessionsModel> { - - interface Driver extends SimpleBeanEditorDriver<VmSessionsModel, VmSessionsModelForm> { - } - - private final Driver driver = GWT.create(Driver.class); - - TextBoxLabel guestUserName = new TextBoxLabel(); - TextBoxLabel consoleUserName = new TextBoxLabel(); - TextBoxLabel clientIp = new TextBoxLabel(); - - public VmSessionsModelForm(ModelProvider<VmSessionsModel> modelProvider, CommonApplicationConstants constants) { - super(modelProvider, 3, 1); - driver.initialize(this); - - formBuilder.addFormItem(new FormItem(constants.loggedInUserVm(), guestUserName, 0, 0)); - formBuilder.addFormItem(new FormItem(constants.consoleConnectedUserVm(), consoleUserName, 0, 1)); - formBuilder.addFormItem(new FormItem(constants.consoleConnectedClientIp(), clientIp, 0, 2)); - } - - @Override - protected void doEdit(VmSessionsModel model) { - driver.edit(model); - } - -} diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index 65bbc08..c73920f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -196,6 +196,7 @@ <include name="common/businessentities/ImageType.java" /> <include name="common/businessentities/SnapshotActionEnum.java"/> <include name="common/businessentities/VmRngDevice.java" /> + <include name="common/businessentities/GuestOsArchitectureType.java" /> <include name="common/job/*.java" /> <!-- Profiles --> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index ee90581..181ce13 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -222,7 +222,14 @@ vm.setSpiceFileTransferEnabled(instance.isSpiceFileTransferEnabled()); vm.setSpiceCopyPasteEnabled(instance.isSpiceCopyPasteEnabled()); vm.setCpuProfileId(instance.getCpuProfileId()); - + vm.setGuestOsArch(instance.getGuestOsArch()); + vm.setGuestOsCodename(instance.getGuestOsCodename()); + vm.setGuestOsDistribution(instance.getGuestOsDistribution()); + vm.setGuestOsKernelVersion(instance.getGuestOsKernelVersion()); + vm.setGuestOsType(instance.getGuestOsType()); + vm.setGuestOsVersion(instance.getGuestOsVersion()); + vm.setTimezoneName(instance.getTimezoneName()); + vm.setTimezoneOffset(instance.getTimezoneOffset()); return vm; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java index 19ea069..db3b33f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/help/HelpTag.java @@ -418,7 +418,7 @@ services("services", HelpTagType.UNKNOWN), //$NON-NLS-1$ - sessions("sessions", HelpTagType.UNKNOWN), //$NON-NLS-1$ + guest_info("guest_info", HelpTagType.UNKNOWN), //$NON-NLS-1$ set_unlimited_specific_quota("set_unlimited_specific_quota", HelpTagType.WEBADMIN, "Quota main tab -> New Quota dialog -> confirmation dialog on setting an 'unlimited' quota on a certain resource."), //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index c48618d..6a0b3d6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -78,7 +78,7 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.VmInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmMonitorModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmNextRunConfigurationModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; @@ -224,7 +224,7 @@ } private EntityModel vmGeneralModel; - private EntityModel vmSessionsModel; + private EntityModel vmGuestInfoModel; private ListModel vmSnapshotListModel; private EntityModel vmMonitorModel; private ListModel vmDiskListModel; @@ -375,8 +375,8 @@ vmGeneralModel = new VmGeneralModel(); vmGeneralModel.setIsAvailable(false); - vmSessionsModel = new VmSessionsModel(); - vmSessionsModel.setIsAvailable(false); + vmGuestInfoModel = new VmGuestInfoModel(); + vmGuestInfoModel.setIsAvailable(false); vmSnapshotListModel = new UserPortalVmSnapshotListModel(); vmSnapshotListModel.setIsAvailable(false); @@ -420,14 +420,14 @@ list.add(vmEventListModel); list.add(vmAppListModel); list.add(vmMonitorModel); - list.add(vmSessionsModel); + list.add(vmGuestInfoModel); setDetailModels(list); permissionListModel.setIsAvailable(true); vmEventListModel.setIsAvailable(true); vmAppListModel.setIsAvailable(true); - vmSessionsModel.setIsAvailable(true); + vmGuestInfoModel.setIsAvailable(true); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index 210b7b0..5111015 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -495,6 +495,34 @@ } } + private String clientIp; + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + if (!ObjectUtils.objectsEqual(clientIp, clientIp)) + { + this.clientIp = clientIp; + onPropertyChanged(new PropertyChangedEventArgs("ClientIp")); //$NON-NLS-1$ + } + } + + private String consoleUserName; + + public String getConsoleUserName() { + return consoleUserName; + } + + public void setConsoleUserName(String consoleUserName) { + if (!ObjectUtils.objectsEqual(consoleUserName, consoleUserName)) + { + this.consoleUserName = consoleUserName; + onPropertyChanged(new PropertyChangedEventArgs("ConsoleUserName")); //$NON-NLS-1$ + } + } + private String compatibilityVersion; public String getCompatibilityVersion() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuestInfoModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuestInfoModel.java new file mode 100644 index 0000000..96dbb1e --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuestInfoModel.java @@ -0,0 +1,236 @@ +package org.ovirt.engine.ui.uicommonweb.models.vms; + +import com.google.gwt.i18n.client.NumberFormat; +import org.ovirt.engine.core.common.businessentities.GuestOsArchitectureType; +import org.ovirt.engine.core.common.businessentities.OsType; +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.utils.ObjectUtils; +import org.ovirt.engine.ui.uicommonweb.help.HelpTag; +import org.ovirt.engine.ui.uicommonweb.models.EntityModel; +import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; +import org.ovirt.engine.ui.uicompat.external.StringUtils; + +public class VmGuestInfoModel extends EntityModel { + + String guestUserName; + private OsType guestOsType; + private GuestOsArchitectureType guestOsArch; + private String guestOsCodename; + private String guestOsDistribution; + private String guestOsKernelVersion; + private String guestOsVersion; + private String guestOs; + private String timezoneName; + private Integer timezoneOffset; + private String guestOsNamedVersion; + private String guestOsTimezone; + + public VmGuestInfoModel() { + super(); + + setTitle(ConstantsManager.getInstance().getConstants().sessionsTitle()); + setHelpTag(HelpTag.guest_info); + setHashName("guest_info"); //$NON-NLS-1$ + + guestOsType = OsType.Other; + guestOsArch = GuestOsArchitectureType.undefined; + guestOsCodename = ""; + guestOsDistribution = ""; + guestOsKernelVersion = ""; + guestOsVersion = ""; + guestOs = ""; + timezoneName = ""; + timezoneOffset = 0; + guestOsNamedVersion = ""; + guestOsTimezone = ""; + } + + @Override + protected void onEntityChanged() { + super.onEntityChanged(); + + if (getEntity() != null) + { + updateProperties(); + } + } + + @Override + protected void entityPropertyChanged(Object sender, PropertyChangedEventArgs e) { + super.entityPropertyChanged(sender, e); + + updateProperties(); + } + + private void updateProperties() { + VM vm = (VM) getEntity(); + + this.setGuestUserName(vm.getGuestCurentUserName()); + this.setGuestOsArch(vm.getGuestOsArch()); + this.setGuestOsCodename(vm.getGuestOsCodename()); + this.setGuestOsDistribution(vm.getGuestOsDistribution()); + this.setGuestOsKernelVersion(vm.getGuestOsKernelVersion()); + this.setGuestOsType(vm.getGuestOsType()); + this.setGuestOsVersion(vm.getGuestOsVersion()); + this.setTimezoneName(vm.getTimezoneName()); + this.setTimezoneOffset(vm.getTimezoneOffset()); + StringBuilder builder = new StringBuilder(); + if(guestOsType == OsType.Linux) { + // E.g Fedora 20 (Heisenbug) + builder.append(guestOsDistribution); + builder.append(' '); //$NON-NLS-1$ + builder.append(guestOsVersion); + if(!StringUtils.isEmpty(guestOsCodename)) { + builder.append(" ("); //$NON-NLS-1$ + builder.append(guestOsCodename); + builder.append(')'); //$NON-NLS-1$ + } + } + else if(guestOsType == OsType.Windows && guestOs.startsWith("Win ")) { //$NON-NLS-1$ + builder.append("Microsoft Windows "); //$NON-NLS-1$ + builder.append(guestOs.substring(4)); + if(guestOs.startsWith("Win 20")) { //$NON-NLS-1$ + builder.append(" Server"); //$NON-NLS-1$ + } + builder.append(" ("); //$NON-NLS-1$ + builder.append(guestOsVersion); + builder.append(')'); //$NON-NLS-1$ + } + guestOsNamedVersion = builder.toString(); + + builder = new StringBuilder(); + builder.append(timezoneName); + builder.append(" (UTC"); //$NON-NLS-1$ + if(timezoneOffset >= 0) { + builder.append('+'); //$NON-NLS-1$ + } + else { + builder.append('-'); //$NON-NLS-1$ + } + builder.append(NumberFormat.getFormat("00").format(timezoneOffset / 60.)); //$NON-NLS-1$ + builder.append(':'); //$NON-NLS-1$ + builder.append(NumberFormat.getFormat("00").format(timezoneOffset % 60)); //$NON-NLS-1$ + builder.append(')'); //$NON-NLS-1$ + guestOsTimezone = builder.toString(); + } + + public String getGuestOs() { + return guestOs; + } + + public void setGuestOs(String guestOs) { + if(!ObjectUtils.objectsEqual(this.guestOs, guestOs)) { + this.guestOs = guestOs; + onPropertyChanged(new PropertyChangedEventArgs("GuestOs")); //$NON-NLS-1$ + } + } + + public String getGuestOsTimezone() { + return guestOsTimezone; + } + + public String getGuestUserName() { + return guestUserName; + } + + public void setGuestUserName(String guestUserName) { + if(!ObjectUtils.objectsEqual(this.guestUserName, guestUserName)) { + this.guestUserName = guestUserName; + onPropertyChanged(new PropertyChangedEventArgs("GuestUserName")); //$NON-NLS-1$ + } + } + + + public String getGuestOsType() { + return guestOsType.name(); + } + + public void setGuestOsType(OsType guestOsType) { + if(!ObjectUtils.objectsEqual(this.guestOsType, guestOsType)) { + this.guestOsType = guestOsType; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsType")); //$NON-NLS-1$ + } + } + + public String getGuestOsArch() { + return guestOsArch.name(); + } + + public void setGuestOsArch(GuestOsArchitectureType guestOsArch) { + if(!ObjectUtils.objectsEqual(this.guestOsArch, guestOsArch)) { + this.guestOsArch = guestOsArch; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsArch")); //$NON-NLS-1$ + } + } + + public String getGuestOsCodename() { + return guestOsCodename; + } + + public void setGuestOsCodename(String guestOsCodename) { + if(!ObjectUtils.objectsEqual(this.guestOsCodename, guestOsCodename)) { + this.guestOsCodename = guestOsCodename; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsCodename")); //$NON-NLS-1$ + } + } + + public String getGuestOsDistribution() { + return guestOsDistribution; + } + + public void setGuestOsDistribution(String guestOsDistribution) { + if(!ObjectUtils.objectsEqual(this.guestOsDistribution, guestOsDistribution)) { + this.guestOsDistribution = guestOsDistribution; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsDistribution")); //$NON-NLS-1$ + } + } + + public String getGuestOsKernelVersion() { + return guestOsKernelVersion; + } + + public void setGuestOsKernelVersion(String guestOsKernelVersion) { + if(!ObjectUtils.objectsEqual(this.guestOsKernelVersion, guestOsKernelVersion)) { + this.guestOsKernelVersion = guestOsKernelVersion; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsKernelVersion")); //$NON-NLS-1$ + } + } + + public String getGuestOsVersion() { + return guestOsVersion; + } + + public void setGuestOsVersion(String guestOsVersion) { + if(!ObjectUtils.objectsEqual(this.guestOsVersion, guestOsVersion)) { + this.guestOsVersion = guestOsVersion; + onPropertyChanged(new PropertyChangedEventArgs("GuestOsVersion")); //$NON-NLS-1$ + } + } + + public String getTimezoneName() { + return timezoneName; + } + + public void setTimezoneName(String timezoneName) { + if(!ObjectUtils.objectsEqual(this.timezoneName, timezoneName)) { + this.timezoneName = timezoneName; + onPropertyChanged(new PropertyChangedEventArgs("TimezoneName")); //$NON-NLS-1$ + } + } + + public Integer getTimezoneOffset() { + return timezoneOffset; + } + + public void setTimezoneOffset(Integer timezoneOffset) { + if(!ObjectUtils.objectsEqual(this.timezoneOffset, timezoneOffset)) { + this.timezoneOffset = timezoneOffset; + onPropertyChanged(new PropertyChangedEventArgs("TimezoneOffset")); //$NON-NLS-1$ + } + } + + public String getGuestOsNamedVersion() { + return guestOsNamedVersion; + } +} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 5042a1e..8662f60 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -684,7 +684,7 @@ list.add(new VmAppListModel()); list.add(new PermissionListModel()); list.add(new VmAffinityGroupListModel()); - list.add(new VmSessionsModel()); + list.add(new VmGuestInfoModel()); setDetailModels(list); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSessionsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSessionsModel.java deleted file mode 100644 index 7a04cb2..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSessionsModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.models.vms; - -import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.ui.uicommonweb.help.HelpTag; -import org.ovirt.engine.ui.uicommonweb.models.EntityModel; -import org.ovirt.engine.ui.uicompat.ConstantsManager; -import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; - -public class VmSessionsModel extends EntityModel { - - String guestUserName; - String consoleUserName; - String clientIp; - - public VmSessionsModel() { - super(); - - setTitle(ConstantsManager.getInstance().getConstants().sessionsTitle()); - setHelpTag(HelpTag.sessions); - setHashName("sessions"); //$NON-NLS-1$ - } - - @Override - protected void onEntityChanged() { - super.onEntityChanged(); - - if (getEntity() != null) - { - updateProperties(); - } - } - - @Override - protected void entityPropertyChanged(Object sender, PropertyChangedEventArgs e) { - super.entityPropertyChanged(sender, e); - - updateProperties(); - } - - private void updateProperties() { - VM vm = (VM) getEntity(); - - this.consoleUserName = vm.getConsoleCurentUserName(); - this.guestUserName = vm.getGuestCurentUserName(); - this.clientIp = vm.getClientIp(); - } - - public String getGuestUserName() { - return guestUserName; - } - - public void setGuestUserName(String guestUserName) { - this.guestUserName = guestUserName; - } - - public String getConsoleUserName() { - return consoleUserName; - } - - public void setConsoleUserName(String consoleUserName) { - this.consoleUserName = consoleUserName; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getClientIp() { - return clientIp; - } -} diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 48bab83..327623c 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -630,7 +630,7 @@ @DefaultStringValue("Monitor") String monitorTitle(); - @DefaultStringValue("Sessions") + @DefaultStringValue("Guest Information") String sessionsTitle(); @DefaultStringValue("RDP") diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java index 00da5b6..dd20cb8 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java @@ -88,8 +88,8 @@ @DefaultStringValue("Monitor") String extendedVirtualMachineMonitorSubTabLabel(); - @DefaultStringValue("Sessions") - String extendedVirtualMachineSessionsSubTabLabel(); + @DefaultStringValue("Guest Information") + String extendedVirtualMachineGuestInfoSubTabLabel(); @DefaultStringValue("General") String extendedTemplateGeneralSubTabLabel(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorExtension.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorExtension.java index 6c43fdc..8882cd4 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorExtension.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorExtension.java @@ -8,9 +8,9 @@ import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmDiskListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmEventListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGeneralModelProvider; +import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGuestInfoModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmInterfaceListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmMonitorModelProvider; -import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSessionsModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSnapshotListModelProvider; import com.gwtplatform.mvp.client.annotations.DefaultGatekeeper; @@ -51,6 +51,6 @@ PoolDiskListModelProvider getPoolDiskListModelProvider(); - VmSessionsModelProvider getVmSessionsModelProvider(); + VmGuestInfoModelProvider getVmGuestInfoModelProvider(); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java index 725f711..b57ffe2 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/PresenterModule.java @@ -47,10 +47,10 @@ import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmApplicationPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmEventPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmGeneralPresenter; +import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmGuestInfoPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmMonitorPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmNetworkInterfacePresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmPermissionPresenter; -import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmSessionsPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmSnapshotPresenter; import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmVirtualDiskPresenter; import org.ovirt.engine.ui.userportal.section.main.view.AboutPopupView; @@ -95,10 +95,10 @@ import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmApplicationView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmEventView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmGeneralView; +import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmGuestInfoView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmMonitorView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmNetworkInterfaceView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmPermissionView; -import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmSessionsView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmSnapshotView; import org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm.SubTabExtendedVmVirtualDiskView; @@ -212,10 +212,10 @@ SubTabExtendedVmMonitorPresenter.ViewDef.class, SubTabExtendedVmMonitorView.class, SubTabExtendedVmMonitorPresenter.ProxyDef.class); - bindPresenter(SubTabExtendedVmSessionsPresenter.class, - SubTabExtendedVmSessionsPresenter.ViewDef.class, - SubTabExtendedVmSessionsView.class, - SubTabExtendedVmSessionsPresenter.ProxyDef.class); + bindPresenter(SubTabExtendedVmGuestInfoPresenter.class, + SubTabExtendedVmGuestInfoPresenter.ViewDef.class, + SubTabExtendedVmGuestInfoView.class, + SubTabExtendedVmGuestInfoPresenter.ProxyDef.class); // Template bindPresenter(ExtendedTemplateSubTabPanelPresenter.class, diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java index 26dce8f..c91744c 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/UiCommonModule.java @@ -20,10 +20,10 @@ import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmDiskListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmEventListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGeneralModelProvider; +import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGuestInfoModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmInterfaceListModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmMonitorModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmPermissionListModelProvider; -import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSessionsModelProvider; import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSnapshotListModelProvider; import com.google.inject.Singleton; @@ -56,7 +56,7 @@ bind(VmAppListModelProvider.class).asEagerSingleton(); bind(VmMonitorModelProvider.class).asEagerSingleton(); bind(PoolInterfaceListModelProvider.class).asEagerSingleton(); - bind(VmSessionsModelProvider.class).asEagerSingleton(); + bind(VmGuestInfoModelProvider.class).asEagerSingleton(); // Extended tab: Template bind(UserPortalTemplateListProvider.class).asEagerSingleton(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/place/ApplicationPlaces.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/place/ApplicationPlaces.java index 2044f79..1e1e146 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/place/ApplicationPlaces.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/place/ApplicationPlaces.java @@ -64,8 +64,8 @@ public static final String extendedVirtualMachineMonitorSubTabPlace = extendedVirtualMachineSideTabPlace + SUB_TAB_PREFIX + "monitor"; //$NON-NLS-1$ - public static final String extendedVirtualMachineSessionsSubTabPlace = extendedVirtualMachineSideTabPlace - + SUB_TAB_PREFIX + "sessions"; //$NON-NLS-1$ + public static final String extendedVirtualMachineGuestInfoSubTabPlace = extendedVirtualMachineSideTabPlace + + SUB_TAB_PREFIX + "guest_info"; //$NON-NLS-1$ // Templates diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmSessionsPresenter.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmGuestInfoPresenter.java similarity index 61% rename from frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmSessionsPresenter.java rename to frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmGuestInfoPresenter.java index 23e14db..315cdfc 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmSessionsPresenter.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/extended/vm/SubTabExtendedVmGuestInfoPresenter.java @@ -3,10 +3,10 @@ import org.ovirt.engine.ui.common.presenter.AbstractSubTabPresenter; import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.userportal.ApplicationConstants; import org.ovirt.engine.ui.userportal.place.ApplicationPlaces; -import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSessionsModelProvider; +import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGuestInfoModelProvider; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -17,13 +17,13 @@ import com.gwtplatform.mvp.client.proxy.PlaceManager; import com.gwtplatform.mvp.client.proxy.TabContentProxyPlace; -public class SubTabExtendedVmSessionsPresenter - extends AbstractSubTabExtendedVmPresenter<VmSessionsModel, SubTabExtendedVmSessionsPresenter.ViewDef, SubTabExtendedVmSessionsPresenter.ProxyDef> +public class SubTabExtendedVmGuestInfoPresenter + extends AbstractSubTabExtendedVmPresenter<VmGuestInfoModel, SubTabExtendedVmGuestInfoPresenter.ViewDef, SubTabExtendedVmGuestInfoPresenter.ProxyDef> { @ProxyCodeSplit - @NameToken(ApplicationPlaces.extendedVirtualMachineSessionsSubTabPlace) - public interface ProxyDef extends TabContentProxyPlace<SubTabExtendedVmSessionsPresenter> { + @NameToken(ApplicationPlaces.extendedVirtualMachineGuestInfoSubTabPlace) + public interface ProxyDef extends TabContentProxyPlace<SubTabExtendedVmGuestInfoPresenter> { } @@ -33,16 +33,16 @@ @TabInfo(container = ExtendedVmSubTabPanelPresenter.class) static TabData getTabData(ApplicationConstants applicationConstants, - VmSessionsModelProvider modelProvider) { - return new ModelBoundTabData(applicationConstants.extendedVirtualMachineSessionsSubTabLabel(), 11, modelProvider); + VmGuestInfoModelProvider modelProvider) { + return new ModelBoundTabData(applicationConstants.extendedVirtualMachineGuestInfoSubTabLabel(), 11, modelProvider); } @Inject - public SubTabExtendedVmSessionsPresenter(EventBus eventBus, - ViewDef view, - ProxyDef proxy, - PlaceManager placeManager, - VmSessionsModelProvider modelProvider) { + public SubTabExtendedVmGuestInfoPresenter(EventBus eventBus, + ViewDef view, + ProxyDef proxy, + PlaceManager placeManager, + VmGuestInfoModelProvider modelProvider) { super(eventBus, view, proxy, placeManager, modelProvider); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.java similarity index 68% rename from frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.java rename to frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.java index bf3eb22..7a8404b 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.java @@ -3,12 +3,12 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; -import org.ovirt.engine.ui.common.widget.uicommon.vm.VmSessionsModelForm; +import org.ovirt.engine.ui.common.widget.uicommon.vm.VmGuestInfoModelForm; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; -import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmSessionsPresenter; -import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmSessionsModelProvider; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; +import org.ovirt.engine.ui.userportal.section.main.presenter.tab.extended.vm.SubTabExtendedVmGuestInfoPresenter; +import org.ovirt.engine.ui.userportal.uicommon.model.vm.VmGuestInfoModelProvider; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -16,26 +16,26 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -public class SubTabExtendedVmSessionsView - extends AbstractSubTabFormView<UserPortalItemModel, UserPortalListModel, VmSessionsModel> - implements SubTabExtendedVmSessionsPresenter.ViewDef { +public class SubTabExtendedVmGuestInfoView + extends AbstractSubTabFormView<UserPortalItemModel, UserPortalListModel, VmGuestInfoModel> + implements SubTabExtendedVmGuestInfoPresenter.ViewDef { - interface ViewIdHandler extends ElementIdHandler<SubTabExtendedVmSessionsView> { + interface ViewIdHandler extends ElementIdHandler<SubTabExtendedVmGuestInfoView> { ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); } - interface ViewUiBinder extends UiBinder<Widget, SubTabExtendedVmSessionsView> { + interface ViewUiBinder extends UiBinder<Widget, SubTabExtendedVmGuestInfoView> { ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class); } @UiField(provided = true) - VmSessionsModelForm form; + VmGuestInfoModelForm form; @Inject - public SubTabExtendedVmSessionsView(VmSessionsModelProvider modelProvider, CommonApplicationConstants constants) { + public SubTabExtendedVmGuestInfoView(VmGuestInfoModelProvider modelProvider, CommonApplicationConstants constants) { super(modelProvider); - form = new VmSessionsModelForm(modelProvider, constants); + form = new VmGuestInfoModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.ui.xml b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.ui.xml similarity index 82% rename from frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.ui.xml rename to frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.ui.xml index a8d603d..4c34ac7 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmSessionsView.ui.xml +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGuestInfoView.ui.xml @@ -9,6 +9,6 @@ } </ui:style> - <f:VmSessionsModelForm ui:field="form" addStyleNames="{style.formPanel}" /> + <f:VmGuestInfoModelForm ui:field="form" addStyleNames="{style.formPanel}" /> </ui:UiBinder> diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmGuestInfoModelProvider.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmGuestInfoModelProvider.java new file mode 100644 index 0000000..9525801 --- /dev/null +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmGuestInfoModelProvider.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.ui.userportal.uicommon.model.vm; + +import org.ovirt.engine.ui.common.presenter.popup.DefaultConfirmationPopupPresenterWidget; +import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalListModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; +import org.ovirt.engine.ui.userportal.uicommon.model.UserPortalDetailModelProvider; +import org.ovirt.engine.ui.userportal.uicommon.model.UserPortalModelResolver; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class VmGuestInfoModelProvider extends UserPortalDetailModelProvider<UserPortalListModel, VmGuestInfoModel> { + + @Inject + public VmGuestInfoModelProvider(EventBus eventBus, + Provider<DefaultConfirmationPopupPresenterWidget> defaultConfirmPopupProvider, + UserPortalListProvider parentModelProvider, + UserPortalModelResolver modelResolver) { + super(eventBus, defaultConfirmPopupProvider, parentModelProvider, VmGuestInfoModel.class, modelResolver); + } + +} diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmSessionsModelProvider.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmSessionsModelProvider.java deleted file mode 100644 index 7a48cc0..0000000 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/vm/VmSessionsModelProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ovirt.engine.ui.userportal.uicommon.model.vm; - -import org.ovirt.engine.ui.common.presenter.popup.DefaultConfirmationPopupPresenterWidget; -import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; -import org.ovirt.engine.ui.userportal.uicommon.model.UserPortalDetailModelProvider; -import org.ovirt.engine.ui.userportal.uicommon.model.UserPortalModelResolver; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class VmSessionsModelProvider extends UserPortalDetailModelProvider<UserPortalListModel, VmSessionsModel> { - - @Inject - public VmSessionsModelProvider(EventBus eventBus, - Provider<DefaultConfirmationPopupPresenterWidget> defaultConfirmPopupProvider, - UserPortalListProvider parentModelProvider, - UserPortalModelResolver modelResolver) { - super(eventBus, defaultConfirmPopupProvider, parentModelProvider, VmSessionsModel.class, modelResolver); - } - -} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 2cea001..08cc250 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -455,8 +455,8 @@ @DefaultStringValue("Permissions") String virtualMachinePermissionSubTabLabel(); - @DefaultStringValue("Sessions") - String virtualMachineSessionsSubTabLabel(); + @DefaultStringValue("Guest Info") + String virtualMachineGuestInfoSubTabLabel(); @DefaultStringValue("Events") String virtualMachineEventSubTabLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java index fbb2bd8..d8273f6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/ClientGinjectorExtension.java @@ -144,9 +144,9 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.VmDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmEventListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmGeneralModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmSnapshotListModel; import org.ovirt.engine.ui.uicommonweb.models.volumes.VolumeListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -291,7 +291,7 @@ SearchableDetailModelProvider<Permissions, VmListModel, PermissionListModel> getSubTabVirtualMachinePermissionModelProvider(); - DetailModelProvider<VmListModel, VmSessionsModel> getSubTabVirtualMachineSessionsModelProvider(); + DetailModelProvider<VmListModel, VmGuestInfoModel> getSubTabVirtualMachineGuestInfoModelProvider(); SearchableDetailModelProvider<AuditLog, VmListModel, VmEventListModel> getSubTabVirtualMachineEventModelProvider(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java index 3aadfe4..3fd7e14 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java @@ -237,9 +237,9 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineApplicationPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineEventPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineGeneralPresenter; +import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineGuestInfoPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineNetworkInterfacePresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachinePermissionPresenter; -import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineSessionsPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineSnapshotPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineVirtualDiskPresenter; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.VirtualMachineSubTabPanelPresenter; @@ -477,9 +477,9 @@ import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineApplicationView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineEventView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineGeneralView; +import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineGuestInfoView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineNetworkInterfaceView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachinePermissionView; -import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineSessionsView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineSnapshotView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.SubTabVirtualMachineVirtualDiskView; import org.ovirt.engine.ui.webadmin.section.main.view.tab.virtualMachine.VirtualMachineSubTabPanelView; @@ -844,10 +844,10 @@ SubTabVirtualMachinePermissionPresenter.ViewDef.class, SubTabVirtualMachinePermissionView.class, SubTabVirtualMachinePermissionPresenter.ProxyDef.class); - bindPresenter(SubTabVirtualMachineSessionsPresenter.class, - SubTabVirtualMachineSessionsPresenter.ViewDef.class, - SubTabVirtualMachineSessionsView.class, - SubTabVirtualMachineSessionsPresenter.ProxyDef.class); + bindPresenter(SubTabVirtualMachineGuestInfoPresenter.class, + SubTabVirtualMachineGuestInfoPresenter.ViewDef.class, + SubTabVirtualMachineGuestInfoView.class, + SubTabVirtualMachineGuestInfoPresenter.ProxyDef.class); bindPresenter(SubTabVirtualMachineEventPresenter.class, SubTabVirtualMachineEventPresenter.ViewDef.class, SubTabVirtualMachineEventView.class, diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java index bf9555b..19ce774 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java @@ -31,9 +31,9 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.VmGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmSnapshotListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VncInfoModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.webadmin.section.main.presenter.ReportPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.AssignTagsPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.PermissionsPopupPresenterWidget; @@ -169,12 +169,12 @@ @Provides @Singleton - public DetailModelProvider<VmListModel, VmSessionsModel> getVmSessionsProvider(EventBus eventBus, + public DetailModelProvider<VmListModel, VmGuestInfoModel> getVmGuestInfoProvider(EventBus eventBus, Provider<DefaultConfirmationPopupPresenterWidget> defaultConfirmPopupProvider) { - return new DetailTabModelProvider<VmListModel, VmSessionsModel>( + return new DetailTabModelProvider<VmListModel, VmGuestInfoModel>( eventBus, defaultConfirmPopupProvider, VmListModel.class, - VmSessionsModel.class); + VmGuestInfoModel.class); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java index 937f0d5..60b5c8b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/place/ApplicationPlaces.java @@ -183,7 +183,7 @@ public static final String virtualMachinePermissionSubTabPlace = virtualMachineMainTabPlace + SUB_TAB_PREFIX + "permissions"; //$NON-NLS-1$ - public static final String virtualMachineSessionsSubTabPlace = virtualMachineMainTabPlace + SUB_TAB_PREFIX + public static final String virtualMachineGuestInfoSubTabPlace = virtualMachineMainTabPlace + SUB_TAB_PREFIX + "sessions"; //$NON-NLS-1$ public static final String virtualMachineEventSubTabPlace = virtualMachineMainTabPlace + SUB_TAB_PREFIX + "events"; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineSessionsPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineGuestInfoPresenter.java similarity index 71% rename from frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineSessionsPresenter.java rename to frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineGuestInfoPresenter.java index be3740e..487efb7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineSessionsPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/SubTabVirtualMachineGuestInfoPresenter.java @@ -5,8 +5,8 @@ import org.ovirt.engine.ui.common.presenter.AbstractSubTabPresenter; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.place.ApplicationPlaces; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.VirtualMachineSelectionChangeEvent; @@ -22,28 +22,28 @@ import com.gwtplatform.mvp.client.proxy.PlaceRequest; import com.gwtplatform.mvp.client.proxy.TabContentProxyPlace; -public class SubTabVirtualMachineSessionsPresenter - extends AbstractSubTabPresenter<VM, VmListModel, VmSessionsModel, SubTabVirtualMachineSessionsPresenter.ViewDef, SubTabVirtualMachineSessionsPresenter.ProxyDef> { +public class SubTabVirtualMachineGuestInfoPresenter + extends AbstractSubTabPresenter<VM, VmListModel, VmGuestInfoModel, SubTabVirtualMachineGuestInfoPresenter.ViewDef, SubTabVirtualMachineGuestInfoPresenter.ProxyDef> { public interface ViewDef extends AbstractSubTabPresenter.ViewDef<VM> { } @ProxyCodeSplit - @NameToken(ApplicationPlaces.virtualMachineSessionsSubTabPlace) - public interface ProxyDef extends TabContentProxyPlace<SubTabVirtualMachineSessionsPresenter> { + @NameToken(ApplicationPlaces.virtualMachineGuestInfoSubTabPlace) + public interface ProxyDef extends TabContentProxyPlace<SubTabVirtualMachineGuestInfoPresenter> { } @TabInfo(container = VirtualMachineSubTabPanelPresenter.class) static TabData getTabData(ApplicationConstants applicationConstants, - DetailModelProvider<VmListModel, VmSessionsModel> modelProvider) { - return new ModelBoundTabData(applicationConstants.virtualMachineSessionsSubTabLabel(), 7, modelProvider); + DetailModelProvider<VmListModel, VmGuestInfoModel> modelProvider) { + return new ModelBoundTabData(applicationConstants.virtualMachineGuestInfoSubTabLabel(), 7, modelProvider); } @Inject - public SubTabVirtualMachineSessionsPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy, - PlaceManager placeManager, - DetailModelProvider<VmListModel, VmSessionsModel> modelProvider) { + public SubTabVirtualMachineGuestInfoPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy, + PlaceManager placeManager, + DetailModelProvider<VmListModel, VmGuestInfoModel> modelProvider) { super(eventBus, view, proxy, placeManager, modelProvider, VirtualMachineSubTabPanelPresenter.TYPE_SetTabContent); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.java similarity index 65% rename from frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.java rename to frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.java index 0025357..fb8c59b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.java @@ -4,11 +4,11 @@ import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; -import org.ovirt.engine.ui.common.widget.uicommon.vm.VmSessionsModelForm; +import org.ovirt.engine.ui.common.widget.uicommon.vm.VmGuestInfoModelForm; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuestInfoModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmSessionsModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; -import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineSessionsPresenter; +import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.virtualMachine.SubTabVirtualMachineGuestInfoPresenter; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -16,27 +16,27 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -public class SubTabVirtualMachineSessionsView - extends AbstractSubTabFormView<VM, VmListModel, VmSessionsModel> - implements SubTabVirtualMachineSessionsPresenter.ViewDef { +public class SubTabVirtualMachineGuestInfoView + extends AbstractSubTabFormView<VM, VmListModel, VmGuestInfoModel> + implements SubTabVirtualMachineGuestInfoPresenter.ViewDef { - interface ViewUiBinder extends UiBinder<Widget, SubTabVirtualMachineSessionsView> { + interface ViewUiBinder extends UiBinder<Widget, SubTabVirtualMachineGuestInfoView> { ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class); } - interface ViewIdHandler extends ElementIdHandler<SubTabVirtualMachineSessionsView> { + interface ViewIdHandler extends ElementIdHandler<SubTabVirtualMachineGuestInfoView> { ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); } @UiField(provided = true) - VmSessionsModelForm form; + VmGuestInfoModelForm form; @Inject - public SubTabVirtualMachineSessionsView(DetailModelProvider<VmListModel, VmSessionsModel> modelProvider, - ApplicationConstants constants) { + public SubTabVirtualMachineGuestInfoView(DetailModelProvider<VmListModel, VmGuestInfoModel> modelProvider, + ApplicationConstants constants) { super(modelProvider); - this.form = new VmSessionsModelForm(modelProvider, constants); + this.form = new VmGuestInfoModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.ui.xml similarity index 87% rename from frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.ui.xml rename to frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.ui.xml index 85af222..d6a5512 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineSessionsView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGuestInfoView.ui.xml @@ -16,7 +16,7 @@ </ui:style> <g:FlowPanel> - <f:VmSessionsModelForm ui:field="form" addStyleNames="{style.form}" /> + <f:VmGuestInfoModelForm ui:field="form" addStyleNames="{style.form}" /> </g:FlowPanel> </ui:UiBinder> -- To view, visit http://gerrit.ovirt.org/33376 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7f9ae95b2b9fe9affa27886a7981bcdffabee49 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
