Project

General

Profile

« Previous | Next » 

Revision 3fa460e5

Added by Katja Luther almost 8 years ago

#4018 let the right side of the translation wizard empty, fix the save problem for adding a neww representation for terms

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
611 611
     *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
612 612
     *         object.
613 613
     */
614
    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style) {
615
        RepresentationElement element = new RepresentationElement(this, parentElement, representation, term, textHeight, style);
614
    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style, boolean fillDetails) {
615
        RepresentationElement element = new RepresentationElement(this, parentElement, representation, term, textHeight, style, fillDetails);
616 616
        adapt(element);
617 617
        parentElement.addElement(element);
618 618
        return element;
......
637 637
     *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
638 638
     *         object.
639 639
     */
640
    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style) {
641
        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, representation, term, textHeight, style);
640
    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, Representation representation, TermBase term,int textHeight, int style, boolean fillDetails) {
641
        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, representation, term, textHeight, style, fillDetails);
642 642
        adapt(element);
643 643
        parentElement.addElement(element);
644 644
        return element;
......
663 663
     *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
664 664
     *         object.
665 665
     */
666
    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style) {
667
        RepresentationElement element = new RepresentationElement(this, parentElement, term, textHeight, style);
666
    public RepresentationElement createRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style, boolean fillDetails) {
667
        RepresentationElement element = new RepresentationElement(this, parentElement, term, textHeight, style, fillDetails);
668 668
        adapt(element);
669 669
        parentElement.addElement(element);
670 670
        return element;
......
689 689
     *         {@link eu.etaxonomy.taxeditor.ui.element.RepresentationElement}
690 690
     *         object.
691 691
     */
692
    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style) {
693
        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, term, textHeight, style);
692
    public TranslatableRepresentationElement createTranslatableRepresentationElement(ICdmFormElement parentElement, TermBase term, int textHeight, int style, boolean fillDetails) {
693
        TranslatableRepresentationElement element = new TranslatableRepresentationElement(this, parentElement, term, textHeight, style, fillDetails);
694 694
        adapt(element);
695 695
        parentElement.addElement(element);
696 696
        return element;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java
72 72
         */
73 73
        public RepresentationElement(CdmFormFactory formFactory,
74 74
                ICdmFormElement formElement, TermBase term,
75
                Integer textHeight, int style) {
75
                Integer textHeight, int style, boolean fill) {
76 76
            super(formFactory, formElement);
77 77

  
78 78
            formFactory.addPropertyChangeListener(this);
......
85 85
            if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
86 86
                createRepresentationEditingElements(formElement, style);
87 87
            }
88
            setTerm(term);
88
            setTerm(term, fill);
89 89

  
90 90
        }
91 91

  
......
111 111
         */
112 112
        public RepresentationElement(CdmFormFactory formFactory,
113 113
                ICdmFormElement formElement, Representation representation, TermBase term,
114
                Integer textHeight, int style) {
114
                Integer textHeight, int style, boolean fill) {
115 115
            super(formFactory, formElement);
116 116

  
117 117
            formFactory.addPropertyChangeListener(this);
......
124 124
            if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
125 125
                createRepresentationEditingElements(formElement, style);
126 126
            }
127
            setTerm(term);
127
            setTerm(term, fill);
128 128
            setSelectedRepresentation(representation);
129 129

  
130 130

  
......
134 134
                ICdmFormElement formElement, int style) {
135 135

  
136 136
            combo_language = formFactory.createDefinedTermComboElement(TermType.Language, formElement,
137
                            "", null, false, style);
137
                            "", null, true, style);
138 138

  
139 139
            combo_language.addSelectionListener(this);
140 140

  
......
201 201
         *            the multilanguageText to set
202 202
         */
203 203
        public void setTerm(
204
                TermBase term) {
204
                TermBase term, boolean update) {
205 205
            this.term = term;
206 206

  
207 207
            if (selectedRepresentation != null) {
208 208
               combo_language.setTerms(getLanguages());
209 209
            }
210
            updateControls();
210
            if (update){
211
            	updateControls();
212
            }
211 213
        }
212 214

  
213 215
        /**
......
215 217
         */
216 218
        protected void updateControls() {
217 219
            Representation preferredRepresentation = term
218
                    .getPreferredRepresentation(Arrays.asList(new Language[] { CdmStore
219
                                    .getDefaultLanguage() }));
220
                    .getPreferredRepresentation(PreferencesUtil.getGlobalLanguage() );
220 221

  
221 222
            element_Label.setText(preferredRepresentation.getLabel());
222 223
            element_abbrevLabel.setText(preferredRepresentation.getAbbreviatedLabel());
......
268 269
                        .getText();
269 270
                selectedRepresentation.setText(text);
270 271
                firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
272
            } else if (eventSource == button){
273
            	firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
271 274
            }
