Lior Vernia has uploaded a new change for review. Change subject: webadmin: Properly parameterize cluster ListModel ......................................................................
webadmin: Properly parameterize cluster ListModel Parameterized the now-generic ListModel containing clusters in NewNetworkModel, as well as the corresponding objects in the view (which enabled to remove a few castings). Change-Id: I1fedd156dc3a8e6d6defcf9260a3c66b6f9281db Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java 4 files changed, 29 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/26841/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java index e75bde1..42e1d05 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java @@ -29,7 +29,7 @@ public class NewNetworkModel extends NetworkModel { - private ListModel privateNetworkClusterList; + private ListModel<NetworkClusterModel> privateNetworkClusterList; public NewNetworkModel(ListModel sourceListModel) { super(sourceListModel); @@ -37,12 +37,12 @@ init(); } - public ListModel getNetworkClusterList() + public ListModel<NetworkClusterModel> getNetworkClusterList() { return privateNetworkClusterList; } - public void setNetworkClusterList(ListModel value) + public void setNetworkClusterList(ListModel<NetworkClusterModel> value) { privateNetworkClusterList = value; } @@ -197,11 +197,8 @@ { ArrayList<NetworkClusterModel> clusterToAttach = new ArrayList<NetworkClusterModel>(); - for (Object item : getNetworkClusterList().getItems()) - { - NetworkClusterModel networkClusterModel = (NetworkClusterModel) item; - if (networkClusterModel.isAttached()) - { + for (NetworkClusterModel networkClusterModel : getNetworkClusterList().getItems()) { + if (networkClusterModel.isAttached()) { clusterToAttach.add(networkClusterModel); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java index d4eacc3..a2c4f87 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.presenter.popup.datacenter; import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NewNetworkModel; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.AbstractNetworkPopupPresenterWidget; @@ -10,7 +11,7 @@ public class NewNetworkPopupPresenterWidget extends AbstractNetworkPopupPresenterWidget<NewNetworkModel, NewNetworkPopupPresenterWidget.ViewDef>{ public interface ViewDef extends AbstractNetworkPopupPresenterWidget.ViewDef<NewNetworkModel> { - void setNetworkClusterList(ListModel networkClusterList); + void setNetworkClusterList(ListModel<NetworkClusterModel> networkClusterList); } @Inject diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index 0137deb..066caf1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -24,7 +24,6 @@ import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.table.header.CheckboxHeader; -import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkModel; @@ -130,7 +129,7 @@ @UiField(provided = true) @Ignore - public final EntityModelCellTable<ListModel> clustersTable; + public final EntityModelCellTable<ListModel<NetworkClusterModel>> clustersTable; @UiField public VerticalPanel attachPanel; @@ -216,7 +215,7 @@ isVmNetworkEditor = new EntityModelCheckBoxEditor(Align.RIGHT); vlanTagging = new EntityModelCheckBoxEditor(Align.RIGHT); hasMtuEditor = new EntityModelCheckBoxEditor(Align.RIGHT); - this.clustersTable = new EntityModelCellTable<ListModel>(SelectionMode.NONE, true); + this.clustersTable = new EntityModelCellTable<ListModel<NetworkClusterModel>>(SelectionMode.NONE, true); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); initEntityModelCellTable(constants, templates); localize(constants); @@ -277,9 +276,8 @@ messageLabel.setHTML(label); } - @SuppressWarnings("unchecked") Iterable<NetworkClusterModel> getClustersTableItems() { - ListModel tableModel = clustersTable.asEditor().flush(); + ListModel<NetworkClusterModel> tableModel = clustersTable.asEditor().flush(); return tableModel != null && tableModel.getItems() != null ? tableModel.getItems() : new ArrayList<NetworkClusterModel>(); } @@ -345,58 +343,56 @@ } }; - clustersTable.addEntityModelColumn(new TextColumnWithTooltip<EntityModel>() { + clustersTable.addColumn(new TextColumnWithTooltip<NetworkClusterModel>() { @Override - public String getValue(EntityModel model) { - return ((NetworkClusterModel) model).getName(); + public String getValue(NetworkClusterModel model) { + return model.getName(); } }, constants.nameClusterHeader()); - clustersTable.addColumn(new CheckboxColumn<EntityModel>(new FieldUpdater<EntityModel, Boolean>() { + clustersTable.addColumn(new CheckboxColumn<NetworkClusterModel>(new FieldUpdater<NetworkClusterModel, Boolean>() { @Override - public void update(int index, EntityModel model, Boolean value) { - NetworkClusterModel networkClusterModel = (NetworkClusterModel) model; - networkClusterModel.setAttached(value); + public void update(int index, NetworkClusterModel model, Boolean value) { + model.setAttached(value); refreshClustersTable(); } }) { @Override - public Boolean getValue(EntityModel model) { - return ((NetworkClusterModel) model).isAttached(); + public Boolean getValue(NetworkClusterModel model) { + return model.isAttached(); } @Override - protected boolean canEdit(EntityModel model) { + protected boolean canEdit(NetworkClusterModel model) { return model.getIsChangable(); } @Override - public void render(Context context, EntityModel object, SafeHtmlBuilder sb) { + public void render(Context context, NetworkClusterModel object, SafeHtmlBuilder sb) { super.render(context, object, sb); sb.append(templates.textForCheckBox(constants.attach())); } }, assignAllHeader, "80px"); //$NON-NLS-1$ - clustersTable.addColumn(new CheckboxColumn<EntityModel>(new FieldUpdater<EntityModel, Boolean>() { + clustersTable.addColumn(new CheckboxColumn<NetworkClusterModel>(new FieldUpdater<NetworkClusterModel, Boolean>() { @Override - public void update(int index, EntityModel model, Boolean value) { - NetworkClusterModel networkClusterModel = (NetworkClusterModel) model; - networkClusterModel.setRequired(value); + public void update(int index, NetworkClusterModel model, Boolean value) { + model.setRequired(value); refreshClustersTable(); } }) { @Override - public Boolean getValue(EntityModel model) { - return ((NetworkClusterModel) model).isRequired(); + public Boolean getValue(NetworkClusterModel model) { + return model.isRequired(); } @Override - protected boolean canEdit(EntityModel model) { + protected boolean canEdit(NetworkClusterModel model) { return isRequiredChangeable(); } @Override - public void render(Context context, EntityModel object, SafeHtmlBuilder sb) { + public void render(Context context, NetworkClusterModel object, SafeHtmlBuilder sb) { super.render(context, object, sb); sb.append(templates.textForCheckBox(constants.required())); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java index 5f49835..5242646 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/NewNetworkPopupView.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup; import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NewNetworkModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -52,7 +53,7 @@ } @Override - public void setNetworkClusterList(ListModel networkClusterList) { + public void setNetworkClusterList(ListModel<NetworkClusterModel> networkClusterList) { clustersTable.asEditor().edit(networkClusterList); } -- To view, visit http://gerrit.ovirt.org/26841 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fedd156dc3a8e6d6defcf9260a3c66b6f9281db 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
