remove termDtocombo from formFactory

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index b90bdd46e03dfb02d660804226a81ebfe2e0d9dc..f93b560726bd9c67641a63c063d630a9e08dd24f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -146,7 +146,7 @@ import eu.etaxonomy.taxeditor.ui.combo.MisappliedRelationshipComboElement;
 import eu.etaxonomy.taxeditor.ui.combo.RelationshipTypeCombo;
 import eu.etaxonomy.taxeditor.ui.combo.TermCollectionComboElement;
 import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
-import eu.etaxonomy.taxeditor.ui.combo.term.TermDtoComboElement;
+//import eu.etaxonomy.taxeditor.ui.combo.term.TermDtoComboElement;
 import eu.etaxonomy.taxeditor.ui.dialog.CloneClassificationDetailElement;
 import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection.UnitType;
 import eu.etaxonomy.taxeditor.ui.mvc.element.DateElement;
@@ -1011,14 +1011,14 @@ public class CdmFormFactory extends FormToolkit {
             int style) {
         return  this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, true, style, false, null);
     }
-       public TermDtoComboElement createDefinedTermDtoComboElement(
-            List<TermDto> terms,
-            ICdmFormElement parentElement,
-            String labelString,
-            TermDto selection,
-            int style) {
-        return  this.createDefinedTermDtoComboElement(null, null, terms, parentElement, labelString, selection, false, style, false, null);
-    }
+//     public TermDtoComboElement createDefinedTermDtoComboElement(
+//            List<TermDto> terms,
+//            ICdmFormElement parentElement,
+//            String labelString,
+//            TermDto selection,
+//            int style) {
+//        return  this.createDefinedTermDtoComboElement(null, null, terms, parentElement, labelString, selection, false, style, false, null);
+//    }
 
        public <T extends DefinedTermBase<?>> TermComboElement<T> createDefinedTermComboElement(
                List<T> terms,
@@ -1041,16 +1041,16 @@ public class CdmFormFactory extends FormToolkit {
                return createDefinedTermComboElement(termType, null, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
        }
     
-    public TermDtoComboElement createDefinedTermDtoComboElement(
-            TermType termType,
-            ICdmFormElement parentElement,
-            String labelString,
-            TermDto selection,
-            boolean addEmptyElement,
-            int style,
-            boolean useAbbrevLabel) {
-        return createDefinedTermDtoComboElement(termType, null, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
-    }
+//    public TermDtoComboElement createDefinedTermDtoComboElement(
+//            TermType termType,
+//            ICdmFormElement parentElement,
+//            String labelString,
+//            TermDto selection,
+//            boolean addEmptyElement,
+//            int style,
+//            boolean useAbbrevLabel) {
+//        return createDefinedTermDtoComboElement(termType, null, null, parentElement, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
+//    }
 
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
             TermVocabulary<?> termVocabulary,
@@ -1111,45 +1111,45 @@ public class CdmFormFactory extends FormToolkit {
                return null;
            }
        }
-       private TermDtoComboElement createDefinedTermDtoComboElement(
-            TermType termType,
-            TermVocabulary<?> termVocabulary,
-            List<TermDto> terms,
-            ICdmFormElement parentElement,
-            String labelString,
-            TermDto selection,
-            boolean addEmptyElement,
-            int style,
-            boolean useAbbrevLabel,
-            Comparator<TermDto> comparator) {
-
-        if(termType!=null){
-            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
-            adapt(element);
-            parentElement.addElement(element);
-            return element;
-        }
-        else if(termVocabulary != null){
-            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
-//          if (comparator!= null){
-//              element.setTermComparator(comparator);
-//          }
-            adapt(element);
-            parentElement.addElement(element);
-            return element;
-        }else if (terms != null){
-
-            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, terms, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
-
-            adapt(element);
-            parentElement.addElement(element);
-            return element;
-        }
-        else {
-            //this should never happen
-            return null;
-        }
-    }
+//     private TermDtoComboElement createDefinedTermDtoComboElement(
+//            TermType termType,
+//            TermVocabulary<?> termVocabulary,
+//            List<TermDto> terms,
+//            ICdmFormElement parentElement,
+//            String labelString,
+//            TermDto selection,
+//            boolean addEmptyElement,
+//            int style,
+//            boolean useAbbrevLabel,
+//            Comparator<TermDto> comparator) {
+//
+//        if(termType!=null){
+//            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+//            adapt(element);
+//            parentElement.addElement(element);
+//            return element;
+//        }
+//        else if(termVocabulary != null){
+//            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+////          if (comparator!= null){
+////              element.setTermComparator(comparator);
+////          }
+//            adapt(element);
+//            parentElement.addElement(element);
+//            return element;
+//        }else if (terms != null){
+//
+//            TermDtoComboElement element = new TermDtoComboElement<>(this, parentElement, terms, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+//
+//            adapt(element);
+//            parentElement.addElement(element);
+//            return element;
+//        }
+//        else {
+//            //this should never happen
+//            return null;
+//        }
+//    }
 
           private <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
                    TermType termType,