test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix findbugs warnings #PL-6147

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-10-15 14:24:35 +00:00
parent d274d5d395
commit b104527b7f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gui/src/com/haulmont/cuba/gui/app/security/ds/EntityPermissionTargetsDatasource.java
View File

@ -70,8 +70,9 @@ public class EntityPermissionTargetsDatasource extends CollectionDatasourceImpl<
data.clear();
for (OperationPermissionTarget target : targets) {
if ((filter == null) || (permissionsFilter.apply(target)))
if ((permissionsFilter == null) || (permissionsFilter.apply(target))) {
data.put(target.getId(), target);
}
}
}

9
modules/gui/src/com/haulmont/cuba/gui/app/security/ds/MultiplePermissionTargetsDatasource.java
View File

@ -30,7 +30,7 @@ public class MultiplePermissionTargetsDatasource extends CollectionDatasourceImp
private List<MultiplePermissionTarget> targets;
private Predicate<MultiplePermissionTarget> filter;
private Predicate<MultiplePermissionTarget> permissionsFilter;
private CollectionDatasource<Permission, UUID> permissionDs;
@ -63,8 +63,9 @@ public class MultiplePermissionTargetsDatasource extends CollectionDatasourceImp
clear();
for (MultiplePermissionTarget target : targets) {
if ((filter == null) || (filter.apply(target)))
if ((permissionsFilter == null) || (permissionsFilter.apply(target))) {
data.put(target.getId(), target);
}
}
}
@ -96,11 +97,11 @@ public class MultiplePermissionTargetsDatasource extends CollectionDatasourceImp
}
public Predicate<MultiplePermissionTarget> getFilter() {
return filter;
return permissionsFilter;
}
public void setFilter(Predicate<MultiplePermissionTarget> filter) {
this.filter = filter;
this.permissionsFilter = filter;
}
public CollectionDatasource<Permission, UUID> getPermissionDs() {