Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added UI provision for ProviderType ......................................................................
webadmin: Added UI provision for ProviderType Added provision for the ProviderType enum, for when it is populated with values. Different renderers might in fact be needed. Change-Id: I0f9dbe26ecc611039210151fe09b14ac8d3f0734 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.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/popup/provider/ProviderPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabProviderView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java 7 files changed, 58 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/14706/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java index 806dfd5..7f9ae2f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderGeneralModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.providers; import org.ovirt.engine.core.common.businessentities.Provider; +import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -10,10 +11,12 @@ public class ProviderGeneralModel extends EntityModel { private static final String PROPERTY_NAME = "Name"; //$NON-NLS-1$ + private static final String PROPERTY_TYPE = "Type"; //$NON-NLS-1$ private static final String PROPERTY_DESCRIPTION = "Description"; //$NON-NLS-1$ private static final String PROPERTY_URL = "Url"; //$NON-NLS-1$ private String name; + private ProviderType type; private String description; private String url; @@ -57,6 +60,17 @@ } } + public ProviderType getType() { + return type; + } + + public void setType(ProviderType value) { + if (value != type) { + type = value; + onPropertyChanged(new PropertyChangedEventArgs(PROPERTY_TYPE)); + } + } + public String getDescription() { return description; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index c028f84..2623e41 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -3,6 +3,7 @@ import org.ovirt.engine.core.common.action.ProviderParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.Provider; +import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -28,6 +29,7 @@ private final Provider provider; private EntityModel privateName; + private EntityModel privateType; private EntityModel privateDescription; private EntityModel privateUrl; @@ -37,6 +39,14 @@ private void setName(EntityModel value) { privateName = value; + } + + public EntityModel getType() { + return privateType; + } + + private void setType(EntityModel value) { + privateType = value; } public EntityModel getDescription() { @@ -61,6 +71,7 @@ this.provider = provider; setName(new EntityModel(provider.getName())); + setType(new EntityModel(provider.getType())); setDescription(new EntityModel(provider.getDescription())); setUrl(new EntityModel(provider.getUrl())); @@ -97,6 +108,7 @@ } provider.setName((String) privateName.getEntity()); + provider.setType((ProviderType) privateType.getEntity()); provider.setDescription((String) privateDescription.getEntity()); provider.setUrl((String) privateUrl.getEntity()); Frontend.RunAction(action, new ProviderParameters(provider), 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 bd1f31c..697e8e2 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 @@ -2629,6 +2629,9 @@ @DefaultStringValue("Name") String nameProvider(); + @DefaultStringValue("Type") + String typeProvider(); + @DefaultStringValue("Description") String descriptionProvider(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java index f2fb2dc..1f00f23 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java @@ -5,6 +5,8 @@ import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; +import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -37,6 +39,11 @@ @WithElementId EntityModelTextBoxEditor nameEditor; + @UiField(provided = true) + @Path(value = "type.entity") + @WithElementId + ListModelListBoxEditor<Object> typeEditor; + @UiField @Path(value = "description.entity") @WithElementId @@ -50,9 +57,11 @@ @UiField Style style; + @SuppressWarnings({ "rawtypes", "unchecked" }) @Inject public ProviderPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { super(eventBus, resources); + typeEditor = new ListModelListBoxEditor<Object>(new EnumRenderer()); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); localize(constants); @@ -62,6 +71,7 @@ void localize(ApplicationConstants constants) { nameEditor.setLabel(constants.nameProvider()); + typeEditor.setLabel(constants.typeProvider()); descriptionEditor.setLabel(constants.descriptionProvider()); urlEditor.setLabel(constants.urlProvider()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml index 80542b5..6df59f9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.ui.xml @@ -12,6 +12,7 @@ <d:content> <g:FlowPanel> <e:EntityModelTextBoxEditor ui:field="nameEditor" /> + <e:ListModelListBoxEditor ui:field="typeEditor" /> <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> <e:EntityModelTextBoxEditor ui:field="urlEditor" /> </g:FlowPanel> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabProviderView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabProviderView.java index 8f2614d..a849dfb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabProviderView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabProviderView.java @@ -1,8 +1,10 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab; import org.ovirt.engine.core.common.businessentities.Provider; +import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; +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.UICommand; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderListModel; @@ -46,6 +48,15 @@ getTable().addColumn(nameColumn, constants.nameProvider()); + TextColumnWithTooltip<Provider> typeColumn = new EnumColumn<Provider, ProviderType>() { + @Override + protected ProviderType getRawValue(Provider object) { + return object.getType(); + } + }; + + getTable().addColumn(typeColumn, constants.typeProvider()); + TextColumnWithTooltip<Provider> descriptionColumn = new TextColumnWithTooltip<Provider>() { @Override public String getValue(Provider object) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java index 4411303..1798ac9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java @@ -3,12 +3,14 @@ import javax.inject.Inject; import org.ovirt.engine.core.common.businessentities.Provider; +import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; import org.ovirt.engine.ui.common.widget.form.FormItem; import org.ovirt.engine.ui.common.widget.form.GeneralFormPanel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; +import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,6 +22,7 @@ import com.google.gwt.editor.client.SimpleBeanEditorDriver; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.ValueLabel; import com.google.gwt.user.client.ui.Widget; public class SubTabProviderGeneralView extends AbstractSubTabFormView<Provider, ProviderListModel, ProviderGeneralModel> implements SubTabProviderGeneralPresenter.ViewDef, Editor<ProviderGeneralModel> { @@ -35,6 +38,7 @@ private final ApplicationConstants constants = ClientGinjectorProvider.instance().getApplicationConstants(); TextBoxLabel name = new TextBoxLabel(); + ValueLabel<ProviderType> type = new ValueLabel<ProviderType>(new EnumRenderer<ProviderType>()); TextBoxLabel description = new TextBoxLabel(); TextBoxLabel url = new TextBoxLabel(); @@ -58,8 +62,9 @@ formBuilder.setColumnsWidth("300px", "300px"); //$NON-NLS-1$ //$NON-NLS-2$ formBuilder.addFormItem(new FormItem(constants.nameProvider(), name, 0, 0)); - formBuilder.addFormItem(new FormItem(constants.descriptionProvider(), description, 1, 0)); - formBuilder.addFormItem(new FormItem(constants.urlProvider(), url, 2, 0)); + formBuilder.addFormItem(new FormItem(constants.typeProvider(), type, 1, 0)); + formBuilder.addFormItem(new FormItem(constants.descriptionProvider(), description, 2, 0)); + formBuilder.addFormItem(new FormItem(constants.urlProvider(), url, 3, 0)); } @Override -- To view, visit http://gerrit.ovirt.org/14706 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f9dbe26ecc611039210151fe09b14ac8d3f0734 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
