- set CdmFormFactory.createTermComboElement() to deprecated
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 10 Jun 2014 11:56:25 +0000 (11:56 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 10 Jun 2014 11:56:25 +0000 (11:56 +0000)
 - replaced (almost) all uses of the method with CdmFormFactory.createDefinedTermComboElement which works with TermType instead of classes

35 files changed:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SynonymRelationshipWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java

index 87cef5ce00052153a4c57c35a9d4313d09e76fc0..4f891a05649d064e1500d83c97a5a6170179b5b0 100644 (file)
@@ -41,6 +41,7 @@ import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
@@ -846,8 +847,16 @@ public class TransientTermService implements ITermService {
        @Override
        public List<String> isDeletable(DefinedTermBase object,
                        DeleteConfiguratorBase config) {
-               // TODO Auto-generated method stub
-               return null;
+               return defaultTermService.isDeletable(object, config);
        }
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
+     */
+    @Override
+    public List<DefinedTermBase<?>> listByTermType(TermType termType, Integer limit, Integer start,
+            List<OrderHint> orderHints, List<String> propertyPaths) {
+        return defaultTermService.listByTermType(termType, limit, start, orderHints, propertyPaths);
+    }
+
 }
index 255d22a5b54d69c295ad0ede3f3464457cb531fd..c890f1c6b825b911a2cbb7bb6c499e2c58047c2b 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -22,6 +22,7 @@ import org.eclipse.ui.IMemento;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 
 /**
@@ -30,29 +31,38 @@ import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
  * @version 1.0
  */
 public class TermManager extends ContextListenerAdapter{
-       
+
        private static final String TERMS = "terms";
        private static final String TERM = "term";
        private static final String HIDE = "hide";
-       
+
        private static final String CLASS = "class";
        private static final String UUID_STRING = "uuid";
-       
-       private Map<String, Collection<UUID>> hiddenTermsMap = new HashMap<String, Collection<UUID>>();
-       
+
+       private final Map<String, Collection<UUID>> hiddenTermsMap = new HashMap<String, Collection<UUID>>();
+
        public TermManager(){
                CdmStore.getContextManager().addContextListener(this);
        }
-       
+
        /**
-        * 
+        *
+        * @param clazz
+        * @return
+        */
+       public List<DefinedTermBase<?>> getPreferredTerms(TermType termType){
+           return getFilteredTerms(TermStore.getTerms(termType, null));
+       }
+
+       /**
+        *
         * @param clazz
         * @return
         */
        public <T extends DefinedTermBase> List<T> getPreferredTerms(Class<T> clazz){
                return getFilteredTerms(TermStore.getTerms(clazz));
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.ContextListenerAdapter#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
         */
@@ -62,13 +72,13 @@ public class TermManager extends ContextListenerAdapter{
                if(memento == null){
                        return;
                }
-               
+
                IMemento terms = memento.getChild(TERMS);
 
                if(terms == null){
                        return;
                }
-               
+
                for(IMemento term : terms.getChildren(TERM)){
                        String typeName = term.getString(CLASS);
                        Collection<UUID> hiddenTermUuids = new ArrayList<UUID>();
@@ -80,7 +90,7 @@ public class TermManager extends ContextListenerAdapter{
                        hiddenTermsMap.put(typeName, hiddenTermUuids);
                }
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.ContextListenerAdapter#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
         */
@@ -88,7 +98,7 @@ public class TermManager extends ContextListenerAdapter{
        public void contextStop(IMemento memento, IProgressMonitor monitor) {
                saveTerms(memento, monitor);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.ContextListenerAdapter#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
         */
@@ -96,10 +106,12 @@ public class TermManager extends ContextListenerAdapter{
        public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
                saveTerms(memento, monitor);
        }
-       
+
        private void saveTerms(IMemento memento, IProgressMonitor monitor){
-               if(memento == null) return;
-               
+               if(memento == null) {
+            return;
+        }
+
                IMemento terms = memento.createChild(TERMS);
                for (String preferredTerm : hiddenTermsMap.keySet()){
                        IMemento term = terms.createChild(TERM);
@@ -110,7 +122,7 @@ public class TermManager extends ContextListenerAdapter{
                        }
                }
        }
-       
+
        /**
         * Generic method to get term preferences for a term vocabulary
         *
@@ -120,27 +132,30 @@ public class TermManager extends ContextListenerAdapter{
        public <T extends DefinedTermBase> List<T> getFilteredTerms(List<T> initialTerms){
 
                List<T> filteredTerms = new ArrayList<T>();
-               
+
                String typeName = getTermClass(initialTerms);
                Collection<UUID> hiddenTermUuids = hiddenTermsMap.get(typeName);
-               
+
                if(hiddenTermUuids == null){
                        return initialTerms;
                }
-               
-               for (T term : initialTerms){                    
+
+               for (T term : initialTerms){
                        if(! hiddenTermUuids.contains(term.getUuid())){
                                filteredTerms.add(term);
                        }
                }
-               
-               return filteredTerms;           
+
+               return filteredTerms;
        }
-       
+
        private <T extends DefinedTermBase> String getTermClass(Collection<T> initialTerms){
-               return initialTerms.iterator().next().getClass().getName();
+           if(!initialTerms.isEmpty()){
+               return initialTerms.iterator().next().getClass().getName();
+           }
+           return null;
        }
-       
+
 //     /**
 //      * <p>getPreferredSpecimenTypeDesignationStatus</p>
 //      *
@@ -154,49 +169,49 @@ public class TermManager extends ContextListenerAdapter{
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<NameTypeDesignationStatus> getPreferredNameTypeDesignationStatus() { return getFilteredTerms(TermStore.getNameTypeDesignationStatus()); }
-//     
+//
 //     /**
 //      * <p>getPreferredTaxonRelationshipTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<TaxonRelationshipType> getPreferredTaxonRelationshipTypes() { return getFilteredTerms(TermStore.getTaxonRelationshipTypes());}
-//     
+//
 //     private static List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
 //                     TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN(),
 //                     TaxonRelationshipType.MISAPPLIED_NAME_FOR(),
 //                     TaxonRelationshipType.ALL_RELATIONSHIPS()
 //     });
-//     
+//
 //     /**
 //      * Please note that the {@link TaxonRelationshipType}s TAXONOMICALLY_INCLUDED_IN, MISAPPLIED_NAME_FOR and ALL_RELATIONSHIPS
 //      * are filtered out as they are most likely not needed. If you do need them please refactor this method to your needs.
-//      * 
+//      *
 //      * @return a list of {@link TaxonRelationshipTypeInverseContainer} elements
 //      */
 //     public List<TaxonRelationshipTypeInverseContainer> getPreferredRelationshipTypesWithInverses(){
 //             List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
-//             
+//
 //             List<TaxonRelationshipType> relationshipTypes = getPreferredTaxonRelationshipTypes();
-//             
+//
 //             relationshipTypes.removeAll(excludeTaxonRelationshipTypes);
-//             
+//
 //             for (TaxonRelationshipType relationshipType : relationshipTypes){
 //                     if(!relationshipType.isSymmetric()){
 //                             TaxonRelationshipTypeInverseContainer inverseContainer = new TaxonRelationshipTypeInverseContainer(relationshipType, true);
 //                             relationshipTypeInverseContainers.add(inverseContainer);
-//                     }                       
+//                     }
 //                     TaxonRelationshipTypeInverseContainer container = new TaxonRelationshipTypeInverseContainer(relationshipType, false);
-//                     relationshipTypeInverseContainers.add(container);                       
-//             }               
-//             
+//                     relationshipTypeInverseContainers.add(container);
+//             }
+//
 //             return relationshipTypeInverseContainers;
 //     }
-       
 
-       
-       
-//     
+
+
+
+//
 //     /**
 //      * <p>getPreferredFeatures</p>
 //      *
@@ -210,76 +225,76 @@ public class TermManager extends ContextListenerAdapter{
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<Rank> getPreferredRanks() { return getFilteredTerms(TermStore.getRanks());}
-//     
+//
 //     /**
 //      * <p>getPreferredPresenceAbsenceTerms</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<PresenceAbsenceTermBase> getPreferredPresenceAbsenceTerms(){ return getFilteredTerms(TermStore.getPresenceAbsenceTerms());}
-//     
+//
 //     /**
 //      * <p>getPreferredNomenclaturalStatusTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<NomenclaturalStatusType> getPreferredNomenclaturalStatusTypes(){    return getFilteredTerms(TermStore.getNomenclaturalStatusTypes());}
-//     
+//
 //     /**
 //      * <p>getPreferredNameRelationshipTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<NameRelationshipType> getPreferredNameRelationshipTypes(){ return getFilteredTerms(TermStore.getNameRelationshipTypes());}
-//     
+//
 //     /**
 //      * <p>getPreferredLanguages</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<Language> getPreferredLanguages() { return getFilteredTerms(TermStore.getLanguages()); }
-//     
+//
 //     /**
 //      * <p>getPreferredMarkerTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<MarkerType> getPreferredMarkerTypes() { return getFilteredTerms(TermStore.getNonTechnicalMarkerTypes()); }
-//     
+//
 //     /**
 //      * <p>getPreferredExtensionTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<ExtensionType> getPreferredExtensionTypes() { return getFilteredTerms(TermStore.getExtensionTypes()); }
-//     
+//
 //     /**
 //      * <p>getPreferredRightsTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<RightsType> getPreferredRightsTypes() {     return getFilteredTerms(TermStore.getRightsTypes());}
-//     
+//
 //     /**
 //      * <p>getPreferredNamedAreaTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
-//     public List<NamedAreaType> getPreferredNamedAreaTypes() { return getFilteredTerms(TermStore.getNamedAreaTypes()); } 
-//     
+//     public List<NamedAreaType> getPreferredNamedAreaTypes() { return getFilteredTerms(TermStore.getNamedAreaTypes()); }
+//
 //     /**
 //      * <p>getPreferredNamedAreaTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
-//     public List<NamedAreaLevel> getPreferredNamedAreaLevels() { return getFilteredTerms(TermStore.getNamedAreaLevels()); } 
-//     
+//     public List<NamedAreaLevel> getPreferredNamedAreaLevels() { return getFilteredTerms(TermStore.getNamedAreaLevels()); }
+//
 //     /**
 //      * <p>getPreferredAnnotationTypes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
-//     public List<AnnotationType> getPreferredAnnotationTypes() { return getFilteredTerms(TermStore.getAnnotationTypes()); } 
+//     public List<AnnotationType> getPreferredAnnotationTypes() { return getFilteredTerms(TermStore.getAnnotationTypes()); }
 //
 //     /**
 //      * <p>getPreferredStages</p>
@@ -287,56 +302,56 @@ public class TermManager extends ContextListenerAdapter{
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<Stage> getPreferredStages() { return getFilteredTerms(TermStore.getStages()); }
-//     
+//
 //     /**
 //      * <p>getPreferredPreservationMethods</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<PreservationMethod> getPreferredPreservationMethods() { return getFilteredTerms(TermStore.getPreservationMethods()); }
-//     
+//
 //     /**
 //      * <p>getPreferredMeasurementUnits</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<MeasurementUnit> getPreferredMeasurementUnits() { return getFilteredTerms(TermStore.getMeasurementUnits()); }
-//     
+//
 //     /**
 //      * <p>getPreferredStates</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<State> getPreferredStates() { return getFilteredTerms(TermStore.getStates()); }
-//     
+//
 //     /**
 //      * <p>getPreferredModifiers</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<Modifier> getPreferredModifiers() { return getFilteredTerms(TermStore.getModifiers()); }
-//     
+//
 //     /**
 //      * <p>getPreferredStatisticalMeasures</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<StatisticalMeasure> getPreferredStatisticalMeasures() { return getFilteredTerms(TermStore.getStatisticalMeasures()); }
-//     
+//
 //     /**
 //      * <p>getPreferredScopes</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<Scope> getPreferredScopes() { return getFilteredTerms(TermStore.getScopes()); }
-//     
+//
 //     /**
 //      * <p>getPreferredDeterminationModifiers</p>
 //      *
 //      * @return a {@link java.util.List} object.
 //      */
 //     public List<DeterminationModifier> getPreferredDeterminationModifiers() { return getFilteredTerms(TermStore.getDeterminationModifiers()); }
-//     
+//
        /**
         * Generic method to set term preferences
         *
@@ -346,15 +361,15 @@ public class TermManager extends ContextListenerAdapter{
         */
        public <T extends DefinedTermBase> void setPreferredTerms(Collection<T> preferredTerms, Collection<T> initialTerms){
                String typeName = getTermClass(initialTerms);
-               
+
                Collection<UUID> undesiredTermUuids = new ArrayList<UUID>();
-               
+
                for(TermBase term : initialTerms){
                        if(! preferredTerms.contains(term)){
                                undesiredTermUuids.add(term.getUuid());
                        }
                }
-               
+
                hiddenTermsMap.put(typeName, undesiredTermUuids);
        }
 }
index 59c34cda11075d7dc06118250cf7c8902976c3a1..3db2afee30791caa4bcc6a7f23c1b70ab0a6c410 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.AbsenceTerm;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
@@ -42,22 +43,33 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  * @version 1.0
  */
 public class TermStore {
-       
+
        /**
-        * Returns an alphabetically sorted list of terms (anything that extends {@link DefinedTermBase}) of the given type currently available in the system. 
-        * 
+        * Returns an alphabetically sorted list of terms (anything that extends {@link DefinedTermBase}) of the given type currently available in the system.
+        *
         * @param clazz a class that inherits from {@link DefinedTermBase}
         * @return an alphabetically sorted list of terms
         */
        public static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz){
                return getTerms(clazz, null, true);
        }
-       
+
+       /**
+        * Returns an alphabetically sorted list of terms (anything that extends {@link DefinedTermBase}) of the given {@link TermType})
+        * currently available in the system.
+        *
+        * @param termType the term type
+        * @return an alphabetically sorted list of terms
+        */
+       public static List<DefinedTermBase<?>> getTerms(TermType termType, Comparator<DefinedTermBase<?>> comparator){
+        return getTermsFromService(termType, comparator);
+       }
+
        /**
-        * Returns a list of terms of the given type currently available in the system. 
+        * Returns a list of terms of the given type currently available in the system.
         * If <code>filtered</code> is set to <code>true</code>, all terms for certain types will be
         * gathered from edge cases.
-        * 
+        *
         * @param clazz a class that inherits from {@link DefinedTermBase}
         * @param comparator a {@link Comparator} that defines the sorting algorithm. If set to null, {@link DefaultTermComparator} will be used
         * @param filtered if set to true, some terms are filtered from the result (according to definition in {@link ITermStoreEdgeCase}s)
@@ -72,13 +84,29 @@ public class TermStore {
                }else{
                        terms = getTermsFromService(clazz, comparator);
                }
-               
+
                return terms;
-               
+
        }
-       
+
+       /**
+        *
+        * @param termClass
+        * @param comparator
+        * @return
+        */
+       private static List<DefinedTermBase<?>> getTermsFromService(TermType termType, Comparator<DefinedTermBase<?>> comparator){
+           if (comparator == null){
+               comparator = new DefaultTermComparator<DefinedTermBase<?>>();
+           }
+
+           List<DefinedTermBase<?>> terms = CdmStore.getService(ITermService.class).listByTermType(termType, null, null, null, null);
+           Collections.sort(terms, comparator);
+           return terms;
+       }
+
        /**
-        * 
+        *
         * @param termClass
         * @param comparator
         * @return
@@ -87,29 +115,29 @@ public class TermStore {
                if (comparator == null){
                        comparator = new DefaultTermComparator<T>();
                }
-               
+
                List<T> terms = CdmStore.getService(ITermService.class).list(termClass, null, null, null, null);
                Collections.sort(terms, comparator);
                return terms;
        }
-       
+
        /**
         * @param term a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void saveTerm(DefinedTermBase term){
                CdmStore.getService(ITermService.class).saveOrUpdate(term);
        }
-       
+
        /**
         * <p>delete</p>
         *
         * @param selected a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
-        * @throws ReferencedObjectUndeletableException 
+        * @throws ReferencedObjectUndeletableException
         */
        public static void delete(DefinedTermBase selected) throws ReferencedObjectUndeletableException {
                CdmStore.getService(ITermService.class).delete(selected);
        }
-       
+
        /**
         * Save a vacabulary to data store
         *
@@ -122,9 +150,9 @@ public class TermStore {
        /**
         * Handingling of special cases
         */
-       
+
        private static Set<ITermStoreEdgeCase<? extends DefinedTermBase>> termStoreEdgeCases = new HashSet<ITermStoreEdgeCase<? extends DefinedTermBase>>();
-       
+
        static {
                termStoreEdgeCases.add(new ITermStoreEdgeCase<Feature>() {
 
@@ -152,16 +180,16 @@ public class TermStore {
                                // filter out non technical markers
                                List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<MarkerType>();
                                List<MarkerType> markerTypes = TermStore.getTermsFromService(MarkerType.class, null);
-                               
+
                                for (Object type : markerTypes) {
                                        if (((MarkerType) type).isTechnical() == false) {
                                                nonTechnicalMarkerTypes.add((MarkerType) type);
                                        }
                                }
-                               
+
                                return nonTechnicalMarkerTypes;
                        }
-                       
+
                });
                termStoreEdgeCases.add(new ITermStoreEdgeCase<Rank>() {
 
@@ -174,18 +202,18 @@ public class TermStore {
                        public List<Rank> getTerms() {
                                if(PreferencesUtil.getSortRanksHierarchichally()){
                                        return TermStore.getTermsFromService(Rank.class, new Comparator<Rank>(){
-                       
+
                                                @Override
                                                public int compare(Rank o1, Rank o2) {
                                                        return o1.compareTo(o2);
                                                }
-                                               
+
                                        });
                                }else{
                                        return TermStore.getTermsFromService(Rank.class, null);
                                }
                        }
-                       
+
                });
                termStoreEdgeCases.add(new ITermStoreEdgeCase<PresenceAbsenceTermBase>() {
 
@@ -214,45 +242,45 @@ public class TermStore {
                                List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
                                        TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN(),
                                        TaxonRelationshipType.MISAPPLIED_NAME_FOR(),
-                                       TaxonRelationshipType.ALL_RELATIONSHIPS()       
+                                       TaxonRelationshipType.ALL_RELATIONSHIPS()
                                });
-                               
+
                                List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
-                               
+
                                List<TaxonRelationshipType> relationshipTypes = TermStore.getTerms(TaxonRelationshipType.class);
-                               
+
                                relationshipTypes.removeAll(excludeTaxonRelationshipTypes);
-                               
+
                                for (TaxonRelationshipType relationshipType : relationshipTypes){
                                        if(!relationshipType.isSymmetric()){
                                                TaxonRelationshipTypeInverseContainer inverseContainer = new TaxonRelationshipTypeInverseContainer(relationshipType, true);
                                                relationshipTypeInverseContainers.add(inverseContainer);
-                                       }                       
+                                       }
                                        TaxonRelationshipTypeInverseContainer container = new TaxonRelationshipTypeInverseContainer(relationshipType, false);
-                                       relationshipTypeInverseContainers.add(container);                       
-                               }               
-                               
+                                       relationshipTypeInverseContainers.add(container);
+                               }
+
                                return relationshipTypeInverseContainers;
                        }
                });
        }
-       
+
        private static <T extends DefinedTermBase> ITermStoreEdgeCase<T> getEdgeCase(Class<T> termClass) {
-               
+
                for (ITermStoreEdgeCase termStoreEdgeCase : termStoreEdgeCases){
                        if (termStoreEdgeCase.getTermClass().equals(termClass)){
                                return termStoreEdgeCase;
                        }
                }
-               
+
                return null;
        }
-       
+
        private interface ITermStoreEdgeCase<TERM> {
 
                public abstract Class<TERM> getTermClass();
-               
+
                public abstract List<TERM> getTerms();
-               
+
        }
 }
index 61273d5009b84b075ba4f400533ddfe2b9f5a8b9..5e493dc4b5ec94ca5c14c1da779a34e03bfa1d98 100644 (file)
@@ -107,7 +107,8 @@ public class TermComboElement<T extends DefinedTermBase>
                combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
                combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
 
-               populateTerms(filterDefinedTermByTermType(getPreferredTerms(), termType));
+               //TODO try to remove generic T and avoid classes to be used
+               populateTerms((List<T>) getTermManager().getPreferredTerms(termType));
 
                combo.addSelectionListener(this);
                combo.addDisposeListener(this);
@@ -463,13 +464,4 @@ public class TermComboElement<T extends DefinedTermBase>
                populateTerms(customPreferredTerms);
        }
 
-       private List<T> filterDefinedTermByTermType(List<T> terms, TermType termType) {
-               List<T> definedTerms = new ArrayList<T>();
-               for(T term : terms){
-                       if(term.getTermType().equals(termType)) {
-                               definedTerms.add(term);
-                       }
-               }
-               return definedTerms;
-       }
 }
index a2c1d0718db2933f0e65c39806578e3495ef50c4..c629f35828f32535c0ec29f1ee5b3ee9ff42c60a 100644 (file)
@@ -834,6 +834,7 @@ public class CdmFormFactory extends FormToolkit {
      * createTermComboElement
      * </p>
      *
+     * @deprecated Use {@link #createDefinedTermComboElement(TermType, ICdmFormElement, String, DefinedTermBase, int)} instead
      * @param termComboType
      *            a
      *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType}
@@ -851,7 +852,7 @@ public class CdmFormFactory extends FormToolkit {
      * @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement}
      *         object.
      */
-
+    @Deprecated
     public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
             ICdmFormElement parentElement, String labelString, T selection, int style) {
         TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString,
index b7ab20c35476cd8b3a141456596b19a3df32c544..d315fccf9419887f452f2f0451b03afb7ebdb1c8 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Button;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.model.DefaultTermComparator;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -39,7 +40,7 @@ import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
  * <p>
  * MultilanguageTextElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Sep 29, 2010
  * @version 1.0
@@ -48,14 +49,14 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                SelectionListener {
 
        private class OpenTranslationWizard extends SelectionAdapter {
-               
+
                public OpenTranslationWizard() {
                        super();
                }
 
                /*
                 * (non-Javadoc)
-                * 
+                *
                 * @see
                 * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
                 * .swt.events.SelectionEvent)
@@ -63,11 +64,11 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                @Override
                public void widgetSelected(SelectionEvent e) {
                        Map<Language, LanguageString> multilanguageText = getMultilanguageText();
-                       
+
                        if (multilanguageText == null){
                                StoreUtil.warningDialog("No text to transalte", getClass(), "The text is empty and therefore can not be translated");
                        }
-                       
+
                        TranslationWizard wizard = new TranslationWizard(multilanguageText);
                        WizardDialog dialog = new WizardDialog(getLayoutComposite()
                                        .getShell(), wizard);
@@ -92,7 +93,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
         * <p>
         * Constructor for MultilanguageTextElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -130,8 +131,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
        private void createMultilanguageTextEditingElements(
                        ICdmFormElement formElement,
                        Map<Language, LanguageString> multilanguageText, int style) {
-               combo_language = formFactory
-                               .createTermComboElement(Language.class, formElement,
+               combo_language = formFactory.createDefinedTermComboElement(TermType.Language, formElement,
                                                "", null, style);
                combo_language.addSelectionListener(this);
                addControl(formFactory.createLabel(getLayoutComposite(), ""));
@@ -154,7 +154,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
         * .events.SelectionEvent)
@@ -173,7 +173,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse
         * .swt.events.SelectionEvent)
@@ -187,7 +187,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
         * <p>
         * Setter for the field <code>multilanguageText</code>.
         * </p>
-        * 
+        *
         * @param multilanguageText
         *            the multilanguageText to set
         */
@@ -211,7 +211,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
        }
 
        /**
-        * 
+        *
         */
        private void updateControls() {
                LanguageString preferredLanguageString = MultilanguageTextHelper
@@ -223,14 +223,14 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        combo_language.setSelection(preferredLanguageString.getLanguage());
                        button.setEnabled(true);
-               }               
+               }
        }
 
        /**
         * <p>
         * Getter for the field <code>multilanguageText</code>.
         * </p>
-        * 
+        *
         * @return the multilanguageText
         */
        public Map<Language, LanguageString> getMultilanguageText() {
@@ -239,7 +239,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org
         * .eclipse.jface.util.PropertyChangeEvent)
index 109cbafb565227f4b9ed23a992d9242958dde86b..5ad3ae4ec606b017e8c9411aa79ece1672304b0b 100644 (file)
@@ -14,6 +14,7 @@ import java.text.ParseException;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.location.ReferenceSystem;
 import eu.etaxonomy.taxeditor.preference.Resources;
@@ -76,8 +77,7 @@ public class PointElement extends AbstractCdmFormElement implements
                text_longitudeParsed.setEnabled(false);
                number_errorRadius = formFactory.createNumberTextWithLabelElement(
                                formElement, "Error Radius (m)", null, style);
-               combo_referenceSystem = formFactory
-                               .createTermComboElement(ReferenceSystem.class,
+               combo_referenceSystem = formFactory.createDefinedTermComboElement(TermType.ReferenceSystem,
                                                formElement, "Reference System", null, style);
 
                setPoint(point);
index 5211cfd0e2abc55d4f465c3486038465d63a1901..6aaa67b9a9cef02bd952680ee08912769edd0bfc 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -27,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * @version 1.0
  */
 public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm> {
-       
+
        private TermComboElement<DefinedTerm> combo_modifier;
 
        /**
@@ -44,7 +45,7 @@ public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm
                        SelectionListener removeListener, int style) {
                super(formFactory, section, entity, removeListener, null, style);
        }
-       
+
        /** {@inheritDoc} */
        @Override
        public void setEntity(DefinedTerm entity) {
@@ -55,12 +56,12 @@ public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_modifier = formFactory.createTermComboElement(DefinedTerm.class, element, "Modifier", getEntity(), style);
+               combo_modifier = formFactory.createDefinedTermComboElement(TermType.Modifier, element, "Modifier", getEntity(), style);
        }
 
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               
+
        }
 }
index db8e4ea2b5bb1533cb25ad4c730655a7d9cc421f..e72d020348a855f895eea8dfedcc5c413af3db9b 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -27,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * @version 1.0
  */
 public class ScopeElement extends AbstractEntityCollectionElement<DefinedTerm> {
-       
+
        private TermComboElement<DefinedTerm> combo_scope;
 
        /**
@@ -55,13 +56,13 @@ public class ScopeElement extends AbstractEntityCollectionElement<DefinedTerm> {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_scope = formFactory.createTermComboElement(DefinedTerm.class, element, "Scope", null, style);
+               combo_scope = formFactory.createDefinedTermComboElement(TermType.Scope, element, "Scope", null, style);
        }
 
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               
+
        }
 
 
index 94ceb4e99e6d31c936f49cd593a1dff2ca6edea0..e40c90d52a170367bfc0bb4a3071e1359cdf75f0 100644 (file)
@@ -14,6 +14,7 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.model.common.LanguageString;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -67,7 +68,7 @@ public class StateDataElement extends AbstractEntityCollectionElement<StateData>
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_state = formFactory.createTermComboElement(State.class, element, "State", null, style);
+               combo_state = formFactory.createDefinedTermComboElement(TermType.State, element, "State", null, style);
                section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE);
                section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);
index 012b6018092a2542ea7a04195b7e27c9153baec2..601867f8683e2742c0780ca6de2dcc78fa65580d 100644 (file)
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -65,7 +66,7 @@ public class StatisticalMeasurementValueElement extends
        @Override
        public void createControls(ICdmFormElement element, int style) {
                number_value = formFactory.createNumberTextWithLabelElement(element, "Value", 0, style);
-               combo_type = formFactory.createTermComboElement(StatisticalMeasure.class, element, "Statistical Measure", null, style);
+               combo_type = formFactory.createDefinedTermComboElement(TermType.StatisticalMeasure, element, "Statistical Measure", null, style);
                section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE);
                section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
        }
index 2cf643d510af2f4d07e0bb3b4310d01d6a1bb954..820a274ff1d0ecc78cb3bc623f99cf4d989c2a7e 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description.detail;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -29,12 +30,12 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @version 1.0
  */
 public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailElement<CommonTaxonName> {
-       
+
        private TermComboElement<Language> combo_language;
        private EntitySelectionElement<NamedArea> selection_namedArea;
        private TextWithLabelElement commonName;
 
-       
+
        /**
         * <p>Constructor for CommonNameDetailElement.</p>
         *
@@ -47,14 +48,14 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl
                        ICdmFormElement formElement, CommonTaxonName entity, int style) {
                super(formFactory, formElement, entity, style);
        }
-       
+
        /** {@inheritDoc} */
        @Override
        protected void createControls(ICdmFormElement formElement,
                        CommonTaxonName entity, int style) {
                commonName = formFactory.createTextWithLabelElement(this, "Common Name", entity.getName(), SWT.WRAP);
 
-               combo_language = formFactory.createTermComboElement(Language.class, this, "Language", entity.getLanguage(), style);
+               combo_language = formFactory.createDefinedTermComboElement(TermType.Language, this, "Language", entity.getLanguage(), style);
 
                selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
                                formElement, "Area",
index a4cb753439d963397c11fa6e2eb0a7fdc6d09da2..33bf05da6975c95a5c611b880d7b16d0095b5a86 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -30,7 +30,7 @@ public class DistributionDetailElement extends
 
        private EntitySelectionElement<NamedArea> selection_namedArea;
        private TermComboElement<PresenceAbsenceTermBase> combo_presenceAbsence;
-       
+
 
        /**
         * <p>Constructor for DistributionDetailElement.</p>
@@ -44,7 +44,7 @@ public class DistributionDetailElement extends
                        ICdmFormElement formElement, Distribution entity, int style) {
                super(formFactory, formElement, entity, style);
        }
-       
+
        /** {@inheritDoc} */
        @Override
        protected void createControls(ICdmFormElement formElement,
@@ -53,7 +53,7 @@ public class DistributionDetailElement extends
                                formElement, "Area",
                                entity.getArea(), EntitySelectionElement.NOTHING, style);
         combo_presenceAbsence = formFactory.createTermComboElement(PresenceAbsenceTermBase.class, this, "Distribution Status", entity.getStatus(), style);
-        
+
        }
 
        /** {@inheritDoc} */
@@ -66,5 +66,5 @@ public class DistributionDetailElement extends
                }
        }
 
-       
+
 }
index 1315a206d7b99cf3fa174b1c06c6f16b392add71..111fed24d9357befa200c959eb1dd1e77114983e 100644 (file)
@@ -5,6 +5,7 @@ package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -42,7 +43,7 @@ public class QuantitativeDataDetailElement extends
        @Override
        protected void createControls(ICdmFormElement formElement,
                        QuantitativeData entity, int style) {
-               combo_mesaurementUnit = formFactory.createTermComboElement(MeasurementUnit.class, formElement, "Measurement Unit", entity.getUnit(), style);
+               combo_mesaurementUnit = formFactory.createDefinedTermComboElement(TermType.MeasurementUnit, formElement, "Measurement Unit", entity.getUnit(), style);
                section_statisticalMeasurementValues = formFactory.createStatisticalMeasurementValueSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
                section_statisticalMeasurementValues.setEntity(entity);
                section_statisticalMeasurementValues.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
index d13534adb4ddf93fbb3ea42fca43b8006560bdd1..48c9cdee75aeac79765da4ad2508856446e6a41f 100644 (file)
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
@@ -78,7 +79,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 
                toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
 
-               combo_rank = formFactory.createTermComboElement(Rank.class, this, "Rank", nonViralName.getRank(), style);
+               combo_rank = formFactory.createDefinedTermComboElement(TermType.Rank, this, "Rank", nonViralName.getRank(), style);
 
                createGenusOrUninomialControls(this, nonViralName, style);
                createInfragenerericEpithetControls(this, nonViralName, style);
index 162626a0428b719f2d427ca1fdd711b6943e7a16..203141ac659bfb6153a6db23302fa7bd0898c861 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -16,6 +16,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
@@ -29,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * NameRelationshipWizardPage class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Jun 1, 2010
  * @version 1.0
@@ -55,7 +56,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
         * <p>
         * Constructor for NameRelationshipWizardPage.
         * </p>
-        * 
+        *
         * @param callingSection
         *            a
         *            {@link eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection}
@@ -74,7 +75,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
         * .Composite)
@@ -90,7 +91,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
 
                rootElement = new RootElement(formFactory, control);
 
-               combo_relationshipType = formFactory.createTermComboElement(NameRelationshipType.class,
+               combo_relationshipType = formFactory.createDefinedTermComboElement(TermType.NameRelationshipType,
                                                rootElement, "Name Relationship Type", null, SWT.NULL);
 
                selection_relatedTo = formFactory
@@ -107,7 +108,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
         * <p>
         * getNameRelationship
         * </p>
-        * 
+        *
         * @return a {@link eu.etaxonomy.cdm.model.name.NameRelationship} object.
         */
        public NameRelationship getNameRelationship() {
index 6d4c33854f93d5e7efa40c4ab40298dd14d2429b..bacf0fd933146bfb7bd5c13a91d57ac6fc8dc075 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.name;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
@@ -27,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * NameTypeDesignationElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created May 17, 2010
  * @version 1.0
@@ -44,7 +45,7 @@ public class NameTypeDesignationElement extends
         * <p>
         * Constructor for NameTypeDesignationElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -77,8 +78,7 @@ public class NameTypeDesignationElement extends
                                .createSelectionElement(TaxonNameBase.class,
                                                getConversationHolder(), formElement, "Name", null,
                                                EntitySelectionElement.ALL, style);
-               combo_typeStatus = formFactory.createTermComboElement(
-                               NameTypeDesignationStatus.class, formElement,
+               combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.NameTypeDesignationStatus, formElement,
                                                "Designation Status", null, style);
 
                super.createControls(formElement, style);
index 937f08a90fafd140fc32513cfdda4ab2671fc971..a3ce82144d9449614dd6f8dc09dede3e0d14bf52 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.swt.events.SelectionListener;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -34,10 +35,10 @@ import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityEl
 public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<NomenclaturalStatus> implements IEntityElement<NomenclaturalStatus>, ISelectableElement{
 
        private TermComboElement<NomenclaturalStatusType> nomenclaturalStatusTypeCombo;
-       
+
        private TextWithLabelElement ruleConsideredText;
-       
-       private SelectionArbitrator selectionArbitrator;
+
+       private final SelectionArbitrator selectionArbitrator;
 
        /**
         * <p>Constructor for NomenclaturalStatusElement.</p>
@@ -60,9 +61,9 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               nomenclaturalStatusTypeCombo = formFactory.createTermComboElement(NomenclaturalStatusType.class, this, "Nomenclatural Status Type", null, style);
+               nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(TermType.NomenclaturalStatusType, this, "Nomenclatural Status Type", null, style);
                ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
-               
+
                super.createControls(element, style);
        }
 
@@ -82,10 +83,11 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
         *
         * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator} object.
         */
-       public SelectionArbitrator getSelectionArbitrator() {
+       @Override
+    public SelectionArbitrator getSelectionArbitrator() {
                return selectionArbitrator;
        }
-       
+
        /*
         * (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object)
index 1376e0ba682c4975ccb47f5a8c814f0e56540aae..8a6a13fdc7915f430784fa0157957e2e92781b54 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.name;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
@@ -28,7 +29,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * SpecimenTypeDesignationElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created May 17, 2010
  * @version 1.0
@@ -44,7 +45,7 @@ public class SpecimenTypeDesignationElement extends
         * <p>
         * Constructor for SpecimenTypeDesignationElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -72,8 +73,7 @@ public class SpecimenTypeDesignationElement extends
                                .createSelectionElement(DerivedUnit.class,
                                                getConversationHolder(), formElement, "Specimen", null,
                                                EntitySelectionElement.ALL, style);
-               combo_typeStatus = formFactory
-                               .createTermComboElement(SpecimenTypeDesignationStatus.class,
+               combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.SpecimenTypeDesignationStatus,
                                                formElement, "Designation Status", null, style);
 
                super.createControls(formElement, style);
@@ -101,8 +101,8 @@ public class SpecimenTypeDesignationElement extends
                else if (eventSource == text_specimenTypeText) {
                        // TODO this is a simple workaround to enter type specimen as text
                        // strings
-                       if (getEntity().getTypeSpecimen() == null) {                            
-                               DerivedUnit typeSpecimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);                                                                        
+                       if (getEntity().getTypeSpecimen() == null) {
+                               DerivedUnit typeSpecimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
                                getEntity().setTypeSpecimen(typeSpecimen);
                        }
                        getEntity().getTypeSpecimen().setTitleCache(
index 3f9c8e25f163135d06b3e949130d30e03161c5b1..84f8f47ea48415927391dc3260e37a576940d77f 100644 (file)
@@ -15,6 +15,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
@@ -94,7 +95,7 @@ public class SynonymRelationshipWizardPage extends WizardPage implements IProper
 
         rootElement = new RootElement(formFactory, control);
 
-        combo_relationshipType = formFactory.createTermComboElement(SynonymRelationshipType.class,
+        combo_relationshipType = formFactory.createDefinedTermComboElement(TermType.SynonymRelationshipType,
                 rootElement, "Synonym Relationship Type", null, SWT.NULL);
 
         selection_relatedTo = formFactory
index 09be604348a9dd65a3de799bf6fb44e31679f275..a6720252913c8ccae6e8fcb846ac00290629ecb4 100644 (file)
@@ -15,6 +15,7 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -92,7 +93,7 @@ public class DerivedUnitBaseDetailElement extends
 
                try {
             PreservationMethod preservationMethod = entity.getPreservationMethod();
-            combo_preservationMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
+            combo_preservationMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
                        // we ignore this
             AbstractUtility.info(e.getMessage());
index 33043ae694a396cda81667b4b863495c7c2f15ac..f9405739c604f5070a98b931d22b4e0c32005a19 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -26,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * DeterminationEventDetailElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Oct 13, 2010
  * @version 1.0
@@ -44,7 +45,7 @@ public class DeterminationEventDetailElement extends
         * <p>
         * Constructor for DeterminationEventDetailElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -67,7 +68,7 @@ public class DeterminationEventDetailElement extends
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
         * (eu.etaxonomy.cdm.model.common.IVersionableEntity)
@@ -83,7 +84,7 @@ public class DeterminationEventDetailElement extends
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
         * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -95,23 +96,23 @@ public class DeterminationEventDetailElement extends
                                .createSelectionElement(TaxonBase.class,
                                                getConversationHolder(), element, "Taxon", null,
                                                EntitySelectionElement.NOTHING, style);
-               
+
 
                // TODO set of references
 
                super.createControls(element, style);
-               
+
                element_timePeriod.setLabel("Determined When");
                selection_agent.setLabel("Determined by");
-               
-               
-               combo_determinationModifier = formFactory.createTermComboElement(DefinedTerm.class,
+
+
+               combo_determinationModifier = formFactory.createDefinedTermComboElement(TermType.DeterminationModifier,
                                element, "Modifier", null, style);
        }
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
         * (java.lang.Object)
index 07f8f005cb1b52e8ca9080f924d2df9673e95213..1e18f35405c565111f389f080e7c9c8f2f20aa48 100644 (file)
@@ -13,6 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
@@ -86,7 +87,7 @@ public class PreservedSpecimenDetailElement extends
 
 
         PreservationMethod preservationMethod = entity.getPreservation();
-        combo_preservationMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
+        combo_preservationMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
         selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
 
         text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
index 07360f1e0d3f7b061da3343a5ac2875ad6f1ae71..941e5dbf490f8560b900f385fddf291fe772f603 100644 (file)
@@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.Cloning;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -54,7 +55,7 @@ public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement
         textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
         date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
         selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
-        comboCloningMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
+        comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
     }
 
     /*
index d17b3468d73c6ef2666679ca58f198faf6fda380..6b335ba22a4ba093f42b6233855a343b0927eed6 100644 (file)
@@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -64,7 +65,7 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
     @Override
     protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
         textDescription = formFactory.createTextWithLabelElement(formElement, "Description", entity.getDescription(), style);
-        comboMarker = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Marker", entity.getDnaMarker(), style);
+        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
 //        dateAmplification = formFactory.createTimePeriodElement(formElement, "Amplification Date", entity.getTimeperiod(), style);
 //        selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
 //        checkBoxAmplificationSuccess = formFactory.createCheckbox(formElement, "Amplification Success", entity.getSuccessful(), style);
@@ -74,7 +75,7 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
 //        numberGelConcentration = formFactory.createNumberTextWithLabelElement(formElement, "Gel Concentration", entity.getGelConcentration(), style);
 //        numberGelRunningTime = formFactory.createNumberTextWithLabelElement(formElement, "Gel Ruinning Time (Min)", entity.getGelRunningTime(), style);
 //        textLadderUsed = formFactory.createTextWithLabelElement(formElement, "Ladder Used", entity.getLadderUsed(), style);
-        comboPurificationMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Purification Mat. & Meth.",
+        comboPurificationMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Purification Mat. & Meth.",
                 entity.getPurification()==null?null:entity.getPurification().getDefinedMaterialOrMethod(), style);
     }
 
index 38517ef9262d9e6d6576c7305f3dc1ab61b23c8b..d0dd9c4dd32735fba4dbee5880b3c4bb6ba48dfb 100644 (file)
@@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
@@ -68,7 +69,7 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
         // TODO sample designation
         selectionPreparedBy = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared by", actor, EntitySelectionElement.ALL, style);
         numberPreservationTemperature = formFactory.createNumberTextWithLabelElement(formElement, "Preservation Temp. [C°]", temperature, style);
-        comboMaterialOrMethods = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Materials & Methods", definedMaterialOrMethod, style);
+        comboMaterialOrMethods = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Materials & Methods", definedMaterialOrMethod, style);
         //TODO preparation date
         //TODO sample type
         textBarcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
index e7ee40986c97697d43c69e59cd5fa8061b4091e3..f03ea461d12c6aaedcf52fd31a41dfb45c268c87 100644 (file)
@@ -10,6 +10,7 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.molecular.SequenceString;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -52,9 +53,7 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Sequence entity, int style) {
-        comboMarker = formFactory.createTermComboElement(DefinedTerm.class, formElement, "DNA Marker",
-                entity.getDnaMarker(),
-                        style);
+        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
         textConsensusSequence = formFactory.createTextWithLabelElement(formElement, "Consensus Sequence 5'->3'", entity.getConsensusSequence().getString(), style);
         textConsensusSequenceLength = formFactory.createNumberTextWithLabelElement(formElement, "Consensus Seq. Length", entity.getConsensusSequence().getLength(), style);
         textConsensusSequenceLength.setEnabled(false);
index 37f0d4feb9a08e2de1eaec7da0b08aa79ebaf831..a4a5c5521899bd30d25bf4a284e15c428daa319c 100644 (file)
@@ -15,6 +15,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
@@ -79,7 +80,7 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
             // we ignore this
             AbstractUtility.info(e.getMessage());
         }
-        comboPreservationMedium = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Preservation medium", preservationMedium, style);
+        comboPreservationMedium = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation medium", preservationMedium, style);
         datePreservation = formFactory.createTimePeriodElement(formElement, "Preservation date", preservationDate, style);
         selectionStoredAt = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Stored at", null, EntitySelectionElement.ALL, style);
         selectionCollection = formFactory.createSelectionElement(Collection.class, getConversationHolder(), formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
index 760abcf48c6cd7fe5ba68beda8a3ad61eb2d5373..6a73aad173cacb5f58e564f7375403b063a6dd70 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
@@ -7,6 +7,7 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -37,15 +38,15 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
        public AnnotationElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Annotation annotation, SelectionListener removeListener, int style) {
                super(cdmFormFactory, formElement, annotation, removeListener, null, style);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetComposite#createControls(org.eclipse.swt.widgets.Composite)
         */
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_annotationType = formFactory.createTermComboElement(AnnotationType.class, this, "Annotation Type", null, style);
-               
+               combo_annotationType = formFactory.createDefinedTermComboElement(TermType.AnnotationType, this, "Annotation Type", null, style);
+
                text = formFactory.createMultilineTextWithLabel(this, "Annotation", 100, style);
        }
 
index 184aa6f75608348291bda195c8f48be3d3f7959d..45f9f9181a1afde7f5407d0f1205e335bc0f9b61 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
@@ -8,6 +8,7 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -27,7 +28,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
 
        private TermComboElement<ExtensionType> combo_extensionType;
        private TextWithLabelElement text_extensionValue;
-       
+
        /**
         * <p>Constructor for ExtensionElement.</p>
         *
@@ -48,7 +49,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_extensionType = formFactory.createTermComboElement(ExtensionType.class, this, null, null, style);
+               combo_extensionType = formFactory.createDefinedTermComboElement(TermType.ExtensionType, this, null, null, style);
                text_extensionValue = formFactory.createTextWithLabelElement(element, null, null, style);
                text_extensionValue.getLayoutComposite().setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
        }
@@ -62,7 +63,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
                this.entity = element;
                ExtensionType extensionType = (ExtensionType) HibernateProxyHelper.deproxy(element.getType());
                combo_extensionType.setSelection(extensionType);
-               text_extensionValue.setText(element.getValue());        
+               text_extensionValue.setText(element.getValue());
        }
 
        /*
index 62b04b7e8f7eca49dad51a5494faba106f7c33da..6311ffce3327043e9603c24e412d1deeb63ec929 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
@@ -7,6 +7,7 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -36,7 +37,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
                        SelectionListener removeListener, int style) {
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
-       
+
        private TermComboElement<MarkerType> combo_markerType;
        private CheckboxElement checkbox_markerState;
 
@@ -48,7 +49,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
        @Override
        public void createControls(ICdmFormElement element, int style) {
                checkbox_markerState = formFactory.createCheckbox(this, null, false, style);
-               combo_markerType = formFactory.createTermComboElement(MarkerType.class, this, null, null, style);
+               combo_markerType = formFactory.createDefinedTermComboElement(TermType.MarkerType, this, null, null, style);
        }
 
        /* (non-Javadoc)
index e748ba816ffc983511412018aecdcc7f0d6c841a..a68a3598181329ac8a6c5d8bcc41a85eed116d24 100644 (file)
@@ -1,11 +1,12 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.RightsType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -20,7 +21,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * RightsElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Nov 16, 2009
  * @version 1.0
@@ -30,12 +31,12 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
        private TermComboElement<RightsType> combo_rightsType;
        private EntitySelectionElement<AgentBase> selection_agent;
        private TextWithLabelElement text;
-       
+
        /**
         * <p>
         * Constructor for RightsElement.
         * </p>
-        * 
+        *
         * @param formElement
         *            a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
         *            object.
@@ -58,7 +59,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite
         * #createControls(org.eclipse.swt.widgets.Composite, int)
@@ -66,8 +67,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_rightsType = formFactory.createTermComboElement(
-                               RightsType.class, this, "Rights Type", null, style);
+               combo_rightsType = formFactory.createDefinedTermComboElement(TermType.RightsType, this, "Rights Type", null, style);
                selection_agent = formFactory.createSelectionElement(
                                AgentBase.class, getConversationHolder(), this, "Agent",
                                null, EntitySelectionElement.ALL, style);
@@ -77,7 +77,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite
         * #setElement(eu.etaxonomy.cdm.model.common.VersionableEntity)
@@ -93,7 +93,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
         * (java.lang.Object)
index 0c4a3e28172eb50a3cb58874bb50dae61501a695..24a21f53042e276b69f57fbe798e2f1c23e39a5b 100644 (file)
@@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
+import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.description.StateData;\r
@@ -65,14 +66,14 @@ public class UseRecordDetailElement extends
        protected void createControls(ICdmFormElement formElement,\r
                        CategoricalData entity, int style) {\r
 \r
-               combo_UseCategory = formFactory.createTermComboElement(State.class,     this, UsageTermCollection.useCategoryVocabularyLabel, null, style);\r
+               combo_UseCategory = formFactory.createDefinedTermComboElement(TermType.State, this, UsageTermCollection.useCategoryVocabularyLabel, null, style);\r
                combo_UseCategory.addSelectionListener(this);\r
-               combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, UsageTermCollection.useSubCategoryVocabularyLabel, null, style);\r
-               combo_PlantPart = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.plantPartLabel, null, style);\r
-               combo_HumanGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.humanGroupLabel, null, style);\r
+               combo_UseSubCategory = formFactory.createDefinedTermComboElement(TermType.State, this, UsageTermCollection.useSubCategoryVocabularyLabel, null, style);\r
+               combo_PlantPart = formFactory.createDefinedTermComboElement(TermType.Modifier, this, UsageTermCollection.plantPartLabel, null, style);\r
+               combo_HumanGroup = formFactory.createDefinedTermComboElement(TermType.Modifier, this, UsageTermCollection.humanGroupLabel, null, style);\r
                combo_HumanGroup.addSelectionListener(this);\r
-               combo_EthnicGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.ethnicGroupLabel, null, style);\r
-               combo_Country   = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.countryLabel, null, style);\r
+               combo_EthnicGroup = formFactory.createDefinedTermComboElement(TermType.Modifier, this, UsageTermCollection.ethnicGroupLabel, null, style);\r
+               combo_Country   = formFactory.createDefinedTermComboElement(TermType.Modifier, this, UsageTermCollection.countryLabel, null, style);\r
 \r
 \r
                List<State> termsUseCategory = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false));\r
@@ -494,7 +495,7 @@ public class UseRecordDetailElement extends
                                        }\r
                                }\r
                                List<DefinedTerm> emptyListToResetComboBox = new ArrayList<DefinedTerm>();\r
-                               \r
+\r
 //                             DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
                                DefinedTerm emptyMod = null;\r
 \r
index f30d2026644636c69a0a0726263aa8d7ab7efaac..cf1a5cd3e93937934330a56a78168c5a81be001c 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$\r
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.vocabulary;
 import java.net.URISyntaxException;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
 import eu.etaxonomy.cdm.model.location.NamedAreaType;\r
@@ -33,7 +34,7 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
        private TermComboElement<NamedAreaLevel> combo_namedAreaLevel;\r
        // validPeriod\r
        private TimePeriodElement timePeriod_validPeriod;\r
-       \r
+\r
        /**\r
         * @param formFactory\r
         * @param formElement\r
@@ -42,14 +43,15 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
                        ICdmFormElement formElement) {\r
                super(formFactory, formElement);\r
        }\r
-       \r
-       public void createControls(ICdmFormElement formElement, NamedArea entity, int style) {\r
+\r
+       @Override\r
+    public void createControls(ICdmFormElement formElement, NamedArea entity, int style) {\r
                super.createControls(formElement, entity, style);\r
-               \r
+\r
                timePeriod_validPeriod = formFactory.createTimePeriodElement(formElement, "Valid Period", getEntity().getValidPeriod(), style);\r
-               combo_namedAreaType = formFactory.createTermComboElement(NamedAreaType.class, formElement, "Named Area Type", getEntity().getType(), style);\r
-               combo_namedAreaLevel = formFactory.createTermComboElement(NamedAreaLevel.class, formElement, "Named Area Level", getEntity().getLevel(), style);\r
-               \r
+               combo_namedAreaType = formFactory.createDefinedTermComboElement(TermType.NamedAreaType, formElement, "Named Area Type", getEntity().getType(), style);\r
+               combo_namedAreaLevel = formFactory.createDefinedTermComboElement(TermType.NamedAreaLevel, formElement, "Named Area Level", getEntity().getLevel(), style);\r
+\r
        }\r
 \r
        /* (non-Javadoc)\r
@@ -57,20 +59,20 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
         */\r
        @Override\r
        public void handleEvent(Object eventSource) {\r
-               \r
+\r
                if (eventSource == text_label) {\r
                        getEntity().setLabel(text_label.getText());\r
                        getEntity().setTitleCache(null);\r
                } else if (eventSource == text_description) {\r
-                       \r
+\r
                        getEntity().getRepresentation(Language.DEFAULT()).setText(text_description.getText());\r
-                       \r
+\r
                } else if (eventSource == uri_uri) {\r
-                       \r
+\r
                        try {\r
                                getEntity().setUri(uri_uri.getUri());\r
                        } catch (URISyntaxException e) {\r
-                               \r
+\r
                                e.printStackTrace();\r
                        }\r
                } else if (eventSource == text_abbreviatedLabel) {\r
@@ -82,9 +84,9 @@ public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea>
                } else if (eventSource == combo_namedAreaLevel) {\r
                        getEntity().setLevel(combo_namedAreaLevel.getSelection());\r
                }\r
-               \r
-               \r
+\r
+\r
        }\r
 \r
-       \r
+\r
 }\r
index 0eb7c6c6ea9283a3be39515e4f70ec4604a49d69..46ca1194360209baa6e42148fccf9923a2de7198 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -45,14 +46,14 @@ import eu.etaxonomy.taxeditor.ui.element.RootElement;
  * @version 1.0
  */
 public class TranslationWizardPage extends WizardPage{
-               
-       private static int TEXT_HEIGHT = 400;  
-       
-       private Map<Language, LanguageString> multilanguageText;
+
+       private static int TEXT_HEIGHT = 400;
+
+       private final Map<Language, LanguageString> multilanguageText;
 
        MultilanguageTextElement source;
-       
-       private CdmFormFactory formFactory;
+
+       private final CdmFormFactory formFactory;
 
        private TermComboElement<Language> combo_sourceLanguage;
 
@@ -61,7 +62,7 @@ public class TranslationWizardPage extends WizardPage{
        private TermComboElement<Language> combo_targetLanguage;
 
        private LanguageStringWithLabelElement text_target;
-       
+
        /**
         * <p>Constructor for TranslationWizardPage.</p>
         *
@@ -85,38 +86,38 @@ public class TranslationWizardPage extends WizardPage{
                Composite control = formFactory.createComposite(parent);
 //             control.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN));
                control.setLayout(LayoutConstants.LAYOUT(2, true));
-               
+
                Composite leftContainer = formFactory.createComposite(control);
                leftContainer.setLayoutData(LayoutConstants.FILL());
                leftContainer.setLayout(LayoutConstants.LAYOUT(1, false));
 //             leftContainer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
                RootElement leftRoot = new RootElement(formFactory, leftContainer);
-               
+
                Composite rightContainer = formFactory.createComposite(control);
                rightContainer.setLayoutData(LayoutConstants.FILL());
                rightContainer.setLayout(LayoutConstants.LAYOUT(1, false));
 //             rightContainer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
                RootElement rightRoot = new RootElement(formFactory, rightContainer);
-               
+
                createLeftControls(leftRoot);
                createRightControls(rightRoot);
-               
+
                // initialize with default language
                setSource(CdmStore.getDefaultLanguage());
-               
-               
+
+
                setControl(control);
        }
-       
+
        /**
         * @param defaultLanguage
         */
        private void setSource(Language language) {
-               
+
                List<Language> languages = Arrays.asList(new Language[]{language});
-               
+
                LanguageString preferredLanguageString = MultilanguageTextHelper.getPreferredLanguageString(multilanguageText, languages);
-               
+
                if(preferredLanguageString != null){
                        combo_sourceLanguage.setSelection(preferredLanguageString.getLanguage());
                        text_source.setLanguageString(preferredLanguageString);
@@ -125,15 +126,15 @@ public class TranslationWizardPage extends WizardPage{
 
 
        /**
-        * 
+        *
         * @param element
         */
        private void createLeftControls(ICdmFormElement element){
-               
-               combo_sourceLanguage = formFactory.createTermComboElement(Language.class, element, null, null, SWT.NULL);
-               
+
+               combo_sourceLanguage = formFactory.createDefinedTermComboElement(TermType.Language, element, null, null, SWT.NULL);
+
                combo_sourceLanguage.setTerms(getLanguages());
-               
+
                combo_sourceLanguage.addSelectionListener(new SelectionAdapter() {
                        /* (non-Javadoc)
                         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
@@ -143,23 +144,23 @@ public class TranslationWizardPage extends WizardPage{
                                text_source.setLanguageString(multilanguageText.get(combo_sourceLanguage.getSelection()));
                        }
                });
-               
+
                LanguageString preferredLanguageString = MultilanguageTextHelper.getPreferredLanguageString(multilanguageText, getLanguages());
-               
+
                text_source = formFactory.createLanguageStringWithLabelElement(element, null, preferredLanguageString, TEXT_HEIGHT, SWT.NULL);
 
 //             text_source.setEnabled(false);
-               
+
                text_source.setText(preferredLanguageString.getText());
        }
-               
+
        /**
-        * 
+        *
         * @param element
         */
        private void createRightControls(ICdmFormElement element){
-               combo_targetLanguage = formFactory.createTermComboElement(Language.class, element, null, null, SWT.NULL);
-               
+               combo_targetLanguage = formFactory.createDefinedTermComboElement(TermType.Language, element, null, null, SWT.NULL);
+
                combo_targetLanguage.addSelectionListener(new SelectionAdapter() {
                        /* (non-Javadoc)
                         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
@@ -167,26 +168,26 @@ public class TranslationWizardPage extends WizardPage{
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                Language language = combo_targetLanguage.getSelection();
-                               
+
                                if (language == null){
                                        return;
                                }
-                               
+
                                setPageComplete(true);
                                LanguageString languageString;
-                               
+
                                if(multilanguageText.containsKey(language)){
                                        languageString = multilanguageText.get(language);
                                }else{
                                        languageString = LanguageString.NewInstance("", language);
                                }
-                               
+
                                text_target.setLanguageString(languageString);
                        }
                });
-               
+
                text_target = formFactory.createLanguageStringWithLabelElement(element, null, null, TEXT_HEIGHT, SWT.NULL);
-               
+
                //
                // The automated translation did rely on the Google Translate API. Unfortunately this service is not free anymore.
                // See http://code.google.com/apis/language/translate/overview.html
@@ -204,12 +205,12 @@ public class TranslationWizardPage extends WizardPage{
 //                                     String text = text_source.getText();
 //                                     Language sourceLanguage = text_source.getLanguageString().getLanguage();
 //                                     Language targetLanguage = combo_targetLanguage.getSelection();
-//                                     
+//
 //                                     if(targetLanguage == null){
 //                                             StoreUtil.warningDialog("Please select a target language", TranslationWizardPage.class, "Please select a language from the combo box at the right.");
 //                                             return;
 //                                     }
-//                                     
+//
 //                                     translatedText = service.translate(text, sourceLanguage, targetLanguage);
 //                                     text_target.setText(translatedText);
 //                             } catch (LanguageNotSupportedException e) {
@@ -217,19 +218,19 @@ public class TranslationWizardPage extends WizardPage{
 //                             } catch (Exception e){
 //                                     StoreUtil.warningDialog("Error translating text", TranslationWizardPage.class, e.getMessage());
 //                             }
-//                             
+//
 //                     }
 //             });
        }
 
-       
+
        /**
-        * 
+        *
         * @return
         */
        private List<Language> getLanguages(){
                Set<Language> languageSet = MultilanguageTextHelper.getLanguages(multilanguageText);
-               
+
                List<Language> languageList = new ArrayList<Language>();
                // protect against corrupt language sets
                for (Language language : languageSet){
@@ -238,11 +239,11 @@ public class TranslationWizardPage extends WizardPage{
                        }else{
                                StoreUtil.warningDialog("Empty languages", getClass(), "The multilanguage string contains invalid data. Please contact the administrator of you datasource.");
                        }
-               }               
-                               
+               }
+
                return languageList;
        }
-       
+
        /* (non-Javadoc)
         * @see org.eclipse.jface.dialogs.DialogPage#dispose()
         */
@@ -253,8 +254,8 @@ public class TranslationWizardPage extends WizardPage{
        }
 
        /**
-        * @return 
-        * 
+        * @return
+        *
         */
        public LanguageString getTargetLanguageString() {
                return text_target.getLanguageString();