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 2c0819c8c6f36982fad2b84ae1be61f8f6d5c3d5..7df5a027a38183ab2483be3cf80bf261e73ad8dd 100644 (file)
--- 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<TaxonNodeDto> 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<TaxonNodeDto> 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 9185ebb597fe9f5e427331361e431a45d890ef68..121933998d95f18c1154365616347b063475becf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
@@ -187,7 +187,6 @@
         <children xsi:type="menu:Menu" xmi:id="_whoc7_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.presenceAbsence.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_whoc8PynEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc8fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_whoc8vynEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
           </children>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc8_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_whoc9PynEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
@@ -217,7 +216,6 @@
         <children xsi:type="menu:Menu" xmi:id="_jGX_b_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.namedArea.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jGX_cPysEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_cfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jGX_cvysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
           </children>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_c_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jGX_dPysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
@@ -247,7 +245,6 @@
         <children xsi:type="menu:Menu" xmi:id="_jK89b_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.rank.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jK89cPysEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89cfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jK89cvysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
           </children>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89c_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jK89dPysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
@@ -410,7 +407,6 @@
       </children>
       <children xsi:type="menu:MenuSeparator" xmi:id="_XKnM8E3IEeiplYSgvvNXRQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.6"/>
       <children xsi:type="menu:HandledMenuItem" xmi:id="_eU0zcEbOEeiER_VRS0L7wA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.gfbioTermImport" label="%handledmenuitem.label.9" tooltip="%handledmenuitem.tooltip.2" command="_bnVKsCZxEeeQLpuomSmVoQ">
-        <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_h15bwEb1EeiER_VRS0L7wA" coreExpressionId="isCdmStoreConnectedAndShowExperimental"/>
         <parameters xmi:id="_eU0zcUbOEeiER_VRS0L7wA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.gfbioTermImport" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart"/>
       </children>
       <children xsi:type="menu:HandledMenuItem" xmi:id="_fbZtkB7xEemDKJyLc5CJfQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.termsearch" label="%handledmenuitem.label.16" tooltip="%handledmenuitem.label.16" command="_bnVKsCZxEeeQLpuomSmVoQ">

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 a19a35da9bb3e5b4d27e659e4fdffd44aaf275f8..9f96e89109dc64ce47eb3b92cf1ca3bb0c35db7a 100644 (file)
--- 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 8a9f108ea81a26b1d78abb7aae97d5e511dd3a35..1d00b7d2bb74fdc902b87491dfd10ddb1960db9f 100644 (file)
--- 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);