Project

General

Profile

« Previous | Next » 

Revision 96615335

Added by Katja Luther over 5 years ago

ref #7901: adapt taxeditor to changes in PreferencePredicates

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
40 40 
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
41 41 
import eu.etaxonomy.cdm.model.description.TaxonDescription;
42 42 
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
43 
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
43 44 
import eu.etaxonomy.cdm.model.name.TaxonName;
44 45 
import eu.etaxonomy.cdm.model.taxon.Taxon;
45 46 
import eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4;
47 
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
46 48 
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
47 
import eu.etaxonomy.taxeditor.preference.TermDisplayEnum;
48 49 
import eu.etaxonomy.taxeditor.store.CdmStore;
49 50 

  		




  50
  51
  
    
/**


  		




  ......




  161
  162
  
    
    private SortedSet<DefinedTermBase> loadNamedAreas() {


  		




  162
  163
  
    
        //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();


  		




  163
  164
  
    

  		




  164
  
  
    
        String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  
  165
  
    
        String valuesAreas = PreferencesUtil.getStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  165
  166
  
    
        String values = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());


  		




  166
  167
  
    
        if (values != null && values != "") { //$NON-NLS-1$


  		




  167
  168
  
    
            String[] split = values.split(";"); //$NON-NLS-1$


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java
    
  





  40
  40
  
    
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;


  		




  41
  41
  
    
import eu.etaxonomy.cdm.model.description.TaxonDescription;


  		




  42
  42
  
    
import eu.etaxonomy.cdm.model.location.NamedArea;


  		




  
  43
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  43
  44
  
    
import eu.etaxonomy.cdm.model.taxon.Taxon;


  		




  44
  45
  
    
import eu.etaxonomy.taxeditor.event.EventUtility;


  		




  45
  46
  
    
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;


  		




  46
  47
  
    
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;


  		




  47
  48
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  48
  
  
    
import eu.etaxonomy.taxeditor.preference.TermDisplayEnum;


  		




  49
  49
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  50
  50
  
    

  		




  51
  51
  
    
public final class DistributionEditingSupportE4 extends EditingSupport {


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditor.java
    
  





  91
  91
  
    
import eu.etaxonomy.taxeditor.editor.EditorUtil;


  		




  92
  92
  
    
import eu.etaxonomy.taxeditor.editor.l10n.Messages;


  		




  93
  93
  
    
import eu.etaxonomy.taxeditor.model.AbstractUtility;


  		




  
  94
  
    
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;


  		




  94
  95
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  95
  96
  
    
import eu.etaxonomy.taxeditor.preference.Resources;


  		




  96
  97
  
    
import eu.etaxonomy.taxeditor.preference.wizard.AvailableDistributionWizard;


  		




  ......




  575
  576
  
    
    private SortedSet<DefinedTermBase> loadNamedAreas() {


  		




  576
  577
  
    
        //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();


  		




  577
  578
  
    

  		




  578
  
  
    
        String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  
  579
  
    
        String valuesAreas = PreferencesUtil.getStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  579
  580
  
    
        String values = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());


  		




  580
  581
  
    
        if (values != null && values != "") { //$NON-NLS-1$


  		




  581
  582
  
    
            String[] split = values.split(";"); //$NON-NLS-1$


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusDataDisplayConverter.java
    
  





  17
  17
  
    
import eu.etaxonomy.cdm.model.common.Representation;


  		




  18
  18
  
    
import eu.etaxonomy.cdm.model.description.Distribution;


  		




  19
  19
  
    
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;


  		




  
  20
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  20
  21
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  21
  
  
    
import eu.etaxonomy.taxeditor.preference.TermDisplayEnum;


  		




  22
  22
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  23
  23
  
    

  		




  24
  24
  
    
/**


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusDisplayConverter.java
    
  





  14
  14
  
    
import eu.etaxonomy.cdm.model.common.Representation;


  		




  15
  15
  
    
import eu.etaxonomy.cdm.model.description.Distribution;


  		




  16
  16
  
    
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;


  		




  
  17
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  17
  18
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  18
  
  
    
import eu.etaxonomy.taxeditor.preference.TermDisplayEnum;


  		




  19
  19
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  20
  20
  
    

  		




  21
  21
  
    
/**


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/listener/ChecklistModifyListener.java
    
  





  8
  8
  
    
*/


  		




  9
  9
  
    
package eu.etaxonomy.taxeditor.editor.view.checklist.listener;


  		




  10
  10
  
    

  		




  11
  
  
    
import org.eclipse.jface.viewers.TableViewer;


  		




  
  11
  
    
import org.eclipse.jface.viewers.Viewer;


  		




  12
  12
  
    
import org.eclipse.swt.events.ModifyEvent;


  		




  13
  13
  
    
import org.eclipse.swt.events.ModifyListener;


  		




  14
  14
  
    
