Committing changes to definedtermeditor after merge from branch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / translation / TranslationWizardPage.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
index 1113625a0e73215530db43a7c7cdf928188db58d..4f1f5071812d1aeb7bf5e5d5e4d8e26e03fcef43 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
@@ -30,14 +30,12 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;
-import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
-import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
 
 /**
  * <p>TranslationWizardPage class.</p>
@@ -56,11 +54,11 @@ public class TranslationWizardPage extends WizardPage{
        
        private CdmFormFactory formFactory;
 
-       private EmptyComboElement<Language> combo_sourceLanguage;
+       private TermComboElement combo_sourceLanguage;
 
        private LanguageStringWithLabelElement text_source;
 
-       private LanguageComboElement combo_targetLanguage;
+       private TermComboElement<Language> combo_targetLanguage;
 
        private LanguageStringWithLabelElement text_target;
        
@@ -131,7 +129,7 @@ public class TranslationWizardPage extends WizardPage{
         */
        private void createLeftControls(ICdmFormElement element){
                
-               combo_sourceLanguage = (EmptyComboElement<Language>) formFactory.createTermComboElement(TermComboType.EMPTY, element, null, null, SWT.NULL);
+               combo_sourceLanguage = formFactory.createTermComboElement(null, element, null, null, SWT.NULL);
                combo_sourceLanguage.setTerms(getLanguages());
                
                combo_sourceLanguage.addSelectionListener(new SelectionAdapter() {
@@ -158,7 +156,7 @@ public class TranslationWizardPage extends WizardPage{
         * @param element
         */
        private void createRightControls(ICdmFormElement element){
-               combo_targetLanguage = (LanguageComboElement) formFactory.createTermComboElement(TermComboType.LANGUAGE, element, null, null, SWT.NULL);
+               combo_targetLanguage = formFactory.createTermComboElement(Language.class, element, null, null, SWT.NULL);
                
                combo_targetLanguage.addSelectionListener(new SelectionAdapter() {
                        /* (non-Javadoc)