/ - Diff - EDIT - EDIT Project Management

     package eu.etaxonomy.taxeditor.bulkeditor.input;
     import java.util.ArrayList;
     import java.util.Comparator;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.List;
-...
     import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery;
     import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
     import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.CdmBaseSortProvider;
     import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.TitleCacheComparator;
     import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
     import eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput;
     import eu.etaxonomy.taxeditor.event.EventUtility;
-...
     	protected abstract T loadEntity(UUID entityUuid);
     	public Comparator<T> getTitleComparator(){
     	    return new TitleCacheComparator();
+    	}
     	public void setMergeTarget(T t){
     	    markedMergeTarget = t;
+    	}

     package eu.etaxonomy.taxeditor.bulkeditor.input;
     import java.util.Arrays;
     import java.util.Comparator;
     import java.util.List;
     import java.util.UUID;
-...
     import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;
     import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
     import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.GroupCreator;
     import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.GroupNameComparator;
     import eu.etaxonomy.taxeditor.store.CdmStore;
     /**
-...
     		return HibernateProxyHelper.deproxy(CdmStore.getService(IAgentService.class).load(entityUuid, propertyPaths), Group.class);
+    	}
     	@Override
     	public Comparator<Group> getTitleComparator(){
             return new GroupNameComparator();
+        }
+    }

     package eu.etaxonomy.taxeditor.bulkeditor.input;
     import java.util.Arrays;
     import java.util.Comparator;
     import java.util.List;
     import java.util.UUID;
-...
     import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;
     import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
     import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.UserCreator;
     import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.UserNameComparator;
     import eu.etaxonomy.taxeditor.store.CdmStore;
     /**
-...
     		return CdmStore.getService(IUserService.class).load(entityUuid, propertyPaths);
+    	}
     	@Override
     	public Comparator<User> getTitleComparator(){
             return new UserNameComparator();
+        }
+    }

     /**
     * Copyright (C) 2018 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
     import java.util.Comparator;
     import eu.etaxonomy.cdm.model.common.Group;
     /**
      * @author k.luther
      * @since 02.07.2018
+     *
      */
     public class GroupNameComparator implements Comparator<Group> {
         private boolean fIgnoreCase;
         /**
          * {@inheritDoc}
          */
         @Override
         public int compare(Group o1, Group o2) {
             String groupName0 = o1.getName();
             String groupName1 = o2.getName();
             if (groupName0 == null && groupName1 == null) {
                 return 0;
+            }
             if (groupName0 == null) {
                 return -1;
+            }
             if (groupName1 == null) {
                 return 1;
+            }
             int result =  fIgnoreCase ? groupName0.compareToIgnoreCase(groupName1) :
                 groupName0.compareTo(groupName1);
             if (result == 0){
                 result = o1.getUuid().compareTo(o2.getUuid());
+            }
             return result;
+        }
+    }

     /**
     * Copyright (C) 2018 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
     import java.util.Comparator;
     import eu.etaxonomy.cdm.model.common.User;
     /**
      * @author k.luther
      * @since 02.07.2018
+     *
      */
     public class UserNameComparator implements Comparator<User> {
         private boolean fIgnoreCase;
         /**
          * {@inheritDoc}
          */
         @Override
         public int compare(User user0, User user1) {
             String userName0 = user0.getUsername();
             String userName1 = user1.getUsername();
             if (userName0 == null && userName1 == null) {
                 return 0;
+            }
             if (userName0 == null) {
                 return -1;
+            }
             if (userName1 == null) {
                 return 1;
+            }
             int result =  fIgnoreCase ? userName0.compareToIgnoreCase(userName1) :
                 userName0.compareTo(userName1);
             if (result == 0){
                 result = user0.getUuid().compareTo(user1.getUuid());
+            }
             return result;
+        }
+    }

EDIT