X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/9cb12847cbf7924475f214679c18f1530f0e1c54..1c69b0d01165dcae51f1f45667c202e0d15b960d:/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 e486e7f52..558ae50a8 100644
--- 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
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -29,6 +28,7 @@ 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.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -98,10 +98,10 @@ public class TranslationWizardPage extends WizardPage{
 		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());
 
@@ -132,7 +132,7 @@ public class TranslationWizardPage extends WizardPage{
 	private void createLeftControls(ICdmFormElement element){
 
 		combo_sourceLanguage = formFactory.createDefinedTermComboElement(TermType.Language, element, null, null, SWT.NULL);
-
+		
 		combo_sourceLanguage.setTerms(getLanguages());
 
 		combo_sourceLanguage.addSelectionListener(new SelectionAdapter() {
@@ -146,11 +146,13 @@ public class TranslationWizardPage extends WizardPage{
 		});
 
 		LanguageString preferredLanguageString = MultilanguageTextHelper.getPreferredLanguageString(multilanguageText, getLanguages());
-
+		if (preferredLanguageString == null){
+			preferredLanguageString = LanguageString.NewInstance("", PreferencesUtil.getGlobalLanguage());
+		}
 		text_source = formFactory.createLanguageStringWithLabelElement(element, null, preferredLanguageString, TEXT_HEIGHT, false, SWT.NULL);
 
 //		text_source.setEnabled(false);
-
+		
 		text_source.setText(preferredLanguageString.getText());
 	}
 
@@ -170,6 +172,7 @@ public class TranslationWizardPage extends WizardPage{
 				Language language = combo_targetLanguage.getSelection();
 
 				if (language == null){
+					setPageComplete(false);
 					return;
 				}