cdmAuthority.getOperation().remove(CRUD.CREATE);
}
if(viewer != null) {
- viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
+ grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
parent.setDirty(true);
}
cdmAuthority.getOperation().remove(CRUD.READ);
}
if(viewer != null) {
- viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
+ grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
parent.setDirty(true);
}
cdmAuthority.getOperation().remove(CRUD.DELETE);
}
if(viewer != null) {
- viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
+ grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
parent.setDirty(true);
}
cdmAuthority.getOperation().remove(CRUD.UPDATE);
}
if(viewer != null) {
- viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
+ grantedAuthorityI = viewer.updateGrantedAuthority(grantedAuthorityI, cdmAuthority);
parent.setDirty(true);
}
* @param grantedAuthorityI to update.
* @param cdmAuthority to use in updating the granted authority object.
*/
- public void updateGrantedAuthority(GrantedAuthorityImpl grantedAuthorityI, CdmAuthority cdmAuthority) {
+ public GrantedAuthorityImpl updateGrantedAuthority(GrantedAuthorityImpl grantedAuthorityI, CdmAuthority cdmAuthority) {
if(grantedAuthorityI.getAuthority().equals(cdmAuthority.getAuthority())) {
} else {
// we can't really 'update' the granted authority.
// so we first add the new authority (hope no exception) is thrown
// and then remove the old one.
- group.addGrantedAuthority(cdmAuthority.asNewGrantedAuthority());
+ GrantedAuthorityImpl gai = cdmAuthority.asNewGrantedAuthority();
+ group.addGrantedAuthority(gai);
group.removeGrantedAuthority(grantedAuthorityI);
- dirtyMarkerEditor.changed(grantedAuthorityI);
+ dirtyMarkerEditor.changed(grantedAuthorityI);
+ return gai;
} catch(Exception e) {
// Not a CDM Authority
//e.printStackTrace();
}
- }
+ }
+ return grantedAuthorityI;
}
/**