#4018 let the right side of the translation wizard empty, fix the save problem for...

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 43d12367bd75edc6df9b2d92845272be317869bd..8127fe192d3129911e4da9e39444199370933003 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
@@ -611,8 +611,8 @@ public class CdmFormFactory extends FormToolkit {
      *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
      *         object.
      */
-    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style) {
-        RepresentationElement element = new RepresentationElement(this, parentElement, representation, term, textHeight, style);
+    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style, boolean fillDetails) {
+        RepresentationElement element = new RepresentationElement(this, parentElement, representation, term, textHeight, style, fillDetails);
         adapt(element);
         parentElement.addElement(element);
         return element;
@@ -637,8 +637,8 @@ public class CdmFormFactory extends FormToolkit {
      *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
      *         object.
      */
-    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style) {
-        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, representation, term, textHeight, style);
+    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style, boolean fillDetails) {
+        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, representation, term, textHeight, style, fillDetails);
         adapt(element);
         parentElement.addElement(element);
         return element;
@@ -663,8 +663,8 @@ public class CdmFormFactory extends FormToolkit {
      *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
      *         object.
      */
-    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style) {
-        RepresentationElement element = new RepresentationElement(this, parentElement, term, textHeight, style);
+    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style, boolean fillDetails) {
+        RepresentationElement element = new RepresentationElement(this, parentElement, term, textHeight, style, fillDetails);
         adapt(element);
         parentElement.addElement(element);
         return element;
@@ -689,8 +689,8 @@ public class CdmFormFactory extends FormToolkit {
      *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
      *         object.
      */
-    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style) {
-        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, term, textHeight, style);
+    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style, boolean fillDetails) {
+        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, term, textHeight, style, fillDetails);
         adapt(element);
         parentElement.addElement(element);
         return element;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java
