Alexander Wels has uploaded a new change for review.
Change subject: userportal,webadmin: Generify permission in models
......................................................................
userportal,webadmin: Generify permission in models
- After the GIN patch a lot of the permission list models where
not properly generified, this patch fixes that.
Change-Id: I443d45d7bb1ffb69d239777d6c61f5a2fe0d2a2c
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterHostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterClusterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
20 files changed, 44 insertions(+), 39 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/35514/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterHostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterHostListModel.java
index 9782ff2..34322f6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterHostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterHostListModel.java
@@ -40,7 +40,7 @@
final HostVmListModel hostVmListModel, final HostEventListModel
hostEventListModel,
final HostInterfaceListModel hostInterfaceListModel,
final HostHardwareGeneralModel hostHardwareGeneralModel, final
HostHooksListModel hostHooksListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<HostListModel> permissionListModel) {
super(hostGeneralModel, hostGlusterSwiftListModel,
hostBricksListModel, hostVmListModel, hostEventListModel,
hostInterfaceListModel, hostHardwareGeneralModel,
hostHooksListModel, permissionListModel);
setUpdateMomPolicyCommand(new UICommand("updateMomPolicyCommand",
this)); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
index c419809..4b7b2e5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
@@ -188,7 +188,7 @@
final ClusterAffinityGroupListModel clusterAffinityGroupListModel,
final CpuProfileListModel cpuProfileListModel, final
ClusterGeneralModel clusterGeneralModel,
final ClusterNetworkListModel clusterNetworkListModel, final
ClusterHostListModel clusterHostListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<ClusterListModel> permissionListModel) {
this.clusterVmListModel = clusterVmListModel;
this.clusterServiceModel = clusterServiceModel;
this.clusterGlusterHookListModel = clusterGlusterHookListModel;
@@ -247,7 +247,7 @@
private void setDetailList(final ClusterGeneralModel clusterGeneralModel,
final ClusterNetworkListModel clusterNetworkListModel, final
ClusterHostListModel clusterHostListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<ClusterListModel> permissionListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(clusterGeneralModel);
list.add(clusterNetworkListModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterVmListModel.java
index 5610023..348811a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterVmListModel.java
@@ -27,7 +27,7 @@
VmSnapshotListModel vmSnapshotListModel,
VmEventListModel vmEventListModel,
VmAppListModel vmAppListModel,
- PermissionListModel permissionListModel,
+ PermissionListModel<VmListModel> permissionListModel,
VmAffinityGroupListModel vmAffinityGroupListModel,
VmSessionsModel vmSessionsModel) {
super(vmGeneralModel,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterClusterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterClusterListModel.java
index bf95b5d..eeb1b62 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterClusterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterClusterListModel.java
@@ -26,7 +26,7 @@
ClusterGeneralModel clusterGeneralModel,
ClusterNetworkListModel clusterNetworkListModel,
ClusterHostListModel clusterHostListModel,
- PermissionListModel permissionListModel) {
+ PermissionListModel<ClusterListModel> permissionListModel) {
super(clusterVmListModel,
clusterServiceModel,
clusterGlusterHookListModel,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
index 2fa5701..4d07ac5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
@@ -195,7 +195,7 @@
final DataCenterNetworkQoSListModel dataCenterNetworkQoSListModel,
final DataCenterStorageQosListModel dataCenterStorageQosListModel,
final DataCenterCpuQosListModel dataCenterCpuQosListModel,
- final PermissionListModel permissionListModel,
+ final PermissionListModel<DataCenterListModel> permissionListModel,
final DataCenterEventListModel dataCenterEventListModel) {
this.commonModelProvider = commonModelProvider;
iscsiBondListModel = dataCenterIscsiBondListModel;
@@ -262,7 +262,7 @@
final DataCenterNetworkQoSListModel dataCenterNetworkQoSListModel,
final DataCenterStorageQosListModel dataCenterStorageQosListModel,
final DataCenterCpuQosListModel dataCenterCpuQosListModel,
- final PermissionListModel permissionListModel,
+ final PermissionListModel<DataCenterListModel> permissionListModel,
final DataCenterEventListModel dataCenterEventListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(dataCenterStorageListModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index 7bcf4a4..dcb289f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -45,7 +45,6 @@
import com.google.inject.Inject;
-@SuppressWarnings("unused")
public class DiskListModel extends ListWithDetailsModel implements
ISupportSystemTreeContext
{
private UICommand privateNewCommand;
@@ -175,7 +174,7 @@
@Inject
public DiskListModel(final DiskVmListModel diskVmListModel, final
DiskTemplateListModel diskTemplateListModel,
final DiskStorageListModel diskStorageListModel, final
DiskGeneralModel diskGeneralModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<DiskListModel> permissionListModel) {
this.diskVmListModel = diskVmListModel;
this.diskTemplateListModel = diskTemplateListModel;
this.diskStorageListModel = diskStorageListModel;
@@ -206,7 +205,7 @@
}
private void setDetailList(final DiskGeneralModel diskGeneralModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<DiskListModel> permissionListModel) {
diskVmListModel.setIsAvailable(false);
diskTemplateListModel.setIsAvailable(false);
diskStorageListModel.setIsAvailable(false);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index 7cfaba4..17e59b9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -381,7 +381,7 @@
final HostVmListModel hostVmListModel, final HostEventListModel
hostEventListModel,
final HostInterfaceListModel hostInterfaceListModel,
final HostHardwareGeneralModel hostHardwareGeneralModel, final
HostHooksListModel hostHooksListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<HostListModel> permissionListModel) {
this.generalModel = hostGeneralModel;
this.glusterSwiftModel = hostGlusterSwiftListModel;
this.hostBricksListModel = hostBricksListModel;
@@ -425,7 +425,7 @@
private void setDetailList(final HostInterfaceListModel
hostInterfaceListModel,
final HostHardwareGeneralModel hostHardwareGeneralModel, final
HostHooksListModel hostHooksListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<HostListModel> permissionListModel) {
generalModel.getRequestEditEvent().addListener(this);
generalModel.getRequestGOToEventsTabEvent().addListener(this);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostVmListModel.java
index 00036fb..4293dea 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostVmListModel.java
@@ -29,7 +29,7 @@
VmSnapshotListModel vmSnapshotListModel,
VmEventListModel vmEventListModel,
VmAppListModel vmAppListModel,
- PermissionListModel permissionListModel,
+ PermissionListModel<VmListModel> permissionListModel,
VmAffinityGroupListModel vmAffinityGroupListModel,
VmSessionsModel vmSessionsModel) {
super(vmGeneralModel, vmInterfaceListModel, vmDiskListModel,
vmSnapshotListModel, vmEventListModel,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
index da5bf65..0941da3 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
@@ -59,7 +59,8 @@
final NetworkGeneralModel networkGeneralModel, final
NetworkProfileListModel networkProfileListModel,
final NetworkClusterListModel networkClusterListModel,
final NetworkHostListModel networkHostListModel, final
NetworkVmListModel networkVmListModel,
- final NetworkTemplateListModel networkTemplateListModel, final
PermissionListModel permissionListModel) {
+ final NetworkTemplateListModel networkTemplateListModel,
+ final PermissionListModel<NetworkListModel> permissionListModel) {
this.networkExternalSubnetListModel = networkExternalSubnetListModel;
this.importNetworkModelProvider = importNetworkModelProvider;
setDetailList(networkGeneralModel, networkProfileListModel,
networkClusterListModel, networkHostListModel,
@@ -88,7 +89,8 @@
final NetworkProfileListModel networkProfileListModel,
final NetworkClusterListModel networkClusterListModel,
final NetworkHostListModel networkHostListModel, final
NetworkVmListModel networkVmListModel,
- final NetworkTemplateListModel networkTemplateListModel, final
PermissionListModel permissionListModel) {
+ final NetworkTemplateListModel networkTemplateListModel,
+ final PermissionListModel<NetworkListModel> permissionListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(networkGeneralModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
index 846aa0e..a4bc6e8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
@@ -133,7 +133,7 @@
@Inject
public PoolListModel(final PoolGeneralModel poolGeneralModel, final
PoolVmListModel poolVmListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<PoolListModel> permissionListModel) {
setDetailList(poolGeneralModel, poolVmListModel, permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().poolsTitle());
@@ -153,7 +153,7 @@
}
private void setDetailList(final PoolGeneralModel poolGeneralModel, final
PoolVmListModel poolVmListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<PoolListModel> permissionListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(poolGeneralModel);
list.add(poolVmListModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolVmListModel.java
index 6209660..56a0952 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolVmListModel.java
@@ -52,7 +52,7 @@
public PoolVmListModel(final VmGeneralModel vmGeneralModel, final
VmInterfaceListModel vmInterfaceListModel,
final VmDiskListModel vmDiskListModel, final VmSnapshotListModel
vmSnapshotListModel,
final VmEventListModel vmEventListModel, final VmAppListModel
vmAppListModel,
- final PermissionListModel permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
+ final PermissionListModel<VmListModel> permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
final VmSessionsModel vmSessionsModel) {
super(vmGeneralModel, vmInterfaceListModel, vmDiskListModel,
vmSnapshotListModel, vmEventListModel,
vmAppListModel, permissionListModel, vmAffinityGroupListModel,
vmSessionsModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
index b9fc5a1..deb936c9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
@@ -7,6 +7,7 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.uicommonweb.help.HelpTag;
+import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterListModel;
import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
@@ -15,7 +16,7 @@
public class CpuProfileListModel extends ProfileListModel<CpuProfile, CpuQos,
VDSGroup> {
@Inject
- public CpuProfileListModel(final PermissionListModel permissionListModel) {
+ public CpuProfileListModel(final PermissionListModel<ClusterListModel>
permissionListModel) {
super(permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().cpuProfileTitle());
setHelpTag(HelpTag.cpu_profiles);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
index e4a1e8e..5bc1883 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
@@ -8,6 +8,7 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.uicommonweb.help.HelpTag;
import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel;
+import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import com.google.inject.Inject;
@@ -15,7 +16,7 @@
public class DiskProfileListModel extends ProfileListModel<DiskProfile,
StorageQos, StorageDomain> {
@Inject
- public DiskProfileListModel(final PermissionListModel permissionListModel)
{
+ public DiskProfileListModel(final PermissionListModel<StorageListModel>
permissionListModel) {
super(permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().diskProfilesTitle());
setHelpTag(HelpTag.disk_profiles);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileListModel.java
index 64ca1d9..ab18f65 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileListModel.java
@@ -22,6 +22,7 @@
import org.ovirt.engine.ui.uicommonweb.help.HelpTag;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
import org.ovirt.engine.ui.uicommonweb.models.ListWithDetailsModel;
+import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
@@ -33,10 +34,10 @@
private UICommand editCommand;
private UICommand removeCommand;
private Map<Guid, Q> qosMap;
- final PermissionListModel permissionListModel;
+ final PermissionListModel<? extends SearchableListModel>
permissionListModel;
@Inject
- public ProfileListModel(final PermissionListModel permissionListModel) {
+ public ProfileListModel(final PermissionListModel<? extends
SearchableListModel> permissionListModel) {
this.permissionListModel = permissionListModel;
setDetailList();
setTitle(ConstantsManager.getInstance().getConstants().diskProfilesTitle());
@@ -246,7 +247,7 @@
return qosMap.get(qosId);
}
- public PermissionListModel getPermissionListModel() {
+ public PermissionListModel<? extends SearchableListModel>
getPermissionListModel() {
return permissionListModel;
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java
index 87d9e7d..f46cc89 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java
@@ -47,7 +47,7 @@
public VnicProfileListModel(final Provider<CommonModel>
commonModelProvider,
final VnicProfileVmListModel vNicProfileVmListModel,
final VnicProfileTemplateListModel vNicProfileTemplateListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<VnicProfileListModel>
permissionListModel) {
this.commonModelProvider = commonModelProvider;
setDetailList(vNicProfileVmListModel, vNicProfileTemplateListModel,
permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().vnicProfilesTitle());
@@ -73,7 +73,7 @@
private void setDetailList(final VnicProfileVmListModel
vNicProfileVmListModel,
final VnicProfileTemplateListModel vNicProfileTemplateListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<VnicProfileListModel>
permissionListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(vNicProfileVmListModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
index fcb785a..d789973 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
@@ -70,9 +70,7 @@
import com.google.inject.Inject;
-@SuppressWarnings("unused")
-public class StorageListModel extends ListWithDetailsAndReportsModel
implements ITaskTarget, ISupportSystemTreeContext
-{
+public class StorageListModel extends ListWithDetailsAndReportsModel
implements ITaskTarget, ISupportSystemTreeContext {
private UICommand privateNewDomainCommand;
@@ -174,7 +172,8 @@
final StorageVmListModel storageVmListModel, final
StorageTemplateListModel storageTemplateListModel,
final StorageIsoListModel storageIsoListModel, final
StorageDiskListModel storageDiskListModel,
final StorageSnapshotListModel storageSnapshotListModel, final
DiskProfileListModel diskProfileListModel,
- final StorageEventListModel storageEventListModel, final
PermissionListModel permissionListModel) {
+ final StorageEventListModel storageEventListModel,
+ final PermissionListModel<StorageListModel> permissionListModel) {
generalModel = storageGeneralModel;
dcListModel = storageDataCenterListModel;
vmBackupModel = storageVmBackupModel;
@@ -210,7 +209,7 @@
}
private void setDetailList(final StorageEventListModel
storageEventListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<StorageListModel> permissionListModel) {
generalModel.setIsAvailable(false);
dcListModel.setIsAvailable(false);
this.vmBackupModel.setIsAvailable(false);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
index 06790b4..8ff87aa 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
@@ -117,7 +117,7 @@
final TemplateVmListModel templateVmListModel, final
TemplateInterfaceListModel templateInterfaceListModel,
final TemplateStorageListModel templateStorageListModel,
final TemplateDiskListModel templateDiskListModel, final
TemplateEventListModel templateEventListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<TemplateListModel> permissionListModel) {
this(templateGeneralModel, templateVmListModel,
templateInterfaceListModel, templateStorageListModel,
templateDiskListModel, templateEventListModel,
permissionListModel, 3);
}
@@ -126,7 +126,7 @@
final TemplateVmListModel templateVmListModel, final
TemplateInterfaceListModel templateInterfaceListModel,
final TemplateStorageListModel templateStorageListModel,
final TemplateDiskListModel templateDiskListModel, final
TemplateEventListModel templateEventListModel,
- final PermissionListModel permissionListModel, int customPosition)
{
+ final PermissionListModel<TemplateListModel> permissionListModel,
int customPosition) {
List<EntityModel> list = new ArrayList<EntityModel>();
setDetailList(list, templateGeneralModel, templateVmListModel,
templateInterfaceListModel,
templateStorageListModel);
@@ -382,7 +382,7 @@
protected void addCustomModelsDetailModelList(final List<EntityModel>
list, int customPosition,
final TemplateDiskListModel templateDiskListModel, final
TemplateEventListModel templateEventListModel,
- final PermissionListModel permissionListModel) {
+ final PermissionListModel<TemplateListModel> permissionListModel) {
templateDiskListModel.setSystemTreeContext(this);
list.add(customPosition, templateDiskListModel);
list.add(templateEventListModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
index a05ca1f..588204c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
@@ -27,8 +27,8 @@
public TemplateVmListModel(final VmGeneralModel vmGeneralModel, final
VmInterfaceListModel vmInterfaceListModel,
final VmDiskListModel vmDiskListModel, final VmSnapshotListModel
vmSnapshotListModel,
final VmEventListModel vmEventListModel, final VmAppListModel
vmAppListModel,
- final PermissionListModel permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
- final VmSessionsModel vmSessionsModel) {
+ final PermissionListModel<VmListModel> permissionListModel,
+ final VmAffinityGroupListModel vmAffinityGroupListModel, final
VmSessionsModel vmSessionsModel) {
super(vmGeneralModel, vmInterfaceListModel, vmDiskListModel,
vmSnapshotListModel, vmEventListModel,
vmAppListModel, permissionListModel, vmAffinityGroupListModel,
vmSessionsModel);
setTitle(ConstantsManager.getInstance().getConstants().virtualMachinesTitle());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index 49697e8..5f92fac 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -458,7 +458,7 @@
public VmListModel(final VmGeneralModel vmGeneralModel, final
VmInterfaceListModel vmInterfaceListModel,
final VmDiskListModel vmDiskListModel, final VmSnapshotListModel
vmSnapshotListModel,
final VmEventListModel vmEventListModel, final VmAppListModel
vmAppListModel,
- final PermissionListModel permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
+ final PermissionListModel<VmListModel> permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
final VmSessionsModel vmSessionsModel) {
setDetailList(vmGeneralModel, vmInterfaceListModel, vmDiskListModel,
vmSnapshotListModel, vmEventListModel,
vmAppListModel, permissionListModel, vmAffinityGroupListModel,
vmSessionsModel);
@@ -520,7 +520,7 @@
private void setDetailList(final VmGeneralModel vmGeneralModel, final
VmInterfaceListModel vmInterfaceListModel,
final VmDiskListModel vmDiskListModel, final VmSnapshotListModel
vmSnapshotListModel,
final VmEventListModel vmEventListModel, final VmAppListModel
vmAppListModel,
- final PermissionListModel permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
+ final PermissionListModel<VmListModel> permissionListModel, final
VmAffinityGroupListModel vmAffinityGroupListModel,
final VmSessionsModel vmSessionsModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
list.add(vmGeneralModel);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
index a5f36d7..6861d88 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
@@ -193,7 +193,8 @@
@Inject
public VolumeListModel(final VolumeBrickListModel volumeBrickListModel,
final VolumeGeneralModel volumeGeneralModel,
- final VolumeParameterListModel volumeParameterListModel, final
PermissionListModel permissionListModel,
+ final VolumeParameterListModel volumeParameterListModel,
+ final PermissionListModel<VolumeListModel> permissionListModel,
final VolumeEventListModel volumeEventListModel, final
VolumeGeoRepListModel geoRepListModel) {
this.brickListModel = volumeBrickListModel;
this.geoRepListModel = geoRepListModel;
@@ -231,7 +232,8 @@
}
private void setDetailList(final VolumeGeneralModel volumeGeneralModel,
- final VolumeParameterListModel volumeParameterListModel, final
PermissionListModel permissionListModel,
+ final VolumeParameterListModel volumeParameterListModel,
+ final PermissionListModel<VolumeListModel> permissionListModel,
final VolumeEventListModel volumeEventListModel) {
List<EntityModel> list = new ArrayList<EntityModel>();
--
To view, visit http://gerrit.ovirt.org/35514
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I443d45d7bb1ffb69d239777d6c61f5a2fe0d2a2c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
