Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-04-18 02:27:48 +02:00
commit 420ad9a3c8

View file

@ -53,6 +53,13 @@ public class Relation extends Entity {
return Collections.unmodifiableMap(members); return Collections.unmodifiableMap(members);
} }
public Map<EntityId, String> getModifiableMembersMap() {
if(members == null){
return Collections.emptyMap();
}
return members;
}
public Collection<EntityId> getMemberIds(String role) { public Collection<EntityId> getMemberIds(String role) {
if (members == null) { if (members == null) {
return Collections.emptyList(); return Collections.emptyList();