Project

General

Profile

« Previous | Next » 

Revision 943e9b24

Added by Katja Luther over 5 years ago

ref #7854: show details for distributions and reload after changing the areas in distribution editor

View differences:

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

  		




  13
  13
  
    
import java.util.ArrayList;


  		




  14
  14
  
    
import java.util.Arrays;


  		




  15
  
  
    
import java.util.Collection;


  		




  16
  15
  
    
import java.util.Collections;


  		




  17
  16
  
    
import java.util.HashMap;


  		




  18
  17
  
    
import java.util.List;


  		




  ......




  638
  637
  
    
      //create new Items for Dropdown menue


  		




  639
  638
  
    
        Table table = viewer.getTable();


  		




  640
  639
  
    
        table.setRedraw(false);


  		




  641
  
  
    
        Collection<DefinedTermBase> oldTerms = labelProvider.getNamedAreas(false);


  		




  642
  
  
    

  		




  643
  640
  
    
        SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas(true);


  		




  644
  641
  
    

  		




  645
  642
  
    

  		




  ......




  679
  676
  
    
              }


  		




  680
  677
  
    
          }


  		




  681
  678
  
    
          TableViewerColumn column= addTableViewerColumn(termLable, 200, areaPosition.get(term.getUuid()), term);


  		




  682
  
  
    
          System.err.println(column.getColumn().getText() + " index: " +areaPosition.get(term.getUuid()) );


  		




  
  679
  
    

  		




  683
  680
  
    

  		




  684
  681
  
    
      }


  		




  685
  682
  
    

  		




  ......




  813
  810
  
    
     *


  		




  814
  811
  
    
     * @see org.eclipse.ui.forms.editor.FormEditor#isDirty()


  		




  815
  812
  
    
     */


  		




  
  813
  
    
    @Override


  		




  816
  814
  
    
    public boolean isDirty() {


  		




  817
  815
  
    
        return dirty.isDirty();


  		




  818
  816
  
    
    }


  		












  

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





  10
  10
  
    

  		




  11
  11
  
    
import java.util.ArrayList;


  		




  12
  12
  
    
import java.util.Arrays;


  		




  13
  
  
    
import java.util.Collection;


  		




  14
  13
  
    
import java.util.HashMap;


  		




  15
  14
  
    
import java.util.HashSet;


  		




  16
  15
  
    
import java.util.List;


  		




  ......




  75
  74
  
    
import eu.etaxonomy.cdm.model.common.TermIdInVocabularyComparator;


  		




  76
  75
  
    
import eu.etaxonomy.cdm.model.common.TermLanguageComparator;


  		




  77
  76
  
    
import eu.etaxonomy.cdm.model.common.TermVocabulary;


  		




  
  77
  
    
import eu.etaxonomy.cdm.model.description.DescriptionBase;


  		




  78
  78
  
    
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;


  		




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


  		




  79
  80
  
    
import eu.etaxonomy.cdm.model.location.NamedArea;


  		




  80
  81
  
    
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;


  		




  81
  82
  
    
import eu.etaxonomy.cdm.model.reference.Reference;


  		




  ......




  125
  126
  
    
    private Text searchText;


  		




  126
  127
  
    

  		




  127
  128
  
    
    EventList<TaxonDistributionDTO> taxonList;


  		




  
  129
  
    

  		




  128
  130
  
    
    SortedSet<DefinedTermBase> areas;


  		




  129
  131
  
    
    DistributionEditorPart part;


  		




  130
  132
  
    
    private ViewportLayer bodyLayer;


  		




  ......




  243
  245
  
    
        //add default configuration because autoconfigure is set to false in constructor


  		




  244
  246
  
    
        natTable.addConfiguration(new DefaultNatTableStyleConfiguration());


  		




  245
  247
  
    

  		




  246
  
  
    
        //FIXME: this is for DEBUG ONLY


  		




  247
  
  
    
        //        natTable.addConfiguration(new DebugMenuConfiguration(natTable));


  		




  248
  248
  
    

  		




  249
  249
  
    
        // override the default sort configuration and change the mouse bindings


  		




  250
  250
  
    
        // to sort on a single click


  		




  ......




  259
  259
  
    
        // add custom configuration for data conversion and add column labels to viewport layer


  		




  260
  260
  
    
        topMostLayer.addConfiguration(new DistributionCellEditorDataConversionConfiguration(this));


  		




  261
  261
  
    

  		




  262
  
  
    
//        //register aggregation configuration


  		




  263
  
  
    
