Alexander Wels has uploaded a new change for review. Change subject: webadmin: Cluster sub general tab broken ......................................................................
webadmin: Cluster sub general tab broken - For certain locales the cluster general sub tab would not popuplate its values. This was due to an exception being thrown in the value parser of read only fields. Since these field are readonly they don't need a parser. - Added a new EntityModelLabelEditor constructor without a parser that is meant for readonly fields. Change-Id: I9c7a911d7a6ecfe79ee006be46e0ef8e627b97e3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1157380 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/EntityModelLabelEditor.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java 3 files changed, 21 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/34648/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/EntityModelLabelEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/EntityModelLabelEditor.java index 1aeb5cb..7844b08 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/EntityModelLabelEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/EntityModelLabelEditor.java @@ -1,8 +1,11 @@ package org.ovirt.engine.ui.common.widget.editor.generic; +import java.text.ParseException; + +import org.ovirt.engine.ui.common.widget.editor.AbstractValueBoxWithLabelEditor; + import com.google.gwt.text.shared.Parser; import com.google.gwt.text.shared.Renderer; -import org.ovirt.engine.ui.common.widget.editor.AbstractValueBoxWithLabelEditor; public class EntityModelLabelEditor<T> extends AbstractValueBoxWithLabelEditor<T, EntityModelLabel<T>> { @@ -13,6 +16,20 @@ this(new EntityModelLabel<T>(renderer, parser)); } + /** + * A ValueBoxWithLabelEditor that should be readonly, so the parser is not needed. + * @param renderer The renderer. + */ + public EntityModelLabelEditor(Renderer<T> renderer) { + this(new EntityModelLabel<T>(renderer, new Parser<T>() { + @Override + public T parse(CharSequence text) throws ParseException { + //Parser is not needed as its a read only field and value is not used. + return null; + } + })); + } + public EntityModelLabelEditor(EntityModelLabel<T> widget) { super(widget); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java index 9e7d9ac..e0d8cc2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java @@ -1,7 +1,5 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.gluster; -import java.text.ParseException; - import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeType; @@ -35,7 +33,6 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.text.shared.Parser; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Label; @@ -150,13 +147,7 @@ } private void initEditors() { - volumeTypeEditor = new EntityModelLabelEditor<GlusterVolumeType>(new EnumRenderer<GlusterVolumeType>(), new Parser<GlusterVolumeType>() { - @Override - public GlusterVolumeType parse(CharSequence text) throws ParseException { - //Parser is not needed as its a read only field and value is nowhere used. - return null; - } - }); + volumeTypeEditor = new EntityModelLabelEditor<GlusterVolumeType>(new EnumRenderer<GlusterVolumeType>()); forceEditor = new EntityModelCheckBoxEditor(Align.RIGHT); serverEditor = new ListModelListBoxEditor<VDS>(new NullSafeRenderer<VDS>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java index bd5650e..8e0a60e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java @@ -2,10 +2,8 @@ import javax.inject.Inject; -import com.google.gwt.text.shared.Parser; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServiceStatus; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.UiCommandButton; @@ -35,8 +33,6 @@ import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Widget; - -import java.text.ParseException; public class SubTabClusterGeneralView extends AbstractSubTabFormView<VDSGroup, ClusterListModel, ClusterGeneralModel> implements SubTabClusterGeneralPresenter.ViewDef, Editor<ClusterGeneralModel> { @@ -90,15 +86,8 @@ // Inject a reference to the resources: this.resources = resources; this.form = new ClusterGeneralModelForm(modelProvider, constants); - glusterSwiftStatusEditor = new EntityModelLabelEditor<GlusterServiceStatus>(new EnumRenderer<GlusterServiceStatus>(), new Parser<GlusterServiceStatus>() { - @Override - public GlusterServiceStatus parse(CharSequence text) throws ParseException { - if (StringHelper.isNullOrEmpty(text.toString())) { - return null; - } - return GlusterServiceStatus.valueOf(text.toString().toUpperCase()); - } - }); + glusterSwiftStatusEditor = new EntityModelLabelEditor<GlusterServiceStatus>( + new EnumRenderer<GlusterServiceStatus>()); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); initManageGlusterSwift(); -- To view, visit http://gerrit.ovirt.org/34648 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c7a911d7a6ecfe79ee006be46e0ef8e627b97e3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
