Project

General

Profile

« Previous | Next » 

Revision 5cabd426

Added by Katja Luther over 2 years ago

fix #9747: add language detail element and smaller changes in menu

View differences:

eu.etaxonomy.taxeditor.store/fragment.e4xmi
24 24 
            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_2G0O8IfREeecZ4F2Y9Z0Og" coreExpressionId="isShowExperimentalFeatures"/>
25 25 
          </children>
26 26 
        </children>
27 
        <children xsi:type="menu:MenuSeparator" xmi:id="_XF10EFvsEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.18"/>
28 27 
        <children xsi:type="menu:DynamicMenuContribution" xmi:id="_rzOGUEBGEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="%handledmenuitem.label.52" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
29 28 
        <children xsi:type="menu:MenuSeparator" xmi:id="_YBargFvsEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.19"/>
30 29 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_aHm7kEAVEembfJNLZI9wiA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.moveto" label="%handledmenuitem.label.15" command="_d6YpoEAVEembfJNLZI9wiA"/>
......
218 217 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_YFuh4Dq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel31" label="%handledmenuitem.label.31" command="_n5NykDoqEeud_N8qGaxX2Q">
219 218 
          <parameters xmi:id="_Yh7VsDq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.structureEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STMO"/>
220 219 
        </children>
221 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_SdyUcBRzEeyXBtmKIs_ZEQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitem51" label="%handledmenuitem.label.51" command="_n5NykDoqEeud_N8qGaxX2Q">
222 
          <parameters xmi:id="_vX7vkBRzEeyXBtmKIs_ZEQ" elementId="eu.etaxonomy.taxeditor.store.parameter.languageEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="LA"/>
223 
        </children>
224 220 
        <children xsi:type="menu:MenuSeparator" xmi:id="_6DMs8Dq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.1"/>
225 221 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_3HtMMDq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel20" label="%handledmenuitem.label.20" command="_n5NykDoqEeud_N8qGaxX2Q">
226 222 
          <parameters xmi:id="_BhV5gDq-EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NA"/>
......
239 235 
          <parameters xmi:id="_7knOQFycEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.TaxonNodeAgentRelationTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="TART"/>
240 236 
        </children>
241 237 
        <children xsi:type="menu:MenuSeparator" xmi:id="_udLdUDrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.2"/>
238 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_SdyUcBRzEeyXBtmKIs_ZEQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitem51" label="%handledmenuitem.label.51" command="_n5NykDoqEeud_N8qGaxX2Q">
239 
          <parameters xmi:id="_vX7vkBRzEeyXBtmKIs_ZEQ" elementId="eu.etaxonomy.taxeditor.store.parameter.languageEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="LA"/>
240 
        </children>
241 
        <children xsi:type="menu:MenuSeparator" xmi:id="_XMZnQBX1EeyiffPRqvqPYg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.16"/>
242 242 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_2CLf0DrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.34" command="_n5NykDoqEeud_N8qGaxX2Q">
243 243 
          <parameters xmi:id="_2CLf0TrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="ANT"/>
244 244 
        </children>
......
275 275 
          <parameters xmi:id="_3rgiITuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="DMA"/>
276 276 
        </children>
277 277 
      </children>
278 
      <children xsi:type="menu:MenuSeparator" xmi:id="_yRINcIfqEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menuseparator.3"/>
279 278 
      <children xsi:type="menu:Menu" xmi:id="_5wQLUMKNEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menu.term_tree_editor" label="%handledmenuitem.label.8" tooltip="%handledmenuitem.tooltip.1">
280 279 
        <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_4ic9QMTDEemAeKumL6iTpg" coreExpressionId="isCdmStoreConnected"/>
281 280 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_rwfDkIftEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.24" tooltip="%handledmenuitem.label.24" command="_8aaicD4fEeuM4JU-Ch98ZA">
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
379 379 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.DefinedTermDetailElement;
380 380 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.DefinedTermDetailSection;
381 381 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.FeatureDetailElement;
382 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.LanguageDetailElement;
382 383 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.MeasurementUnitCollectionElement;
383 384 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.MeasurementUnitCollectionSection;
384 385 
import eu.etaxonomy.taxeditor.ui.section.vocabulary.MeasurementUnitDtoCollectionElement;
......
1797 1798 
            element = new FeatureDetailElement(this, parentElement);
1798 1799 
        } else if(definedTermClass.equals(PresenceAbsenceTerm.class)){
1799 1800 
            element = new PresenceAbsenceTermDetailElement(this, parentElement);
1801 
        } else if(definedTermClass.equals(Language.class)){
1802 
            element = new LanguageDetailElement(this, parentElement);
1800 1803 
        } else {
1801 1804 
            element = new DefinedTermDetailElement(this, parentElement);
1802 1805 
        }
......
3422 3425 
        else {
3423 3426 
            throw new IllegalStateException("There is no interface for the given description element");
3424 3427 
        }
3428 
        detailedDescriptionElement.setEnabled(enabled);
3425 3429 
        adapt(detailedDescriptionElement);
3426 3430 
        parentElement.addElement(detailedDescriptionElement);
3427 3431 
        return detailedDescriptionElement;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/LanguageDetailElement.java
1 
/**
2 
* Copyright (C) 2021 EDIT
3 
* European Distributed Institute of Taxonomy
4 
* http://www.e-taxonomy.eu
5 
*
6 
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 
* See LICENSE.TXT at the top of this package for the full license terms.
8 
*/
9 
package eu.etaxonomy.taxeditor.ui.section.vocabulary;
10 

  		




  
  11
  
    