import org.eclipse.swt.widgets.Text;


  		




  ......




  23
  23
  
    
public class ChecklistModifyListener implements ModifyListener {


  		




  24
  24
  
    

  		




  25
  25
  
    
    private final Text searchText;


  		




  26
  
  
    
    private final TableViewer viewer;


  		




  
  26
  
    
    private final Viewer editor;


  		




  27
  27
  
    
    private final ChecklistEditorFilter filter;


  		




  28
  28
  
    

  		




  29
  29
  
    
    /**


  		




  30
  30
  
    
     *


  		




  31
  31
  
    
     */


  		




  32
  
  
    
    public ChecklistModifyListener(TableViewer viewer, ChecklistEditorFilter filter, Text searchText) {


  		




  33
  
  
    
        this.viewer = viewer;


  		




  
  32
  
    
    public ChecklistModifyListener(Viewer editor, ChecklistEditorFilter filter, Text searchText) {


  		




  
  33
  
    
        this.editor = editor;


  		




  34
  34
  
    
        this.filter = filter;


  		




  35
  35
  
    
        this.searchText = searchText;


  		




  36
  36
  
    
    }


  		




  ......




  41
  41
  
    
    @Override


  		




  42
  42
  
    
    public void modifyText(ModifyEvent e) {


  		




  43
  43
  
    
        filter.setSearchText(searchText.getText());


  		




  44
  
  
    
        viewer.refresh();


  		




  
  44
  
    

  		




  45
  45
  
    
    }


  		




  46
  46
  
    

  		




  47
  47
  
    
}


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
import eu.etaxonomy.cdm.model.metadata.CdmPreference;


  		




  27
  27
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  
  28
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  28
  29
  
    
import eu.etaxonomy.taxeditor.l10n.Messages;


  		




  29
  30
  
    
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;


  		




  30
  31
  
    
import eu.etaxonomy.taxeditor.ui.element.CommandHandlerButton;


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/EditorPreferencePredicate.java
    
  





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


  		




  17
  17
  
    
import eu.etaxonomy.cdm.model.metadata.IPreferencePredicate;


  		




  18
  18
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  
  19
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  19
  20
  
    

  		




  20
  21
  
    
/**


  		




  21
  22
  
    
 * @author k.luther


  		




  ......




  68
  69
  
    
    DisplayOfStatus(UUID.fromString("1ee6b945-0a81-4f05-b867-f9d105882249"), "Distribution Editor: Display of Status", "distribution.editor.status.display", TermDisplayEnum.Title),


  		




  69
  70
  
    
    DisplayOfAreasInDistributionEditor(UUID.fromString("7b671bba-1b7f-4cb9-bbac-c914518a4bf8"), "Distribution Editor: Display of Areas", "distribution.editor.areas.displayAreas",  TermDisplayEnum.Title),


  		




  70
  71
  
    
    OwnDescriptionForDistributionEditor(UUID.fromString("38282571-049c-473e-bec3-bde6f65f796a"), "Distribution Editor: Create distribution editor TaxonDescription", "distribution.editor.distributionOwnDescription",  Boolean.FALSE),


  		




  
  72
  
    
    AvailableDistributionAreaTerms(UUID.fromString("34469acc-9e23-4f95-92d4-1695e02cb5a0"), "Available Distribution Area Terms", "distribution.area.terms", null),  //default: all/no filter


  		




  71
  73
  
    

  		




  72
  74
  
    

  		




  73
  75
  
    
    ShowRankInDistributionEditor(UUID.fromString("fb13b4f2-2d82-4fd3-8abe-2b955a695245"), "Distribution Editor: Show Rank", "distribution.editor.showRank", Boolean.FALSE),


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
    
  





  56
  56
  
    
import eu.etaxonomy.cdm.model.metadata.IPreferencePredicate;


  		




  57
  57
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  58
  58
  
    
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;


  		




  
  59
  
    
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;


  		




  59
  60
  
    
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;


  		




  60
  61
  
    
import eu.etaxonomy.cdm.strategy.match.DefaultMatchStrategy;


  		




  61
  62
  
    
import eu.etaxonomy.cdm.strategy.match.FieldMatcher;


  		




  ......




  1789
  1790
  
    
public static void setPreferredNamedAreasForDistributionEditor(


  		




  1790
  1791
  
    
        String saveCheckedElements, String saveGrayedElements, boolean local) {


  		




  1791
  1792
  
    
    if (local){


  		




  1792
  
  
    
        setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);


  		




  
  1793
  
    
        setStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);


  		




  1793
  1794
  
    

  		




  1794
  1795
  
    
    }


  		




  1795
  1796
  
    
    else{


  		




  1796
  1797
  
    
        CdmPreference preference = null;


  		




  1797
  1798
  
    

  		




  1798
  1799
  
    
        if (saveCheckedElements == null){


  		




  1799
  
  
    
            preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaTerms);


  		




  
  1800
  
    
            preference = getPreferenceFromDB(EditorPreferencePredicate.AvailableDistributionAreaTerms);


  		




  1800
  1801
  
    

  		




  1801
  1802
  
    
            if (preference == null){


  		




  1802
  1803
  
    
                return ;


  		




  1803
  1804
  
    
            } else{


  		




  1804
  
  
    
                setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),


  		




  
  1805
  
    
                setStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey(),


  		




  1805
  1806
  
    
                        saveCheckedElements);


  		




  1806
  
  
    
                preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);


  		




  
  1807
  
    
                preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);


  		




  1807
  1808
  
    
                setPreferenceToDB(preference);


  		




  1808
  1809
  
    

  		




  1809
  1810
  
    
            }


  		




  1810
  1811
  
    
        } else{


  		




  1811
  
  
    
           preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);


  		




  
  1812
  
    
           preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);


  		




  1812
  1813
  
    
           setPreferenceToDB(preference);


  		




  1813
  
  
    
           setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),


  		




  
  1814
  
    
           setStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey(),


  		




  1814
  1815
  
    
                    saveCheckedElements);


  		




  1815
  1816
  
    

  		




  1816
  1817
  
    
        }


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermDisplayEnum.java
    
  





  1
  
  
    
/**


  		




  2
  
  
    
* Copyright (C) 2018 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.preference;


  		




  10
  
  
    

  		




  11
  
  
    
/**


  		




  12
  
  
    
 * @author k.luther


  		




  13
  
  
    
 * @since 15.11.2018


  		




  14
  
  
    
 *


  		




  15
  
  
    
 */


  		




