return;
}
- TeamOrPersonBase teamOrPerson = null;
+ TeamOrPersonBase<?> teamOrPerson = null;
Reference ref = null;
if (mergeTarget instanceof TeamOrPersonBase){
teamOrPerson = HibernateProxyHelper.deproxy(mergeTarget, TeamOrPersonBase.class);
input.getModel().remove(item);
}
if (teamOrPerson != null){
- TeamOrPersonBase teamOrPerson2 = HibernateProxyHelper.deproxy(item, TeamOrPersonBase.class);
+ TeamOrPersonBase<?> teamOrPerson2 = HibernateProxyHelper.deproxy(item, TeamOrPersonBase.class);
if (!CdmStore.getCommonService().isMergeable(teamOrPerson, teamOrPerson2, null)){
MessageDialog.openWarning(shell,