import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.ModifyEvent;
import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.location.NamedArea;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermTree;
+import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.cdm.persistence.dto.TermDto;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.event.EventUtility;
+import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
+import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.NamedAreaSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
*
*/
public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled, ICdmEntitySessionEnabled,
-IPartContentHasDetails, IDirtyMarkable {
+IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable {
private DescriptiveDataSetComposite composite;
@Override
public void modifyText(ModifyEvent e) {
descriptiveDataSet.setLabel(composite.getTxt_label().getText());
+ EventUtility.postSyncEvent(WorkbenchEventConstants.REFRESH_DATASET_NAVIGATOR, descriptiveDataSet);
dirty.setDirty(true);
}
};
composite.getRankMin().addSelectionChangedListener(event->dirty.setDirty(true));
+ composite.getRankMin().setText("Select min rank...");
composite.getRankMax().addSelectionChangedListener(event->dirty.setDirty(true));
-
- composite.getBtnChooseArea().addSelectionListener(new SelectionAdapter() {
-
+ composite.getRankMax().setText("Select max rank...");
+ composite.getBtnRemoveRankMin().addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- NamedArea area = NamedAreaSelectionDialog.select(shell, null, null);
- if(area!=null){
- composite.setArea(area);
- }
+ composite.getRankMin().setElement(null);
+ dirty.setDirty(true);
+ }
+ });
+ composite.getBtnRemoveRankMax().addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
+ composite.getRankMax().setElement(null);
dirty.setDirty(true);
}
});
- composite.getBtnRemoveArea().addSelectionListener(new SelectionAdapter() {
+
+ composite.getBtnChooseArea().addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
- composite.removeArea();
- dirty.setDirty(true);
+ AreasSelectionDialog areasSelectionDialog = new AreasSelectionDialog(composite.getShell(), composite.getAreas());
+ if(areasSelectionDialog.open()==Window.OK){
+ List<TermDto> selectedAreas = areasSelectionDialog.getSelectedAreas();
+ if(selectedAreas!=null){
+ composite.setAreas(selectedAreas);
+ dirty.setDirty(true);
+ }
+ }
}
});
- composite.getFeatureTreeEditorComposite().init(null, null, e->selectionService.setSelection(e.getSelection()), this, null);
+ composite.getFeatureTreeEditorComposite().init("Character Tree",
+ TermType.Character,
+ null,
+ null,
+ e->selectionService.setSelection(e.getSelection()),
+ this,
+ null);
//add drag'n'drop support
Transfer[] transfers = new Transfer[] {LocalSelectionTransfer.getTransfer()};
}
Set<NamedArea> geoFilter = descriptiveDataSet.getGeoFilter();
if(geoFilter!=null && !geoFilter.isEmpty()){
- composite.setArea(geoFilter.iterator().next());
+ Set<TermDto> terms = geoFilter.stream().map(filter->TermDto.fromTerm(filter, true)).collect(Collectors.toSet());
+ composite.setAreas(new ArrayList<>(terms));
}
Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
if(taxonSubtreeFilter!=null){
composite.getTaxonNodeTree().setInput(taxonSubtreeFilter);
}
-
composite.getTxt_label().addModifyListener(labelModifyListener);
+ composite.getTxt_label().addFocusListener(new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ super.focusGained(e);
+ selectionService.setSelection(new StructuredSelection(descriptiveDataSet));
+ }
+ });
+ selectionService.setSelection(new StructuredSelection(descriptiveDataSet));
}
public void addTaxonNode(TaxonNodeDto taxonNodeDto){
@Persist
@Override
public void save(IProgressMonitor monitor) {
- NamedArea area = composite.getArea();
- Set<NamedArea> areas = new HashSet<>();
- if(area!=null){
- areas.add(area);
- }
+ Collection<TermDto> areas = composite.getAreas();
Object input = composite.getTaxonNodeTree().getInput();
if(input!=null){
descriptiveDataSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter
}
}
}
- FeatureTree characters = composite.getCharacters();
+ TermTree<Feature> characters = composite.getCharacters();
if(characters!=null){
//save characters because they can be modified in this editor
- characters.getDistinctFeatures().forEach(character->CdmStore.getService(ITermService.class).merge(character,true));
+ characters.getDistinctTerms().forEach(character->CdmStore.getService(ITermService.class).merge(character,true));
}
descriptiveDataSet.setMaxRank(rankMax);
descriptiveDataSet.setMinRank(rankMin);
descriptiveDataSet.setDescriptiveSystem(characters);
- descriptiveDataSet.setGeoFilter(areas);
+ List<DefinedTermBase> terms = CdmStore.getService(ITermService.class)
+ .load(areas.stream().map(area -> area.getUuid()).collect(Collectors.toList()), null);
+ Set<NamedArea> areaTerms = new HashSet<>();
+ terms.forEach(term->areaTerms.add((NamedArea) term));
+ descriptiveDataSet.setGeoFilter(areaTerms);
conversation.commit();
CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
dirty.setDirty(false);
}
+ @Override
+ public boolean isDirty() {
+ return dirty.isDirty();
+ }
+
@PreDestroy
public void dispose() {
if (conversation != null) {
BGBM BDI Projects / taxeditor.git / blobdiff