import org.apache.commons.lang3.StringUtils;


  		




  
  12
  
    

  		




  
  13
  
    
import eu.etaxonomy.cdm.model.common.Language;


  		




  
  14
  
    
import eu.etaxonomy.cdm.model.term.TermVocabulary;


  		




  
  15
  
    
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;


  		




  
  16
  
    
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;


  		




  
  17
  
    
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;


  		




  
  18
  
    

  		




  
  19
  
    
/**


  		




  
  20
  
    
 * @author k.luther


  		




  
  21
  
    
 * @since Sep 15, 2021


  		




  
  22
  
    
 */


  		




  
  23
  
    
public class LanguageDetailElement extends AbstractTermBaseDetailElement<Language> {


  		




  
  24
  
    

  		




  
  25
  
    
    protected TextWithLabelElement textIdInVocabulary;


  		




  
  26
  
    

  		




  
  27
  
    
    protected TextWithLabelElement textISO_639_1;


  		




  
  28
  
    

  		




  
  29
  
    
    protected TextWithLabelElement textSymbol;


  		




  
  30
  
    

  		




  
  31
  
    
    protected TextWithLabelElement textSymbol2;


  		




  
  32
  
    

  		




  
  33
  
    

  		




  
  34
  
    
    /**


  		




  
  35
  
    
     * @param formFactory


  		




  
  36
  
    
     * @param formElement


  		




  
  37
  
    
     */


  		




  
  38
  
    
    public LanguageDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {


  		




  
  39
  
    
        super(formFactory, formElement);


  		




  
  40
  
    

  		




  
  41
  
    
    }


  		




  
  42
  
    

  		




  
  43
  
    
    @Override


  		




  
  44
  
    
    protected void createControls(ICdmFormElement formElement, Language entity, int style) {


  		




  
  45
  
    
        super.createControls(formElement, entity, style);


  		




  
  46
  
    
        textIdInVocabulary = formFactory.createTextWithLabelElement(formElement, "ID in vocabulary", entity.getIdInVocabulary(), style);


  		




  
  47
  
    
        textISO_639_1 = formFactory.createTextWithLabelElement(formElement, "ID in ISO 639-1", entity.getIdInVocabulary(), style);


  		




  
  48
  
    
        textSymbol = formFactory.createTextWithLabelElement(formElement, "Symbol", entity.getSymbol(), style);


  		




  
  49
  
    
        textSymbol2 = formFactory.createTextWithLabelElement(formElement, "Symbol 2", entity.getSymbol2(), style);


  		




  
  50
  
    
    };


  		




  
  51
  
    

  		




  
  52
  
    
    @Override


  		




  
  53
  
    
    public void handleEvent(Object eventSource) {


  		




  
  54
  
    
        super.handleEvent(eventSource);


  		




  
  55
  
    
        //handleRepresentation(eventSource);


  		




  
  56
  
    
        if(eventSource==textIdInVocabulary){


  		




  
  57
  
    
            if (StringUtils.isBlank(textIdInVocabulary.getText())){


  		




  
  58
  
    
                getEntity().setIdInVocabulary(null);


  		




  
  59
  
    
            }else{


  		




  
  60
  
    
                getEntity().setIdInVocabulary(textIdInVocabulary.getText());


  		




  
  61
  
    
            }


  		




  
  62
  
    

  		




  
  63
  
    
        }


  		




  
  64
  
    
        if(eventSource==textSymbol){


  		




  
  65
  
    
            if (StringUtils.isBlank(textSymbol.getText())){


  		




  
  66
  
    
                getEntity().setSymbol(null);


  		




  
  67
  
    
            }else{


  		




  
  68
  
    
                getEntity().setSymbol(textSymbol.getText());


  		




  
  69
  
    
            }


  		




  
  70
  
    

  		




  
  71
  
    
        }


  		




  
  72
  
    

  		




  
  73
  
    
        if(eventSource==textSymbol2){


  		




  
  74
  
    
            if (StringUtils.isBlank(textSymbol2.getText())){


  		




  
  75
  
    
                getEntity().setSymbol2(null);


  		




  
  76
  
    
            }else{


  		




  
  77
  
    
                getEntity().setSymbol2(textSymbol2.getText());


  		




  
  78
  
    
            }


  		




  
  79
  
    

  		




  
  80
  
    
        }


  		




  
  81
  
    
        if (eventSource == textISO_639_1){


  		




  
  82
  
    
            if (StringUtils.isBlank(textISO_639_1.getText())){


  		




  
  83
  
    
                getEntity().setIso639_1(null);


  		




  
  84
  
    
            }else{


  		




  
  85
  
    
                getEntity().setIso639_1(textISO_639_1.getText());


  		




  
  86
  
    
            }


  		




  
  87
  
    
        }


  		




  
  88
  
    
    }


  		




  
  89
  
    

  		




  
  90
  
    
    @Override


  		




  
  91
  
    
    public TermVocabulary getVocabulary() {


  		




  
  92
  
    
        return getEntity() != null ? getEntity().getVocabulary() : null;


  		




  
  93
  
    
    }


  		




  
  94
  
    

  		




  
  95
  
    

  		




  
  96
  
    
}


  		












Also available in:  Unified diff