//        summaryRowLayer.addConfiguration(new AggregationConfiguration(this));


  		




  264
  
  
    

  		




  265
  
  
    
      //+++CONTEXT MENU+++


  		




  266
  
  
    
//        menuService.registerContextMenu(natTable, "eu.etaxonomy.taxeditor.editor.popupmenu.charactermatrix"); //$NON-NLS-1$


  		




  267
  
  
    
//        // get the menu registered by EMenuService


  		




  268
  
  
    
//        final Menu e4Menu = natTable.getMenu();


  		




  269
  
  
    
//        // remove the menu reference from NatTable instance


  		




  270
  
  
    
//        natTable.setMenu(null);


  		




  271
  
  
    
//        natTable.addConfiguration(


  		




  272
  
  
    
//                new AbstractUiBindingConfiguration() {


  		




  273
  
  
    
//            @Override


  		




  274
  
  
    
//            public void configureUiBindings(


  		




  275
  
  
    
//                    UiBindingRegistry uiBindingRegistry) {


  		




  276
  
  
    
//                // add e4 menu to NatTable


  		




  277
  
  
    
//                new PopupMenuBuilder(natTable, e4Menu)


  		




  278
  
  
    
//                    .build();


  		




  279
  
  
    
//


  		




  280
  
  
    
//                // register the UI binding for header, corner and body region


  		




  281
  
  
    
//                uiBindingRegistry.registerMouseDownBinding(


  		




  282
  
  
    
//                        new MouseEventMatcher(


  		




  283
  
  
    
//                                SWT.NONE,


  		




  284
  
  
    
//                                null,


  		




  285
  
  
    
//                                MouseEventMatcher.RIGHT_BUTTON),


  		




  286
  
  
    
//                        new PopupMenuAction(e4Menu));


  		




  287
  
  
    
//            }


  		




  288
  
  
    
//        });


  		




  289
  
  
    

  		




  290
  262
  
    
        natTable.configure();


  		




  291
  263
  
    
    }


  		




  292
  264
  
    

  		




  ......




  310
  282
  
    
        //grab all space


  		




  311
  283
  
    
        GridDataFactory.fillDefaults().grab(true, true).applyTo(natTable);


  		




  312
  284
  
    

  		




  313
  
  
    
        //update label to current data set


  		




  314
  
  
    
//        toolbar.getWsLabel().setText(descriptiveDataSet.getLabel());


  		




  315
  
  
    
//        toolbar.getWsLabel().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));


  		




  316
  
  
    
//        toolbar.getWsLabel().getParent().layout();


  		




  317
  
  
    

  		




  318
  
  
    
        //initial freeze of supplemental columns


  		




  319
  
  
    