  16
  
  
    
public enum TermDisplayEnum {


  		




  17
  
  
    

  		




  18
  
  
    
    IdInVocabulary("IdInVocabulary", "Show IdInVocabulary"),


  		




  19
  
  
    
    Symbol1("Symbol1", "Show Symbol1"),


  		




  20
  
  
    
    Symbol2("Symbol2", "Show Symbol2"),


  		




  21
  
  
    
    Title("Title", "Show Title");


  		




  22
  
  
    

  		




  23
  
  
    
    String label;


  		




  24
  
  
    
    String key;


  		




  25
  
  
    

  		




  26
  
  
    
    private TermDisplayEnum(String key, String label){


  		




  27
  
  
    
        this.label = label;


  		




  28
  
  
    
        this.key = key;


  		




  29
  
  
    
    }


  		




  30
  
  
    

  		




  31
  
  
    
    public String getLabel(){


  		




  32
  
  
    
        return label;


  		




  33
  
  
    
    }


  		




  34
  
  
    

  		




  35
  
  
    
    public String getKey(){


  		




  36
  
  
    
        return key;


  		




  37
  
  
    
    }


  		




  38
  
  
    
}


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java
    
  





  26
  26
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  27
  27
  
    
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;


  		




  28
  28
  
    
import eu.etaxonomy.taxeditor.l10n.Messages;


  		




  
  29
  
    
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;


  		




  29
  30
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  30
  31
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  31
  32
  
    

  		




  ......




  53
  54
  
    

  		




  54
  55
  
    
    @Override


  		




  55
  56
  
    
    protected String getCheckedValuesFromPreferences() {


  		




  56
  
  
    
        String checkedValues = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  
  57
  
    
        String checkedValues = PreferencesUtil.getStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey());


  		




  57
  58
  
    

  		




  58
  59
  
    
        return checkedValues;


  		




  59
  60
  
    
    }


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionWizard.java
    
  





  16
  16
  
    
import org.apache.commons.lang.StringUtils;


  		




  17
  17
  
    
import org.eclipse.jface.wizard.Wizard;


  		




  18
  18
  
    

  		




  19
  
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  20
  19
  
    
import eu.etaxonomy.cdm.persistence.dto.TermDto;


  		




  21
  20
  
    
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;


  		




  22
  21
  
    
import eu.etaxonomy.taxeditor.l10n.Messages;


  		




  
  22
  
    
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;


  		




  23
  23
  
    
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;


  		




  24
  24
  
    

  		




  25
  25
  
    
/**


  		




  ......




  73
  73
  
    
            //ToDo, if whole vocabulary is selected, save the vocabulary not all areas


  		




  74
  74
  
    

  		




  75
  75
  
    
           // PreferencesUtil.setPreferredNamedAreasForDistributionEditor(saveCheckedElements, saveGrayedElements, false);


  		




  76
  
  
    
            PreferencesUtil.setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);


  		




  
  76
  
    
            PreferencesUtil.setStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);


  		




  77
  77
  
    
            return true;


  		




  78
  78
  
    
        } else {


  		




  79
  79
  
    
            return false;


  		












Also available in:  Unified diff