index 76b5d809583835bfc1ed2aa0bdead73a3a6dbf8d..b17f8e903cc3c1a6e299eed1666c2e498137da7b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java
@@ -72,7 +72,7 @@ SelectionListener{
          */
         public RepresentationElement(CdmFormFactory formFactory,
                 ICdmFormElement formElement, TermBase term,
-                Integer textHeight, int style) {
+                Integer textHeight, int style, boolean fill) {
             super(formFactory, formElement);
 
             formFactory.addPropertyChangeListener(this);
@@ -85,7 +85,7 @@ SelectionListener{
             if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                 createRepresentationEditingElements(formElement, style);
             }
-            setTerm(term);
+            setTerm(term, fill);
 
         }
 
@@ -111,7 +111,7 @@ SelectionListener{
          */
         public RepresentationElement(CdmFormFactory formFactory,
                 ICdmFormElement formElement, Representation representation, TermBase term,
-                Integer textHeight, int style) {
+                Integer textHeight, int style, boolean fill) {
             super(formFactory, formElement);
 
             formFactory.addPropertyChangeListener(this);
@@ -124,7 +124,7 @@ SelectionListener{
             if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                 createRepresentationEditingElements(formElement, style);
             }
-            setTerm(term);
+            setTerm(term, fill);
             setSelectedRepresentation(representation);
 
 
@@ -134,7 +134,7 @@ SelectionListener{
                 ICdmFormElement formElement, int style) {
 
             combo_language = formFactory.createDefinedTermComboElement(TermType.Language, formElement,
-                            "", null, false, style);
+                            "", null, true, style);
 
             combo_language.addSelectionListener(this);
 
@@ -201,13 +201,15 @@ SelectionListener{
          *            the multilanguageText to set
          */
         public void setTerm(
-                TermBase term) {
+                TermBase term, boolean update) {
             this.term = term;
 
             if (selectedRepresentation != null) {
                combo_language.setTerms(getLanguages());
             }
-            updateControls();
+            if (update){
+               updateControls();
+            }
         }
 
         /**
@@ -215,8 +217,7 @@ SelectionListener{
          */
         protected void updateControls() {
             Representation preferredRepresentation = term
-                    .getPreferredRepresentation(Arrays.asList(new Language[] { CdmStore
-                                    .getDefaultLanguage() }));
+                    .getPreferredRepresentation(PreferencesUtil.getGlobalLanguage() );
 
             element_Label.setText(preferredRepresentation.getLabel());
             element_abbrevLabel.setText(preferredRepresentation.getAbbreviatedLabel());
@@ -268,6 +269,8 @@ SelectionListener{
                         .getText();
                 selectedRepresentation.setText(text);
                 firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
+            } else if (eventSource == button){
+               firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
             }
         }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TranslatableRepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TranslatableRepresentationElement.java
index 6a2abe64862572a78311615e0dde5216e55cfdcc..7b78f75f9224d95c4bf88825b7c51fd7805f9132 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TranslatableRepresentationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TranslatableRepresentationElement.java
@@ -38,8 +38,8 @@ public class TranslatableRepresentationElement extends RepresentationElement {
      * @param isTranslationWizard
      */
     public TranslatableRepresentationElement(CdmFormFactory formFactory, ICdmFormElement formElement,
-            Representation representation, TermBase term, Integer textHeight, int style) {
-        super(formFactory, formElement, representation, term, textHeight, style);
+            Representation representation, TermBase term, Integer textHeight, int style, boolean fill) {
+        super(formFactory, formElement, representation, term, textHeight, style, fill);
 
     }
 
@@ -52,8 +52,8 @@ public class TranslatableRepresentationElement extends RepresentationElement {
      * @param style
      */
     public TranslatableRepresentationElement(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,
-            TermBase term, int textHeight, int style) {
-        super(cdmFormFactory, parentElement, term, textHeight, style);
+            TermBase term, int textHeight, int style, boolean fill) {
+        super(cdmFormFactory, parentElement, term, textHeight, style, fill);
     }
 
 
@@ -86,6 +86,8 @@ public class TranslatableRepresentationElement extends RepresentationElement {
                 combo_language.setTerms(getLanguages());
                 updateControls();
             }
+            
+            firePropertyChangeEvent( e);
 
         }
     }
@@ -102,8 +104,8 @@ public class TranslatableRepresentationElement extends RepresentationElement {
 
     @Override
     public void setTerm(
-            TermBase term) {
-        super.setTerm(term);
+            TermBase term, boolean update) {
+        super.setTerm(term, update);
         if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                button.setEnabled(false);
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
index af80ad4786f9db9643b3e3a30ee340fa2c57eb74..eaf1d4f297e5e4e23460c29022a055db9aa1437d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
@@ -52,7 +52,7 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
        protected void createControls(ICdmFormElement formElement,\r
                        T entity, int style) {\r
 \r
-               element_Representation = formFactory.createTranslatableRepresentationElement(formElement,  getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage()),getEntity(), 100, style);\r
+               element_Representation = formFactory.createTranslatableRepresentationElement(formElement,  getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage()),getEntity(), 100, style, true);\r
 \r
                uri_uri = formFactory.createUriWithLabelElement(formElement, "URI", getEntity().getUri(), style);\r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TermTranslationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TermTranslationWizardPage.java
index f2cd9e36bf389d909498b6e549fe0302a5e584c2..571e4c634cfac7c6807abf35c63ac2cb5f7fb61d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TermTranslationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TermTranslationWizardPage.java
@@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -38,7 +39,7 @@ import eu.etaxonomy.taxeditor.ui.element.RootElement;
 public class TermTranslationWizardPage extends WizardPage implements PropertyChangeListener{
 
 
-        private static int TEXT_HEIGHT = 400;
+        private static int TEXT_HEIGHT = 200;
 
         private final TermBase term;
 
@@ -116,10 +117,10 @@ public class TermTranslationWizardPage extends WizardPage implements PropertyCha
          * @param element
          */
         private void createLeftControls(ICdmFormElement element){
-            Representation preferredRepresentation= term.getPreferredRepresentation(CdmStore.getDefaultLanguage());
+            Representation preferredRepresentation= term.getPreferredRepresentation(PreferencesUtil.getGlobalLanguage());
 
-            text_source = formFactory.createRepresentationElement(element, preferredRepresentation,term,  TEXT_HEIGHT,  SWT.NULL);
-            text_source.setTerm(term);
+            text_source = formFactory.createRepresentationElement(element, preferredRepresentation,term,  TEXT_HEIGHT,  SWT.NULL, true);
+            text_source.setTerm(term, true);
 
 
         }
@@ -129,7 +130,7 @@ public class TermTranslationWizardPage extends WizardPage implements PropertyCha
          * @param element
          */
         private void createRightControls(ICdmFormElement element){
-            text_target = formFactory.createRepresentationElement(element, null, term, TEXT_HEIGHT, SWT.NULL);
+            text_target = formFactory.createRepresentationElement(element, null, term, TEXT_HEIGHT, SWT.NULL, false);
         }
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
index d6554715cab4fb51469bed56ee0e1fcecbffe2f5..bbdec86ec59239ac895458a63c5300f622916c80 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
@@ -10,6 +10,9 @@
 
 package eu.etaxonomy.taxeditor.view.detail;
 
+import java.awt.Event;
+import java.util.EventObject;
+
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.widgets.Control;
@@ -121,6 +124,9 @@ public class CdmSectionPart<T> extends SectionPart implements
                if (event != null) {
 
                        Object eventSource = event.getSource();
+                       if (eventSource instanceof EventObject){
+                               eventSource = ((EventObject)eventSource).getSource();
+                       }
                        Control[] children = formSection.getLayoutComposite().getChildren();
                        boolean containsElement = false;
                        for (Control control : children) {