Dima Kuznetsov has uploaded a new change for review. Change subject: webadmin: Add boot time to Host General tab ......................................................................
webadmin: Add boot time to Host General tab Add host's boot time with timezone to host's General tab. Change-Id: I157042522209f5917bcdd951b9259f08cabbd907 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1070348 Signed-off-by: Dima Kuznetsov <dkuzn...@redhat.com> --- A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeTimezoneRenderer.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.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/section/main/view/tab/host/SubTabHostGeneralView.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/FullDateTimeTimezoneLabel.java 5 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/25879/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeTimezoneRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeTimezoneRenderer.java new file mode 100644 index 0000000..3eb3e70 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeTimezoneRenderer.java @@ -0,0 +1,37 @@ +package org.ovirt.engine.ui.common.widget.renderer; + +import java.util.Date; + +import org.ovirt.engine.ui.common.CommonApplicationConstants; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.i18n.client.LocaleInfo; +import com.google.gwt.text.shared.AbstractRenderer; + +/** + * Renderer for Date values using {@code FullDateTimeFormat}. + */ +public class FullDateTimeTimezoneRenderer extends AbstractRenderer<Date> { + + private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); + private static final String japaneseLocale = "ja"; //$NON-NLS-1$ + private static final DateTimeFormat formatJp = DateTimeFormat.getFormat("yyyy-MM-dd, HH:mm z"); //$NON-NLS-1$ + private static final DateTimeFormat format = DateTimeFormat.getFormat("yyyy-MMM-dd, HH:mm z"); //$NON-NLS-1$ + + @Override + public String render(Date object) { + if(object == null){ + return CONSTANTS.notAvailableLabel(); + } + return getLocalizedDateTimeFormat().format(object); + } + + public static DateTimeFormat getLocalizedDateTimeFormat() { + if (LocaleInfo.getCurrentLocale().getLocaleName().startsWith(japaneseLocale)) { + return formatJp; + } + return format; + } + +} diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 698345e..42e1475 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -2,6 +2,9 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -854,6 +857,18 @@ } } + private Date bootTime; + public Date getBootTime() { + return bootTime; + } + + public void setBootTime(Date value) { + if (bootTime != value) { + bootTime = value; + onPropertyChanged(new PropertyChangedEventArgs("bootTime")); //$NON-NLS-1$ + } + } + static { requestEditEventDefinition = new EventDefinition("RequestEditEvent", HostGeneralModel.class); //$NON-NLS-1$ @@ -975,6 +990,7 @@ setSharedMemory(vds.getMemSharedPercent()); setMemoryPageSharing(vds.getKsmState()); setAutomaticLargePage(vds.getTransparentHugePagesState()); + setBootTime(vds.getBootTime()); if (!vds.getHighlyAvailableIsConfigured()) { setHostedEngineHaIsConfigured(false); 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 f449735..12008fc 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 @@ -1437,6 +1437,9 @@ @DefaultStringValue("Action Items") String actionItemsHostGeneral(); + @DefaultStringValue("Boot Time") + String bootTimeHostGeneral(); + // Storage @DefaultStringValue("Domain Name") String domainNameStorage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java index 945e7dd..c802309 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java @@ -26,6 +26,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.host.SubTabHostGeneralPresenter; import org.ovirt.engine.ui.webadmin.widget.alert.InLineAlertWidget; import org.ovirt.engine.ui.webadmin.widget.label.DetailsTextBoxLabel; +import org.ovirt.engine.ui.webadmin.widget.label.FullDateTimeTimezoneLabel; import org.ovirt.engine.ui.webadmin.widget.label.NullableNumberTextBoxLabel; import org.ovirt.engine.ui.webadmin.widget.label.PercentTextBoxLabel; import org.ovirt.engine.ui.webadmin.widget.label.VersionTextBoxLabel; @@ -68,6 +69,7 @@ NullableNumberTextBoxLabel<Integer> coresPerSocket = new NullableNumberTextBoxLabel<Integer>(constants.unknown()); TextBoxLabel spmPriority = new TextBoxLabel(); TextBoxLabel hostedEngineHa = new TextBoxLabel(); + FullDateTimeTimezoneLabel bootTime = new FullDateTimeTimezoneLabel(); MemorySizeTextBoxLabel<Integer> physicalMemory; MemorySizeTextBoxLabel<Integer> usedMemory; @@ -161,6 +163,7 @@ formBuilder.addFormItem(new FormItem(constants.memPageSharingHostGeneral(), memoryPageSharing, 2).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage, 2).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.isciInitNameHostGeneral(), iScsiInitiatorName, 2, virtSupported).withAutoPlacement()); + formBuilder.addFormItem(new FormItem(constants.bootTimeHostGeneral(), bootTime, 1).withAutoPlacement()); } void initMemorySizeLabels() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/FullDateTimeTimezoneLabel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/FullDateTimeTimezoneLabel.java new file mode 100644 index 0000000..a1907f8 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/FullDateTimeTimezoneLabel.java @@ -0,0 +1,13 @@ +package org.ovirt.engine.ui.webadmin.widget.label; + +import java.util.Date; + +import com.google.gwt.user.client.ui.ValueLabel; +import org.ovirt.engine.ui.common.widget.renderer.FullDateTimeTimezoneRenderer; + +public class FullDateTimeTimezoneLabel extends ValueLabel<Date> { + + public FullDateTimeTimezoneLabel() { + super(new FullDateTimeTimezoneRenderer()); + } +} -- To view, visit http://gerrit.ovirt.org/25879 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I157042522209f5917bcdd951b9259f08cabbd907 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuzn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
