Revision 5239ef50
Added by Andreas Müller about 6 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java | ||
|---|---|---|
| 268 | 268 |
} |
| 269 | 269 |
} |
| 270 | 270 |
this.conversation.commit(true); |
| 271 |
for (LineAnnotation annotation : model.getDeletedAnnotations()) {
|
|
| 271 |
for (LineAnnotation<?> annotation : model.getDeletedAnnotations()) {
|
|
| 272 | 272 |
if (annotation.isMarkedAsNew()) {
|
| 273 | 273 |
continue; |
| 274 | 274 |
} |
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java | ||
|---|---|---|
| 78 | 78 |
return; |
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 |
TeamOrPersonBase teamOrPerson = null; |
|
| 81 |
TeamOrPersonBase<?> teamOrPerson = null;
|
|
| 82 | 82 |
Reference ref = null; |
| 83 | 83 |
if (mergeTarget instanceof TeamOrPersonBase){
|
| 84 | 84 |
teamOrPerson = HibernateProxyHelper.deproxy(mergeTarget, TeamOrPersonBase.class); |
| ... | ... | |
| 99 | 99 |
input.getModel().remove(item); |
| 100 | 100 |
} |
| 101 | 101 |
if (teamOrPerson != null){
|
| 102 |
TeamOrPersonBase teamOrPerson2 = HibernateProxyHelper.deproxy(item, TeamOrPersonBase.class); |
|
| 102 |
TeamOrPersonBase<?> teamOrPerson2 = HibernateProxyHelper.deproxy(item, TeamOrPersonBase.class);
|
|
| 103 | 103 |
|
| 104 | 104 |
if (!CdmStore.getCommonService().isMergeable(teamOrPerson, teamOrPerson2, null)){
|
| 105 | 105 |
MessageDialog.openWarning(shell, |
Also available in: Unified diff
cleanup