Lior Vernia has uploaded a new change for review.
Change subject: webadmin: Remove coupling between QoS dialog and DC/QoS subtab
......................................................................
webadmin: Remove coupling between QoS dialog and DC/QoS subtab
So far it was assumed that the dialog is always opened from the DC/QoS
subtab, this coupling is now removed.
Change-Id: I1d9e5f8b5a0c2b197b81ba31e61f28ebc3eeffb3
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkQoSListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkQoSModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkQoSModel.java
4 files changed, 16 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/22681/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkQoSListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkQoSListModel.java
index f143c52..475cea5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkQoSListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkQoSListModel.java
@@ -138,7 +138,7 @@
return;
}
- final NetworkQoSModel networkQoSModel = new
EditNetworkQoSModel(networkQoS, this);
+ final NetworkQoSModel networkQoSModel = new
EditNetworkQoSModel(networkQoS, this, getEntity());
setWindow(networkQoSModel);
networkQoSModel.getDataCenters().setItems(Arrays.asList(getEntity()));
@@ -170,14 +170,10 @@
return;
}
- final NewNetworkQoSModel newNetworkQoSModel = new
NewNetworkQoSModel(this);
+ final NewNetworkQoSModel newNetworkQoSModel = new
NewNetworkQoSModel(this, getEntity());
setWindow(newNetworkQoSModel);
newNetworkQoSModel.getDataCenters().setItems(Arrays.asList(getEntity()));
newNetworkQoSModel.getDataCenters().setSelectedItem(getEntity());
- }
-
- public Object getDataCenter() {
- return getEntity();
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkQoSModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkQoSModel.java
index 85d2572..82a37b7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkQoSModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkQoSModel.java
@@ -4,16 +4,18 @@
import org.ovirt.engine.core.common.action.NetworkQoSParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.network.NetworkQoS;
import org.ovirt.engine.ui.frontend.Frontend;
+import org.ovirt.engine.ui.uicommonweb.models.Model;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult;
import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback;
public class EditNetworkQoSModel extends NetworkQoSModel {
- public EditNetworkQoSModel(NetworkQoS networkQoS,
DataCenterNetworkQoSListModel sourceListModel) {
- super(sourceListModel);
+ public EditNetworkQoSModel(NetworkQoS networkQoS, Model sourceModel,
StoragePool dataCenter) {
+ super(sourceModel, dataCenter);
this.networkQoS = networkQoS;
init();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java
index 58f710e..a2e425d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkQoSModel.java
@@ -29,7 +29,7 @@
EMPTY_QOS.setId(Guid.Empty);
}
- private final ListModel sourceListModel;
+ private final Model sourceModel;
private ListModel dataCenters;
private EntityModel name;
@@ -44,11 +44,11 @@
protected NetworkQoS networkQoS = new NetworkQoS();
- public NetworkQoSModel(DataCenterNetworkQoSListModel sourceListModel) {
- this.sourceListModel = sourceListModel;
+ public NetworkQoSModel(Model sourceModel, StoragePool dataCenter) {
+ this.sourceModel = sourceModel;
setName(new EntityModel());
setDataCenters(new ListModel());
- getDataCenters().setSelectedItem(sourceListModel.getDataCenter());
+ getDataCenters().setSelectedItem(dataCenter);
getDataCenters().setIsChangable(false);
setInboundAverage(new
EntityModel(AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.QoSInboundAverageDefaultValue)));
setInboundPeak(new
EntityModel(AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.QoSInboundPeakDefaultValue)));
@@ -61,10 +61,6 @@
setOutboundEnabled(new EntityModel(Boolean.TRUE));
getInboundEnabled().getEntityChangedEvent().addListener(this);
getOutboundEnabled().getEntityChangedEvent().addListener(this);
- }
-
- public ListModel getSourceListModel() {
- return sourceListModel;
}
public boolean validate() {
@@ -143,8 +139,8 @@
protected abstract void executeSave();
private void cancel() {
- sourceListModel.setWindow(null);
- sourceListModel.setConfirmWindow(null);
+ sourceModel.setWindow(null);
+ sourceModel.setConfirmWindow(null);
}
public void onSave() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkQoSModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkQoSModel.java
index 4523d90..f61d764 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkQoSModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkQoSModel.java
@@ -4,14 +4,16 @@
import org.ovirt.engine.core.common.action.NetworkQoSParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.ui.frontend.Frontend;
+import org.ovirt.engine.ui.uicommonweb.models.Model;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult;
import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback;
public class NewNetworkQoSModel extends NetworkQoSModel {
- public NewNetworkQoSModel(DataCenterNetworkQoSListModel sourceListModel) {
- super(sourceListModel);
+ public NewNetworkQoSModel(Model sourceModel, StoragePool dataCenter) {
+ super(sourceModel, dataCenter);
init();
}
--
To view, visit http://gerrit.ovirt.org/22681
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d9e5f8b5a0c2b197b81ba31e61f28ebc3eeffb3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
