ref #10108: description is shown only if exist and fix multilangue with missing defau...

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 482eadece54450343f1bb7e2298805cb482e5356..2fe3ffde963110b5f4a8a7491e84ee69c4eb12db 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
@@ -123,7 +123,8 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                                .createLanguageStringWithLabelElement(formElement, labelString,
                                                null, textHeight, true, style);
 
-               if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
+               if (PreferencesUtil.isMultilanguageTextEditingCapability() || !(multilanguageText != null &&  multilanguageText.containsKey(CdmStore
+                                                                       .getDefaultLanguage()))) {
                        createMultilanguageTextEditingElements(formElement,
                                        multilanguageText, style);
                }
@@ -136,8 +137,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                combo_language = formFactory.createDefinedTermComboElement(TermType.Language, formElement,
                                                "", null, style);
                combo_language.addSelectionListener(this);
-               
-//             addControl(formFactory.createLabel(getLayoutComposite(), ""));
+
                button = formFactory.createButton(getLayoutComposite(),
                                "Open In Translation Editor", SWT.PUSH);
                addControl(button);
@@ -220,7 +220,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
                element_languageString.setLanguageString(preferredLanguageString);
 
-               if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
+               if (PreferencesUtil.isMultilanguageTextEditingCapability() || combo_language != null) {
                        combo_language.setSelection(preferredLanguageString == null?CdmStore.getDefaultLanguage():preferredLanguageString.getLanguage());
                        button.setEnabled(true);
                }

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 c3e5545a6d9265a5c66afb3933657dfa98665555..a916703db6299afdd61c7b515e0f2131c5f6d975 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
@@ -58,26 +58,19 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
 
     @Override
     public void createControls(ICdmFormElement element, int style) {
-//        final IAction switchAction = MediaViewSwitch.createSwitch(MediaMetaElement.this);
-//        Button btnToggleAdvancedMediaView = new Button(getBox(), style);
-//        btnToggleAdvancedMediaView.setToolTipText(switchAction.getText());
-//        btnToggleAdvancedMediaView.setImage(ImageResources.getImage(ImageResources.SWITCH_VIEW_TYPE));
-//        btnToggleAdvancedMediaView.addSelectionListener(new SelectionAdapter() {
-//            @Override
-//            public void widgetSelected(SelectionEvent e) {
-//                switchAction.run();
-//            }
-//        });
+
         setWarnForReferencingObjects(element, 2);
-        text_title = formFactory.createMultiLanguageTextElement(element, "Title", null, 50, style);
-//        text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style);
+        text_title = formFactory.createMultiLanguageTextElement(element, "Title", getEntity().getAllTitles(), 50, style);
+
         selection_artist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
                 element, "Artist", null, EntitySelectionElement.ALL, style);
         addElement(selection_artist);
 
         mediaCreated = formFactory.createTimePeriodElement(element, "Media Created", getEntity().getMediaCreated(), style);
         addElement(mediaCreated);
-        text_description = formFactory.createMultiLanguageTextElement(element, "Description", null, 200, SWT.WRAP);
+        if (getEntity() != null && getEntity().getAllDescriptions() != null && !getEntity().getAllDescriptions().isEmpty()) {
+               text_description = formFactory.createMultiLanguageTextElement(element, "Description", null, 50, SWT.WRAP);
+        }
 
 
         mediaDetailElement = formFactory.createMediaDetailElement(element);
@@ -106,7 +99,9 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
                selection_artist.setEntity(HibernateProxyHelper
                        .deproxy(element.getArtist()));
        
-               text_description.setMultilanguageText(element.getAllDescriptions());
+               if (text_description != null) {
+                       text_description.setMultilanguageText(element.getAllDescriptions());
+               }
                createTitle();
         }
     }