272 275
        }
273 276

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TranslatableRepresentationElement.java
38 38
     * @param isTranslationWizard
39 39
     */
40 40
    public TranslatableRepresentationElement(CdmFormFactory formFactory, ICdmFormElement formElement,
41
            Representation representation, TermBase term, Integer textHeight, int style) {
42
        super(formFactory, formElement, representation, term, textHeight, style);
41
            Representation representation, TermBase term, Integer textHeight, int style, boolean fill) {
42
        super(formFactory, formElement, representation, term, textHeight, style, fill);
43 43

  
44 44
    }
45 45

  
......
52 52
     * @param style
53 53
     */
54 54
    public TranslatableRepresentationElement(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,
55
            TermBase term, int textHeight, int style) {
56
        super(cdmFormFactory, parentElement, term, textHeight, style);
55
            TermBase term, int textHeight, int style, boolean fill) {
56
        super(cdmFormFactory, parentElement, term, textHeight, style, fill);
57 57
    }
58 58

  
59 59

  
......
86 86
                combo_language.setTerms(getLanguages());
87 87
                updateControls();
88 88
            }
89
            
90
            firePropertyChangeEvent( e);
89 91

  
90 92
        }
91 93
    }
......
102 104

  
103 105
    @Override
104 106
    public void setTerm(
105
            TermBase term) {
106
        super.setTerm(term);
107
            TermBase term, boolean update) {
108
        super.setTerm(term, update);
107 109
        if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
108 110
        	button.setEnabled(false);
109 111
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
52 52
	protected void createControls(ICdmFormElement formElement,
53 53
			T entity, int style) {
54 54

  
55
		element_Representation = formFactory.createTranslatableRepresentationElement(formElement,  getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage()),getEntity(), 100, style);
55
		element_Representation = formFactory.createTranslatableRepresentationElement(formElement,  getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage()),getEntity(), 100, style, true);
56 56

  
57 57
		uri_uri = formFactory.createUriWithLabelElement(formElement, "URI", getEntity().getUri(), style);
58 58

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TermTranslationWizardPage.java
27 27
import eu.etaxonomy.cdm.model.common.Language;
28 28
import eu.etaxonomy.cdm.model.common.Representation;
29 29
import eu.etaxonomy.cdm.model.common.TermBase;
30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
30 31
import eu.etaxonomy.taxeditor.store.CdmStore;
31 32
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
32 33
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
......
38 39
public class TermTranslationWizardPage extends WizardPage implements PropertyChangeListener{
39 40

  
40 41

  
41
        private static int TEXT_HEIGHT = 400;
42
        private static int TEXT_HEIGHT = 200;
42 43

  
43 44
        private final TermBase term;
44 45

  
......
116 117
         * @param element
117 118
         */
118 119
        private void createLeftControls(ICdmFormElement element){
119
            Representation preferredRepresentation= term.getPreferredRepresentation(CdmStore.getDefaultLanguage());
120
            Representation preferredRepresentation= term.getPreferredRepresentation(PreferencesUtil.getGlobalLanguage());
120 121

  
121
            text_source = formFactory.createRepresentationElement(element, preferredRepresentation,term,  TEXT_HEIGHT,  SWT.NULL);
122
            text_source.setTerm(term);
122
            text_source = formFactory.createRepresentationElement(element, preferredRepresentation,term,  TEXT_HEIGHT,  SWT.NULL, true);
123
            text_source.setTerm(term, true);
123 124

  
124 125

  
125 126
        }
......
129 130
         * @param element
130 131
         */
131 132
        private void createRightControls(ICdmFormElement element){
132
            text_target = formFactory.createRepresentationElement(element, null, term, TEXT_HEIGHT, SWT.NULL);
133
            text_target = formFactory.createRepresentationElement(element, null, term, TEXT_HEIGHT, SWT.NULL, false);
133 134
        }
134 135

  
135 136

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
10 10

  
11 11
package eu.etaxonomy.taxeditor.view.detail;
12 12

  
13
import java.awt.Event;
14
import java.util.EventObject;
15

  
13 16
import org.eclipse.jface.util.IPropertyChangeListener;
14 17
import org.eclipse.jface.util.PropertyChangeEvent;
15 18
import org.eclipse.swt.widgets.Control;
......
121 124
		if (event != null) {
122 125

  
123 126
			Object eventSource = event.getSource();
127
			if (eventSource instanceof EventObject){
128
				eventSource = ((EventObject)eventSource).getSource();
129
			}
124 130
			Control[] children = formSection.getLayoutComposite().getChildren();
125 131
			boolean containsElement = false;
126 132
			for (Control control : children) {

Also available in: Unified diff