From: Patrick Plitzner
Date: Wed, 11 Dec 2019 16:13:01 +0000 (+0100)
Subject: Remove "experimental" status from
X-Git-Tag: 5.12.0^2~31
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2c450f49a0944b8a8a14fca7c0b631cece093854
Remove "experimental" status from
- polytomous key generation
- move term menu in term editor
- export ontology in term tree editor
---
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
index 2c0819c8c..7df5a027a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
@@ -49,8 +49,6 @@ import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonSelectionDialog;
@@ -144,43 +142,41 @@ public class CharacterMatrixBottomToolbar extends Composite{
aggregatDescriptiveDataSet(matrix.getDescriptiveDataSet().getUuid());
}
});
- if(PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)){
- /**
- * Key generation button
- */
- Button btnGenerateKey = new Button(this, SWT.PUSH);
- btnGenerateKey.setText("Generate Polytomous Key");
- btnGenerateKey.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if(StoreUtil.promptCheckIsDirty(matrix.getPart())){
- return;
- }
- Set nodeDtos = matrix.getDescriptiveDataSet().getTaxonSubtreeFilter().stream()
- .map(node->new TaxonNodeDto(node))
- .collect(Collectors.toSet());
- TaxonNodeDto parentDto = CdmStore.getService(ITaxonNodeService.class).findCommonParentDto(nodeDtos);
- UUID taxonUuid = parentDto.getTaxonUuid();
- int response = MessagingUtils.confirmDialog(
- "Choose taxonomic scope",
- String.format("The common parent taxon of this data set is :\n%s\n\n"
- + "Do you want to use this as the taxonomic scope for the polytomous key?"
- , parentDto.getTaxonTitleCache()), "Yes", "Choose different taxon", "Cancel");
- if(response==2){
+ /**
+ * Key generation button
+ */
+ Button btnGenerateKey = new Button(this, SWT.PUSH);
+ btnGenerateKey.setText("Generate Polytomous Key");
+ btnGenerateKey.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ if(StoreUtil.promptCheckIsDirty(matrix.getPart())){
+ return;
+ }
+ Set nodeDtos = matrix.getDescriptiveDataSet().getTaxonSubtreeFilter().stream()
+ .map(node->new TaxonNodeDto(node))
+ .collect(Collectors.toSet());
+ TaxonNodeDto parentDto = CdmStore.getService(ITaxonNodeService.class).findCommonParentDto(nodeDtos);
+ UUID taxonUuid = parentDto.getTaxonUuid();
+ int response = MessagingUtils.confirmDialog(
+ "Choose taxonomic scope",
+ String.format("The common parent taxon of this data set is :\n%s\n\n"
+ + "Do you want to use this as the taxonomic scope for the polytomous key?"
+ , parentDto.getTaxonTitleCache()), "Yes", "Choose different taxon", "Cancel");
+ if(response==2){
+ return;
+ }
+ else if(response==1){
+ Taxon taxon = TaxonSelectionDialog.selectTaxon(getShell(), null);
+ if(taxon==null){
return;
}
- else if(response==1){
- Taxon taxon = TaxonSelectionDialog.selectTaxon(getShell(), null);
- if(taxon==null){
- return;
- }
- taxonUuid = taxon.getUuid();
- }
- generateKey(matrix.getDescriptiveDataSet().getUuid(), taxonUuid);
+ taxonUuid = taxon.getUuid();
}
+ generateKey(matrix.getDescriptiveDataSet().getUuid(), taxonUuid);
+ }
- });
- }
+ });
}
private void aggregatDescriptiveDataSet(UUID descriptiveDataSetUuid){
diff --git a/eu.etaxonomy.taxeditor.store/fragment.e4xmi b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
index 9185ebb59..121933998 100644
--- a/eu.etaxonomy.taxeditor.store/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
@@ -187,7 +187,6 @@
-
@@ -217,7 +216,6 @@
-
@@ -247,7 +245,6 @@
-
@@ -410,7 +407,6 @@
-
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
index a19a35da9..9f96e8910 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
@@ -35,8 +35,6 @@ import eu.etaxonomy.taxeditor.featuretree.TermChooseWizard;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.StoreUtil;
/**
@@ -92,8 +90,7 @@ public class MoveDefinedTermHandler {
MHandledMenuItem menuItem){
boolean canExecute = false;
Object firstElement = selection.getFirstElement();
- canExecute = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
- && selection.size()==1
+ canExecute = selection.size()==1
&& firstElement instanceof TermDto
// TODO temporary fix for #7933
&& !((TermDto) firstElement).getVocabularyUuid().equals(Country.uuidCountryVocabulary);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
index 8a9f108ea..1d00b7d2b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
@@ -30,8 +30,6 @@ import org.eclipse.ui.progress.IProgressConstants;
import eu.etaxonomy.cdm.io.descriptive.owl.out.StructureTreeOwlExportConfigurator;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -87,8 +85,7 @@ public class FeatureTreeExportOntologyHandler {
@Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
MHandledMenuItem menuItem) {
boolean canExecute = false;
- canExecute = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
- && selection!=null
+ canExecute = selection!=null
&& selection.size()==1
&& selection.getFirstElement() instanceof TermTree;
menuItem.setVisible(canExecute);