- refactored LanguageStringWithLabelElement (isMultiLine flag)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 9e450f39bcca21d3dc52bfec836b3ce9a7746efb..4acdfbf109c9f424cf435c10f13596504841e662 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -718,63 +718,20 @@ public class CdmFormFactory extends FormToolkit {
                return element;
        }
 
                return element;
        }
 

-    /**
-     * <p>
-     * createLanguageStringWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param languageString
-     *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
-     *         object.
-     */

     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,
             String labelString, LanguageString languageString, int style) {
     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,
             String labelString, LanguageString languageString, int style) {

-        LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString,
-                languageString, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
+        return createLanguageStringWithLabelElement(parentElement, labelString, languageString, null, false, style);

     }
 
     }
 

-    /**
-     * <p>
-     * createLanguageStringWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param languageString
-     *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
-     * @param height
-     *            a int.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
-     *         object.
-     */

     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,
     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,

-            String labelString, LanguageString languageString, int height, int style) {
+            String labelString, LanguageString languageString, Integer height, boolean isMultiLine, int style) {

         LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString,
         LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString,

-                languageString, height, style);
+                languageString, height, isMultiLine, style);

         adapt(element);
         parentElement.addElement(element);
         return element;
     }
 
         adapt(element);
         parentElement.addElement(element);
         return element;
     }
 

-

     /**
      * <p>
      * createKeyValueViewerElement
     /**
      * <p>
      * createKeyValueViewerElement

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java
index 0e7f2a04c9ca79fc157e0538c7baa5028686089e..084e57634898a1c62b232015b441ad2413d5b0d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java
@@ -54,9 +54,16 @@ public class LanguageStringWithLabelElement extends TextWithLabelElement {
        protected LanguageStringWithLabelElement(CdmFormFactory formFactory,
                        ICdmFormElement parentElement, String labelString,
                        LanguageString languageString, Integer height, int style) {
        protected LanguageStringWithLabelElement(CdmFormFactory formFactory,
                        ICdmFormElement parentElement, String labelString,
                        LanguageString languageString, Integer height, int style) {

-               super(formFactory, parentElement, labelString, null, height, true, style);
+               this(formFactory, parentElement, labelString, languageString, height, true, style);
+       }
+
+       protected LanguageStringWithLabelElement(CdmFormFactory formFactory,
+               ICdmFormElement parentElement, String labelString,
+               LanguageString languageString, Integer height, boolean isMultiLine, int style) {
+           super(formFactory, parentElement, labelString, null, height, isMultiLine, style);
+
+           setLanguageString(languageString);

 
 

-               setLanguageString(languageString);

        }
 
        /**
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
index ad379c37098de347e440b7f640c389d7b8621129..bc2fe8be8386bdf016fac18990643e582f7e7a52 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
@@ -119,7 +119,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
                element_languageString = this.formFactory
                                .createLanguageStringWithLabelElement(formElement, labelString,
 
                element_languageString = this.formFactory
                                .createLanguageStringWithLabelElement(formElement, labelString,

-                                               null, textHeight, style);
+                                               null, textHeight, true, style);

 
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        createMultilanguageTextEditingElements(formElement,
 
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        createMultilanguageTextEditingElements(formElement,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
index 78960e311d49f68f4dcea6823ee8fe19cadd4762..eca547b688d4c9bd6e72f16641ef13adaf5cadfd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
@@ -71,7 +71,7 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> {
     public void createControls(ICdmFormElement element, int style) {
         text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style);
         selection_artist = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), element, "Artist", null, EntitySelectionElement.ALL, style);
     public void createControls(ICdmFormElement element, int style) {
         text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style);
         selection_artist = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), element, "Artist", null, EntitySelectionElement.ALL, style);

-        text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, style);
+        text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, true, style);

         mediaDetailElement = formFactory.createMediaDetailElement(element);
     }
 
         mediaDetailElement = formFactory.createMediaDetailElement(element);
     }
 

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 49a46a7dc39034f251cf9b6799d91f6fa29ed627..526f9eeac832786400c7cb0131506ef0ea184f7e 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
@@ -147,7 +147,7 @@ public class TranslationWizardPage extends WizardPage{
 
                LanguageString preferredLanguageString = MultilanguageTextHelper.getPreferredLanguageString(multilanguageText, getLanguages());
 
 
                LanguageString preferredLanguageString = MultilanguageTextHelper.getPreferredLanguageString(multilanguageText, getLanguages());
 

-               text_source = formFactory.createLanguageStringWithLabelElement(element, null, preferredLanguageString, TEXT_HEIGHT, SWT.NULL);
+               text_source = formFactory.createLanguageStringWithLabelElement(element, null, preferredLanguageString, TEXT_HEIGHT, true, SWT.NULL);

 
 //             text_source.setEnabled(false);
 
 
 //             text_source.setEnabled(false);
 


@@ -186,7 +186,7 @@ public class TranslationWizardPage extends WizardPage{
                        }
                });
 
                        }
                });
 

-               text_target = formFactory.createLanguageStringWithLabelElement(element, null, null, TEXT_HEIGHT, SWT.NULL);
+               text_target = formFactory.createLanguageStringWithLabelElement(element, null, null, TEXT_HEIGHT, true, SWT.NULL);

 
                //
                // The automated translation did rely on the Google Translate API. Unfortunately this service is not free anymore.
 
                //
                // The automated translation did rely on the Google Translate API. Unfortunately this service is not free anymore.