//        freezeSupplementalColumns(freezeSupplementalColumns);


  		




  320
  
  
    

  		




  321
  
  
    

  		




  322
  285
  
    
        this.layout();


  		




  323
  286
  
    
      //  boolean ok = natTable.doCommand(new ClientAreaResizeCommand(natTable));


  		




  324
  287
  
    
      //  System.out.println(ok);


  		




  ......




  432
  395
  
    

  		




  433
  396
  
    
                int open = dialog.open();


  		




  434
  397
  
    
                if(open == 0){


  		




  435
  
  
    
                    //TODO!!!!


  		




  436
  
  
    
                   // reload();


  		




  
  398
  
    
                    reload();


  		




  437
  399
  
    
                }


  		




  438
  400
  
    
            }


  		




  439
  401
  
    
        });


  		




  ......




  466
  428
  
    
        parent.pack();


  		




  467
  429
  
    
        return searchText;


  		




  468
  430
  
    
    }


  		




  
  431
  
    
    /**


  		




  
  432
  
    
    * This method should only be called for adding new Distribution columns and reloading the table.<br>


  		




  
  433
  
    
    * It will hide the old distribution column and load the newly added columns.<br>


  		




  
  434
  
    
    * <p>


  		




  
  435
  
    
    * <b>Notice:</b> for data update please use <b>refresh()</b>


  		




  
  436
  
    
    *


  		




  
  437
  
    
    */


  		




  
  438
  
    
   @SuppressWarnings({ "unchecked", "rawtypes" })


  		




  
  439
  
    
   public void reload(){


  		




  
  440
  
    
       this.areaToColumnIndexMap.clear();


  		




  
  441
  
    
       this.areas.clear();


  		




  
  442
  
    
       createTable();


  		




  
  443
  
    
       natTable.redraw();


  		




  
  444
  
    
    }


  		




  469
  445
  
    

  		




  470
  446
  
    
    /**


  		




  471
  447
  
    
     * @param parent


  		




  ......




  488
  464
  
    

  		




  489
  465
  
    

  		




  490
  466
  
    

  		




  491
  
  
    
    public Collection<DescriptionElementBase> getDistributions() {


  		




  492
  
  
    
        Collection<DescriptionElementBase> descElements = new HashSet();


  		




  493
  
  
    
//TODO: only for edited taxa


  		




  494
  
  
    
        taxonList.forEach(taxonDto->taxonDto.getDistributionMap()


  		




  495
  
  
    
                .forEach((area, descriptionElements)->descElements.addAll(descriptionElements)));


  		




  
  467
  
    
    public List<DescriptionBase> getDistributions() {


  		




  
  468
  
    
        List<DescriptionBase> descriptions = new ArrayList();


  		




  
  469
  
    

  		




  
  470
  
    
//        taxonList.forEach(taxonDto->taxonDto.getDistributionMap()


  		




  
  471
  
    
//                .forEach((area, descriptionElements)->descElements.addAll(descriptionElements)));


  		




  
  472
  
    

  		




  
  473
  
    
        taxonList.forEach(taxonDto -> taxonDto.getDescriptionsWrapper().getDescriptions().forEach(taxDesc -> descriptions.add(taxDesc)));


  		




  
  474
  
    

  		




  
  475
  
    
        for (DescriptionBase description: descriptions){


  		




  
  476
  
    
            List<DescriptionElementBase> toDelete = new ArrayList();


  		




  
  477
  
    
           for (Object desc: description.getElements()){


  		




  
  478
  
    
               if (desc instanceof Distribution){


  		




  
  479
  
    
                   Distribution distribution = (Distribution) desc;


  		




  
  480
  
    
                   if (distribution.getStatus() == null || !distribution.getStatus().isPersited()){


  		




  
  481
  
    
                       toDelete.add(distribution);


  		




  
  482
  
    
                   }


  		




  
  483
  
    
               }


  		




  
  484
  
    
           }


  		




  
  485
  
    
           for (DescriptionElementBase element: toDelete){


  		




  
  486
  
    
               description.removeElement(element);


  		




  
  487
  
    
           }


  		




  
  488
  
    

  		




  
  489
  
    
        }


  		




  496
  490
  
    

  		




  497
  491
  
    

  		




  498
  
  
    
        return descElements;


  		




  
  492
  
    
        return descriptions;


  		




  499
  493
  
    

  		




  500
  494
  
    
    }


  		




  501
  495
  
    

  		












  

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





  190
  190
  
    
    @Override


  		




  191
  191
  
    
    public void save(IProgressMonitor monitor) {


  		




  192
  192
  
    
        //TODO: merge not save distributions


  		




  193
  
  
    
      CdmStore.getService(IDescriptionService.class).mergeDescriptionElements(editor.getDistributions(), true);


  		




  
  193
  
    

  		




  
  194
  
    
      CdmStore.getService(IDescriptionService.class).merge(editor.getDistributions(), true);


  		




  194
  195
  
    

  		




  195
  196
  
    
      conversation.commit();


  		




  196
  197
  
    
      updateResults = null;


  		












  

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





  62
  62
  
    
                    if (distr.getStatus() != null){


  		




  63
  63
  
    
                        if (distr.getStatus().getLabel() == ""){


  		




  64
  64
  
    
                            distr.setStatus(null);


  		




  
  65
  
    
                            super.setCanonicalValue("");


  		




  
  66
  
    
                        }else{


  		




  
  67
  
    
                            super.setCanonicalValue(distr.getStatus().getLabel());


  		




  65
  68
  
    
                        }


  		




  66
  
  
    
                        super.setCanonicalValue(distr.getStatus().getLabel());


  		




  67
  69
  
    
                    }


  		




  68
  70
  
    
                }


  		




  69
  71
  
    
            }


  		












  

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





  11
  11
  
    
import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;


  		




  12
  12
  
    

  		




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


  		




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


  		




  14
  15
  
    

  		




  15
  16
  
    
/**


  		




  16
  17
  
    
 * @author k.luther


  		




  ......




  31
  32
  
    
            }


  		




  32
  33
  
    

  		




  33
  34
  
    
            return "";


  		




  34
  
  
    
        }


  		




  35
  
  
    

  		




  36
  
  
    
        else if(canonicalValue!=null){


  		




  
  35
  
    
        }else if(canonicalValue instanceof PresenceAbsenceTerm){


  		




  
  36
  
    
            return ((PresenceAbsenceTerm)canonicalValue).getLabel();


  		




  
  37
  
    
        } else if(canonicalValue!=null){


  		




  37
  38
  
    
            return canonicalValue.toString();


  		




  38
  39
  
    
        }


  		




  39
  40
  
    
        return null;


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionStatusWizardAdminHandler.java
    
  





  27
  27
  
    

  		




  28
  28
  
    
    @Execute


  		




  29
  29
  
    
    public void execute(@Named(IServiceConstants.ACTIVE_SHELL)Shell shell) {


  		




  30
  
  
    

  		




  31
  30
  
    
        AvailableDistributionStatusAdminWizard wizard = new AvailableDistributionStatusAdminWizard();


  		




  32
  31
  
    

  		




  33
  32
  
    
        WizardDialog dialog = new WizardDialog(shell,


  		












  

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





  95
  95
  
    
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.NameDetailsView);


  		




  96
  96
  
    
        loadAndPutPreference(controller, key);


  		




  97
  97
  
    

  		




  98
  
  
    
        //Distribution Editor


  		




  99
  
  
    
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DistributionEditorActivated);


  		




  100
  
  
    
        loadAndPutPreference(controller, key);


  		




  101
  98
  
    

  		




  102
  99
  
    
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);


  		




  103
  100
  
    
        loadAndPutPreference(controller, key);


  		




  ......




  121
  118
  
    
            }


  		




  122
  119
  
    
        }


  		




  123
  120
  
    

  		




  
  121
  
    
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies);


  		




  
  122
  
    
        loadAndPutPreference(controller, key);


  		




  
  123
  
    

  		




  
  124
  
    

  		




  124
  125
  
    
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DistributionEditorActivated);


  		




  125
  126
  
    
        loadAndPutPreference(controller, key);


  		




  126
  127
  
    

  		












  

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





  1893
  1893
  
    

  		




  1894
  1894
  
    
    updateAbcdImportConfigurationPreference();


  		




  1895
  1895
  
    

  		




  1896
  
  
    
//    preference = cache.get(EditorPreferencePredicate.ShowImportExportMenu.getKey());


  		




  1897
  
  
    
//    if (preference != null){


  		




  1898
  
  
    
//        if(!getBooleanValue(SHOW_IO_MENU) ||  !preference.isAllowOverride()){


  		




  1899
  
  
    
//           setBooleanValue(SHOW_IO_MENU, Boolean.valueOf(preference.getValue()));


  		




  1900
  
  
    
//        }


  		




  1901
  
  
    
//    }else{


  		




  1902
  
  
    
//        setBooleanValue(SHOW_IO_MENU, true);


  		




  1903
  
  
    
//    }


  		




  1904
  
  
    
//


  		




  1905
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowMediaView);


  		




  1906
  
  
    
//    if (preference != null){


  		




  1907
  
  
    
//        if(!getBooleanValue(SHOW_MEDIA) ||  !preference.isAllowOverride()){


  		




  1908
  
  
    
//            setBooleanValue(SHOW_MEDIA, Boolean.valueOf(preference.getValue()));


  		




  1909
  
  
    
//        }


  		




  1910
  
  
    
//    }else{


  		




  1911
  
  
    
//        setBooleanValue(SHOW_MEDIA, true);


  		




  1912
  
  
    
//    }


  		




  1913
  
  
    
//


  		




  1914
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowChecklistPerspective);


  		




  1915
  
  
    
//    if (preference != null){


  		




  1916
  
  
    
//        if(!getBooleanValue(SHOW_CHECKLIST_PERSPECTIVE) ||  !preference.isAllowOverride()){


  		




  1917
  
  
    
//            setBooleanValue(SHOW_CHECKLIST_PERSPECTIVE, Boolean.valueOf(preference.getValue()));


  		




  1918
  
  
    
//        }


  		




  1919
  
  
    
//    }else{


  		




  1920
  
  
    
//        setBooleanValue(SHOW_CHECKLIST_PERSPECTIVE, false);


  		




  1921
  
  
    
//    }


  		




  1922
  
  
    
//


  		




  1923
  
  
    
//    //Specimen Details


  		




  1924
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowSpecimen);


  		




  1925
  
  
    
//    if (preference != null){


  		




  1926
  
  
    
//        if(!getBooleanValue(SHOW_SPECIMEN) ||  !preference.isAllowOverride()){


  		




  1927
  
  
    
//            setBooleanValue(SHOW_SPECIMEN, Boolean.valueOf(preference.getValue()));


  		




  1928
  
  
    
//        }


  		




  1929
  
  
    
//    }else{


  		




  1930
  
  
    
//        setBooleanValue(SHOW_SPECIMEN, true);


  		




  1931
  
  
    
//    }


  		




  1932
  
  
    
//


  		




  1933
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowTaxonAssociations);


  		




  1934
  
  
    
//    if (preference != null){


  		




  1935
  
  
    
//        if(!getBooleanValue(SHOW_TAXON_ASSOCIATIONS_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  1936
  
  
    
//            setBooleanValue(SHOW_TAXON_ASSOCIATIONS, Boolean.valueOf(preference.getValue()));


  		




  1937
  
  
    
//        }


  		




  1938
  
  
    
//    }


  		




  1939
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowCollectingAreasInGeneralSection);


  		




  1940
  
  
    
//    if (preference != null){


  		




  1941
  
  
    
//        if(!getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  1942
  
  
    
//            setBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION, Boolean.valueOf(preference.getValue()));


  		




  1943
  
  
    
//        }


  		




  1944
  
  
    
//    }


  		




  1945
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowLifeForm);


  		




  1946
  
  
    
//    if (preference != null){


  		




  1947
  
  
    
//        if(!getBooleanValue(SHOW_LIFE_FORM_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  1948
  
  
    
//            setBooleanValue(SHOW_LIFE_FORM, Boolean.valueOf(preference.getValue()));


  		




  1949
  
  
    
//        }


  		




  1950
  
  
    
//    }


  		




  1951
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.DeterminationOnlyForFieldUnits);


  		




  1952
  
  
    
//    if (preference != null){


  		




  1953
  
  
    
//        if(!getBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  1954
  
  
    
//            setBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS, Boolean.valueOf(preference.getValue()));


  		




  1955
  
  
    
//        }


  		




  1956
  
  
    
//    }


  		




  1957
  
  
    

  		




  1958
  
  
    

  		




  1959
  1896
  
    
    //Name Details


  		




  1960
  1897
  
    
    NameDetailsConfigurator config = getPreferredNameDetailsConfiguration(false);


  		




  1961
  1898
  
    
    if (config != null ){


  		




  ......




  1964
  1901
  
    
        }


  		




  1965
  1902
  
    
    }


  		




  1966
  1903
  
    

  		




  1967
  
  
    
    //Distribution Editor


  		




  1968
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);


  		




  1969
  
  
    
//    if (preference != null){


  		




  1970
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_VOCABULARIES_OVERRIDE) ||  !preference.isAllowOverride()){


  		




  1971
  
  
    
//            setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), preference.getValue());


  		




  1972
  
  
    
//            setBooleanValue(DISTRIBUTION_VOCABULARIES_ALLOW_OVERRIDE, preference.isAllowOverride());


  		




  1973
  
  
    
//        }


  		




  1974
  
  
    
//    }else{


  		




  1975
  
  
    
//        setBooleanValue(DISTRIBUTION_VOCABULARIES_ALLOW_OVERRIDE,true);


  		




  1976
  
  
    
//        setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), "");


  		




  1977
  
  
    
//    }


  		




  1978
  
  
    
//


  		




  1979
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.DistributionEditorActivated);


  		




  1980
  
  
    
//    if (preference != null){


  		




  1981
  
  
    
//        boolean test = getBooleanValue(DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE);


  		




  1982
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE) || !preference.isAllowOverride()){


  		




  1983
  
  
    
//            setBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey(), Boolean.valueOf(preference.getValue()));


  		




  1984
  
  
    
//        }else{


  		




  1985
  
  
    
//            test = getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  1986
  
  
    
//            System.err.println(test);


  		




  1987
  
  
    
//        }


  		




  1988
  
  
    
//    }


  		




  1989
  
  
    

  		




  1990
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionStatus);


  		




  1991
  
  
    
//    if (preference != null){


  		




  1992
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_STATUS_OVERRIDE) || !preference.isAllowOverride()){


  		




  1993
  
  
    
//            //get terms for the uuids... and add them to the termManager as preferred terms


  		




  1994
  
  
    
//            ITermService termService = CdmStore.getService(ITermService.class);


  		




  1995
  
  
    
//            String[] uuidArray = preference.getValue().split(";");


  		




  1996
  
  
    
//            List<UUID> uuidList = new ArrayList();


  		




  1997
  
  
    
//            for (String uuidString:uuidArray){


  		




  1998
  
  
    
//                try {


  		




  1999
  
  
    
//                    uuidList.add(UUID.fromString(uuidString));


  		




  2000
  
  
    
//                } catch (Exception e) {


  		




  2001
  
  
    
//                    logger.warn("Preference loading failed", e);


  		




  2002
  
  
    
//                }


  		




  2003
  
  
    
//            }


  		




  2004
  
  
    
//


  		




  2005
  
  
    
//            List<DefinedTermBase> definedTermBases = termService.load(uuidList, null);


  		




  2006
  
  
    
//            CdmStore.getTermManager().setPreferredTerms(definedTermBases, TermStore.getTerms(TermType.PresenceAbsenceTerm, null));


  		




  2007
  
  
    
//        }


  		




  2008
  
  
    
//    }


  		




  2009
  
  
    
//


  		




  2010
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.DistributionEditorActivated);


  		




  2011
  
  
    
//    if (preference != null){


  		




  2012
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_DESCRIPTION_OVERRIDE) || !preference.isAllowOverride()){


  		




  2013
  
  
    
//            setBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey(), Boolean.valueOf(preference.getValue()));


  		




  2014
  
  
    
//        }


  		




  2015
  
  
    
//    }


  		




  2016
  
  
    
//


  		




  2017
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor);


  		




  2018
  
  
    
//    if (preference != null){


  		




  2019
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_DISPLAY_AREA_OVERRIDE) || !preference.isAllowOverride()){


  		




  2020
  
  
    
//            setStringValue(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey(), preference.getValue());


  		




  2021
  
  
    
//        }


  		




  2022
  
  
    
//    }


  		




  2023
  
  
    
//


  		




  2024
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.DisplayOfStatus);


  		




  2025
  
  
    
//    if (preference != null){


  		




  2026
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_DISPLAY_STATUS_OVERRIDE) || !preference.isAllowOverride()){


  		




  2027
  
  
    
//            setStringValue(EditorPreferencePredicate.DisplayOfStatus.getKey(), preference.getValue());


  		




  2028
  
  
    
//        }


  		




  2029
  
  
    
//    }


  		




  2030
  
  
    
//


  		




  2031
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.ShowRankInDistributionEditor);


  		




  2032
  
  
    
//    if (preference != null){


  		




  2033
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_SHOW_RANK_OVERRIDE) || !preference.isAllowOverride()){


  		




  2034
  
  
    
//            setBooleanValue(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey(), Boolean.valueOf(preference.getValue()));


  		




  2035
  
  
    
//        }


  		




  2036
  
  
    
//    }


  		




  2037
  
  
    
//


  		




  2038
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.AreasSortedByIdInVocabulary);


  		




  2039
  
  
    
//    if (preference != null){


  		




  2040
  
  
    
//        if (!getBooleanValue(DISTRIBUTION_AREAS_SORTED_BY_IDINVOC_OVERRIDE) || !preference.isAllowOverride()){


  		




  2041
  
  
    
//            setBooleanValue(EditorPreferencePredicate.AreasSortedByIdInVocabulary.getKey(), Boolean.valueOf(preference.getValue()));


  		




  2042
  
  
    
//        }


  		




  2043
  
  
    
//    }


  		




  2044
  
  
    
//


  		




  2045
  
  
    
//    preference = getPreferenceFromDB(EditorPreferencePredicate.OwnDescriptionForDistributionEditor);


  		




  2046
  
  
    
//    if (preference != null){


  		




  2047
  
  
    
//        if (!getBooleanValue(OWN_DESCRIPTION_OVERRIDE) || !preference.isAllowOverride()){


  		




  2048
  
  
    
//            setBooleanValue(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey(), Boolean.valueOf(preference.getValue()));


  		




  2049
  
  
    
//        }


  		




  2050
  
  
    
//    }


  		




  2051
  
  
    
//


  		




  2052
  
  
    
//    //common names


  		




  2053
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);


  		




  2054
  
  
    
//    if (preference != null){


  		




  2055
  
  
    
//        if (!getBooleanValue(COMMON_NAME_AREA_VOCABULARIES) ||  !preference.isAllowOverride()){


  		




  2056
  
  
    
//            setStringValue(COMMON_NAME_AREA_VOCABULARIES, preference.getValue());


  		




  2057
  
  
    
//            setBooleanValue(COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE, preference.isAllowOverride());


  		




  2058
  
  
    
//        }


  		




  2059
  
  
    
//    }else{


  		




  2060
  
  
    
//        setStringValue(COMMON_NAME_AREA_VOCABULARIES, "");


  		




  2061
  
  
    
//        setBooleanValue(COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE, true);


  		




  2062
  
  
    
//    }


  		




  2063
  
  
    
//


  		




  2064
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.CommonNameReferencesWithMarker);


  		




  2065
  
  
    
//    if (preference != null){


  		




  2066
  
  
    
//        if (!getBooleanValue(FILTER_COMMON_NAME_REFERENCES) ||  !preference.isAllowOverride()){


  		




  2067
  
  
    
//            setBooleanValue(FILTER_COMMON_NAME_REFERENCES, Boolean.valueOf(preference.getValue()));


  		




  2068
  
  
    
//        }


  		




  2069
  
  
    
//    }else{


  		




  2070
  
  
    
//        setBooleanValue(FILTER_COMMON_NAME_REFERENCES, false);


  		




  2071
  
  
    
//    }


  		




  2072
  
  
    

  		




  2073
  
  
    

  		




  2074
  
  
    

  		




  2075
  
  
    

  		




  2076
  
  
    
    //sources


  		




  2077
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowIdInSource);


  		




  2078
  
  
    
//    if (preference != null){


  		




  2079
  
  
    
//        if (!getBooleanValue(SHOW_ID_IN_SOURCE) ||  !preference.isAllowOverride()){


  		




  2080
  
  
    
//            setBooleanValue(SHOW_ID_IN_SOURCE, Boolean.valueOf(preference.getValue()));


  		




  2081
  
  
    
//        }


  		




  2082
  
  
    
//    }else{


  		




  2083
  
  
    
//        setBooleanValue(SHOW_ID_IN_SOURCE, true);


  		




  2084
  
  
    
//    }


  		




  2085
  
  
    
//


  		




  2086
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);


  		




  2087
  
  
    
//    if (preference != null){


  		




  2088
  
  
    
//        if (!getBooleanValue(SHOW_NAMESPACE_IN_SOURCE) ||  !preference.isAllowOverride()){


  		




  2089
  
  
    
//            setBooleanValue(SHOW_NAMESPACE_IN_SOURCE, Boolean.valueOf(preference.getValue()));


  		




  2090
  
  
    
//        }


  		




  2091
  
  
    
//    }else{


  		




  2092
  
  
    
//        setBooleanValue(SHOW_NAMESPACE_IN_SOURCE, true);


  		




  2093
  
  
    
//    }


  		




  2094
  
  
    
//    //multiple classifications / taxon navigator


  		




  2095
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.DisableMultiClassification);


  		




  2096
  
  
    
//    if (preference != null){


  		




  2097
  
  
    
//        if (!getBooleanValue(DISABLE_MULTI_CLASSIFICATION) ||  !preference.isAllowOverride()){


  		




  2098
  
  
    
//            setBooleanValue(DISABLE_MULTI_CLASSIFICATION, Boolean.valueOf(preference.getValue()));


  		




  2099
  
  
    
//        }


  		




  2100
  
  
    
//    }else{


  		




  2101
  
  
    
//        setBooleanValue(DISABLE_MULTI_CLASSIFICATION, false);


  		




  2102
  
  
    
//    }


  		




  2103
  
  
    
//


  		




  2104
  
  
    
//    preference = getPreferenceFromDB(PreferencePredicate.ShowTaxonNodeWizard);


  		




  2105
  
  
    
//    if (preference != null){


  		




  2106
  
  
    
//        if (!getBooleanValue(SHOW_TAXONNODE_WIZARD) ||  !preference.isAllowOverride()){


  		




  2107
  
  
    
//            setBooleanValue(SHOW_TAXONNODE_WIZARD, Boolean.valueOf(preference.getValue()));


  		




  2108
  
  
    
//        }


  		




  2109
  
  
    
//    }else{


  		




  2110
  
  
    
//        setBooleanValue(SHOW_TAXONNODE_WIZARD, true);


  		




  2111
  
  
    
//    }


  		




  
  1904
  
    

  		




  
  1905
  
    

  		




  
  1906
  
    

  		




  
  1907
  
    

  		




  
  1908
  
    

  		




  
  1909
  
    

  		




  2112
  1910
  
    

  		




  2113
  1911
  
    
}


  		




  2114
  1912
  
    

  		












  

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





  33
  33
  
    
    protected AbstractAdminTermSelectionWizardPage(String pageName, TermType type, CdmPreference pref) {


  		




  34
  34
  
    
        super(pageName, type);


  		




  35
  35
  
    
        this.pref = pref;


  		




  36
  
  
    
        this.allowOverride = pref.isAllowOverride();


  		




  
  36
  
    

  		




  
  37
  
    
        this.allowOverride = this.pref.isAllowOverride();


  		




  37
  38
  
    
    }


  		




  38
  39
  
    

  		




  39
  40
  
    
    CdmPreference pref;


  		




  ......




  47
  48
  
    
        final Button activateCheckButton = new Button(parent, SWT.CHECK);


  		




  48
  49
  
    
        activateCheckButton.setText("Allow Override");


  		




  49
  50
  
    
        activateCheckButton.setSelection(pref.isAllowOverride());


  		




  
  51
  
    

  		




  50
  52
  
    
        activateCheckButton.addSelectionListener(new SelectionAdapter(){


  		




  51
  53
  
    
                @Override


  		




  52
  54
  
    
                public void widgetSelected(SelectionEvent e) {


  		












  

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





  44
  44
  
    

  		




  45
  45
  
    

  		




  46
  46
  
    
    public AvailableAreaVocabulariesPage(String pageName, boolean localPref, CdmPreference pref, String featureTitle) {


  		




  47
  
  
    
        super(pageName, TermType.NamedArea, pref);


  		




  
  47
  
    
        super(pageName, TermType.NamedArea, pref );


  		




  48
  48
  
    
        this.localPref = localPref;


  		




  49
  49
  
    
        this.featureTitle = featureTitle;


  		




  50
  50
  
    

  		












  

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





  56
  56
  
    

  		




  57
  57
  
    
    @Override


  		




  58
  58
  
    
    protected String getCheckedValuesFromPreferences() {


  		




  59
  
  
    
        return PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());


  		




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


  		




  
  60
  
    

  		




  
  61
  
    
        return checkedValues;


  		




  60
  62
  
    
    }


  		




  61
  63
  
    

  		




  62
  64
  
    
    @Override


  		












  

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





  20
  20
  
    
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;


  		




  21
  21
  
    
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;


  		




  22
  22
  
    
import eu.etaxonomy.cdm.api.service.ITermService;


  		




  
  23
  
    
import eu.etaxonomy.cdm.api.service.IVocabularyService;


  		




  23
  24
  
    
import eu.etaxonomy.cdm.model.common.DefinedTermBase;


  		




  24
  25
  
    
import eu.etaxonomy.cdm.model.metadata.CdmPreference;


  		




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


  		




  ......




  43
  44
  
    
        setWindowTitle(Messages.AvailableDistributionStatusWizard_WIZARD_TITLE);


  		




  44
  45
  
    
        // TODO if preferenceStore has elements checked load elements in wizard


  		




  45
  46
  
    
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionStatus);


  		




  
  47
  
    

  		




  
  48
  
    
        if (pref == null){


  		




  
  49
  
    
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, null);


  		




  
  50
  
    
        }


  		




  46
  51
  
    
        aPage = new AvailableDistributionStatusPage(Messages.AvailableDistributionStatusWizard_PAGE_TITLE, pref, false);


  		




  47
  52
  
    
    }


  		




  48
  53
  
    

  		




  ......




  100
  105
  
    
        savePref.setAllowOverride(pref.isAllowOverride());


  		




  101
  106
  
    
        PreferencesUtil.setPreferenceToDB(savePref);


  		




  102
  107
  
    
        Collection<DefinedTermBase> terms = new ArrayList<>();


  		




  103
  
  
    
        aPage.getVocabularies().get(0).getTerms()


  		




  104
  
  
    
        .forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));


  		




  
  108
  
    
        Collection<TermDto> termDtos = CdmStore.getService(IVocabularyService.class).getCompleteTermHierarchy(aPage.getVocabularies().get(0).getUuid());


  		




  
  109
  
    
        termDtos.forEach(dto -> terms.add(CdmStore.getService(ITermService.class).load(dto.getUuid())));


  		




  105
  110
  
    
        CdmStore.getTermManager().setPreferredTerms(preferredTerms, terms);


  		




  106
  111
  
    
        PreferencesUtil.firePreferencesChanged(this.getClass());


  		




  107
  112
  
    
        return true;


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
    
  





  75
  75
  
    
        if(partObject instanceof IPartContentHasDetails){


  		




  76
  76
  
    
            IStructuredSelection structuredSelection = createSelection(selection);


  		




  77
  77
  
    
            if(structuredSelection==null || structuredSelection.isEmpty()){


  		




  78
  
  
    
                showEmptyPage();


  		




  
  78
  
    
               // showEmptyPage();


  		




  79
  79
  
    
                return;


  		




  80
  80
  
    
            }


  		




  81
  81
  
    
            if(!(partObject instanceof ISelectionElementEditingPart) &&


  		












Also available in:  Unified diff