fix #8162 adapt terms to new package structure in TaxEditor

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / combo / EnumComboElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index 6553cc99dd5ce05a2805b52caab7038984cbb7e3..db58614b5990c247ea37c31714578e71d7780804 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -20,8 +20,9 @@ import java.util.Map.Entry;
 
 import org.eclipse.swt.events.SelectionEvent;
 
-import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.cdm.model.media.ExternalLinkType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
@@ -33,7 +34,6 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 /**
  * @author n.hoffmann
  * @created Mar 16, 2010
- * @version 1.0
  */
 public class EnumComboElement<T extends IEnumTerm<T>> extends
                AbstractComboElement<T>  {
@@ -44,7 +44,7 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
        }
 
 
-       private static CdmEnumDataHolder[] cdmEnumDataHolders = {
+        private  static  CdmEnumDataHolder[] cdmEnumDataHolders = {
                new CdmEnumDataHolder<NomenclaturalCode>(){
 
                        @Override
@@ -54,7 +54,10 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
 
                        @Override
                        public Collection<NomenclaturalCode> getElements() {
-                               return  Arrays.asList(NomenclaturalCode.values());
+                               Collection<NomenclaturalCode> result = new ArrayList<>(Arrays.asList(NomenclaturalCode.values()));
+               result.remove(NomenclaturalCode.ICVCN);
+                return  result;
+
                        }
 
                        @Override
@@ -99,6 +102,24 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
                        }
 
                },
+               new CdmEnumDataHolder<ExternalLinkType>(){
+
+            @Override
+            public String getName() {
+                return "Type";
+            }
+
+            @Override
+            public Collection<ExternalLinkType> getElements() {
+                return Arrays.asList(ExternalLinkType.values());
+            }
+
+            @Override
+            public Class<ExternalLinkType> getClazz() {
+                return ExternalLinkType.class;
+            }
+
+        },
                new CdmEnumDataHolder<OriginalSourceType>(){
 
                        @Override
@@ -120,7 +141,7 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
 
        };
 
-       protected List<T> elementTypeList = new ArrayList<T>();
+       protected List<T> elementTypeList = new ArrayList<>();
 
        private final Class<T> enumType;
 
@@ -135,6 +156,8 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
                combo.addSelectionListener(this);
        }
 
+
+
        private String getDefaultLabelString() {
                if(enumType.equals(ReferenceType.class)){
                        return "Reference Type";
@@ -145,6 +168,9 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
                } else if(enumType.equals(SpecimenOrObservationType.class)) {
                        return "Spec./Obs. Type";
                }
+               else if(enumType.equals(ExternalLinkType.class)) {
+            return "Type";
+        }
                return "No Label";
        }