/ - Diff - EDIT - EDIT Project Management

     import java.util.HashMap;
     import java.util.Map;
     import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import eu.etaxonomy.cdm.model.agent.Person;
     import eu.etaxonomy.cdm.model.agent.Team;
-...
     import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
     /**
      * <p>TeamOrPersonCreator class.</p>
+     *
      * @author p.ciardelli
      * @created 18.09.2009
      */
     public class AgentCreator implements IEntityCreator<TeamOrPersonBase> {
         private static final Logger logger = LogManager.getLogger(AgentCreator.class);
         private static final Logger logger = LogManager.getLogger();
     	@Override
         public TeamOrPersonBase createEntity(String text) {
-...
     		return teamOrPerson;
+    	}
     	/**
     	 * <p>getKeyLabelPairs</p>
+    	 *
     	 * @return a {@link java.util.Map} object.
     	 */
     	@Override
         public Map<Object, String> getKeyLabelPairs() {
     		Map<Object, String> result = new HashMap<>();

     * 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.entitycreator;
     import java.util.Comparator;
-...
     import eu.etaxonomy.taxeditor.store.CdmStore;
     /**
      * <p>NameCreator class.</p>
+     *
      * @author p.ciardelli
      * @created 07.07.2009
      */
-...
     		return ParseHandler.parseName(text, (Rank) key);
+    	}
     	/**
     	 * <p>getKeyLabelPairs</p>
+    	 *
     	 * @return a {@link java.util.Map} object.
     	 */
     	 @Override
         public Map<Rank, String> getKeyLabelPairs() {
     		Map<Rank, String> result = new TreeMap<Rank, String>(
-...
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }
+    }

      */
     public class RemoteInvocationTermCacher implements IRemoteInvocationTermCacher {
         private static final Logger logger = LogManager.getLogger(RemoteInvocationTermCacher.class);
         private static final Logger logger = LogManager.getLogger();
     	private static Map<TermType, RemoteInvocationResult> termTypeMap = new HashMap<>();

     import java.util.Map;
     import java.util.UUID;
     import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import eu.etaxonomy.cdm.api.application.ICdmRepository;
     import eu.etaxonomy.cdm.api.service.ITermService;
-...
         private static CdmPreferenceCache instance;
         private final static Logger logger = LogManager.getLogger(CdmPreferenceCache.class);
         private final static Logger logger = LogManager.getLogger();
         public static CdmPreferenceCache instance(){
             if(instance == null){

        public <T extends DefinedTermBase> List<T> getPreferredTerms(TermVocabulary<T> termVocabulary,
                Comparator comp){
            if (comp == null){
                comp = new DefaultTermComparator<T>();
                comp = new DefaultTermComparator<>();
+           }
            @SuppressWarnings("unchecked")
         List<T> terms = cachedTermMap.get(termVocabulary.getUuid());
            List<T> terms = cachedTermMap.get(termVocabulary.getUuid());
            List<T> termBaseList = new ArrayList<>();
            if(terms==null){
                termBaseList = getFilteredTerms(new ArrayList<T>(TermStore.getTerms(termVocabulary, comp)));
                termBaseList = getFilteredTerms(new ArrayList<>(TermStore.getTerms(termVocabulary, comp)));
                cachedTermMap.put(termVocabulary.getUuid(), termBaseList);
            }else{
                Iterator<?> iterator = terms.iterator();

     /**
      * @author n.hoffmann
      * @created Nov 5, 2009
      * @param <T>
      */
     public class TermComboElement<T extends DefinedTermBase>
     		extends AbstractComboElement<T> {
-...
     	private ArrayList<T> terms;
     	public ArrayList<T> getTerms() {
     	public List<T> getTerms() {
             return terms;
+        }
-...
     	private TermComboElement(CdmFormFactory formFactory,
     	        ICdmFormElement parentElement, Class<T> termClass, TermType termType, TermVocabulary<?> termVocabulary, List<T> terms,String labelString, T selection, boolean addEmptyElement,
     	        int style, boolean useAbbrevLabel, Comparator<T> comparator) {
             super(formFactory, parentElement);
     	    super(formFactory, parentElement);
             this.termVocabulary = termVocabulary;
             this.termClass = termClass;

EDIT