cleanup

[taxeditor.git] / eu.etaxonomy.taxeditor.bulkeditor / src / main / java / eu / etaxonomy / taxeditor / bulkeditor / e4 / handler / MergeGroupHandlerE4.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java
index a5b9b5161efd9439f8d8a04ef36e33cc1ee0c554..ec655a611d47aa5377f3ae0af9d8d806a04edf10 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java
@@ -78,7 +78,7 @@ public class MergeGroupHandlerE4 {
             return;
         }
 
-        TeamOrPersonBase teamOrPerson = null;
+        TeamOrPersonBase<?> teamOrPerson = null;
         Reference ref = null;
         if (mergeTarget instanceof TeamOrPersonBase){
             teamOrPerson = HibernateProxyHelper.deproxy(mergeTarget, TeamOrPersonBase.class);
@@ -99,7 +99,7 @@ public class MergeGroupHandlerE4 {
                     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,