ref #10448 rename WFOExport -> WfoBackboneExport
authorAndreas Müller <a.mueller@bgbm.org>
Mon, 29 Jan 2024 22:13:28 +0000 (23:13 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Mon, 29 Jan 2024 22:13:28 +0000 (23:13 +0100)
eu.etaxonomy.taxeditor.store/fragment.e4xmi
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/OpenWfoBackboneExportWizard.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/OpenWFOExportWizard.java with 72% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WfoBackboneExportWizard.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java with 89% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java

index 3f9b1ca9a142f4f2fb0179a56c0f2c9327ef6477..3dca65d2048023de9aba96591b90ec595f559e26 100644 (file)
     <elements xsi:type="commands:Handler" xmi:id="_4kk8oDoqEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.OpenDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_qEMrsIdPEeecZ4F2Y9Z0Og"/>
     <elements xsi:type="commands:Handler" xmi:id="_4GeBAD4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.OpenTermTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.OpenTermTreeEditorHandler" command="_8aaicD4fEeuM4JU-Ch98ZA"/>
     <elements xsi:type="commands:Handler" xmi:id="_oEReoEjAEe6gZ65AByRHxQ" elementId="eu.etaxonomy.taxeditor.io.e4.out.cdmlight.OpenColDPExportWizard" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.io.e4.out.col.OpenColExportWizard" command="_lbmBoEi_Ee6gZ65AByRHxQ"/>
-    <elements xsi:type="commands:Handler" xmi:id="_rng_YLU-Ee6JFM-mIdEBFA" elementId="eu.etaxonomy.taxeditor.io.e4.out.dwca.OpenWFOExportWizard" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.io.e4.out.wfo.OpenWFOExportWizard" command="_1BzvkLU-Ee6JFM-mIdEBFA"/>
+    <elements xsi:type="commands:Handler" xmi:id="_rng_YLU-Ee6JFM-mIdEBFA" elementId="eu.etaxonomy.taxeditor.io.e4.out.dwca.OpenWfoBackboneExportWizard" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.io.e4.out.wfo.OpenWfoBackboneExportWizardrtWizard" command="_1BzvkLU-Ee6JFM-mIdEBFA"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_qT4hgIfTEeecZ4F2Y9Z0Og" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window" positionInList="before:eu.etaxonomy.taxeditor.application.windowMenu.last">
     <elements xsi:type="menu:Menu" xmi:id="_LT3P8IfcEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menu.termeditor" label="%menu.label.1">
similarity index 72%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/OpenWFOExportWizard.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/OpenWfoBackboneExportWizard.java
index 43edfa8d6bfd8ee0cf887ba1af0c723ec9777df4..768be343acb297bf6092d8d4ecf3369c822a98e4 100644 (file)
@@ -18,29 +18,23 @@ import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizard;
 import eu.etaxonomy.taxeditor.io.e4.out.AbstractOpenExportWizard;
 
 /**
- * @author pplitzner
- * @since Oct 5, 2017
- *
+ * @author k.luther
+ * @since Jan 2024
  */
-public class OpenWFOExportWizard extends AbstractOpenExportWizard {
+public class OpenWfoBackboneExportWizard extends AbstractOpenExportWizard {
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Class<? extends AbstractExportWizard> getExportWizardClass() {
-        return WFOExportWizard.class;
+        return WfoBackboneExportWizard.class;
     }
 
     @Override
     @Execute
-    public void execute(IEclipseContext ctx, Shell s)
-    {
+    public void execute(IEclipseContext ctx, Shell s){
 
-        AbstractExportWizard wizard = ContextInjectionFactory.make(getExportWizardClass(), ctx);
+        AbstractExportWizard<?> wizard = ContextInjectionFactory.make(getExportWizardClass(), ctx);
         wizard.init();
         WizardDialog dialog = new WizardDialog(s, wizard);
         dialog.open();
     }
-
-}
+}
\ No newline at end of file
similarity index 89%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WFOExportWizard.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/wfo/WfoBackboneExportWizard.java
index bfc5b413f857ac2b2f6312b1173326c140bba6c5..fb27f136e467c3612f2b468acef675a0a175dc30 100644 (file)
@@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeSelection;
 
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
-import eu.etaxonomy.cdm.io.wfo.out.WfoExportConfigurator;
+import eu.etaxonomy.cdm.io.wfo.out.WfoBackboneExportConfigurator;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
 import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizard;
@@ -37,21 +37,21 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author k.luther
  * @since Jan 23, 2024
  */
-public class WFOExportWizard extends
-               AbstractExportWizard<WfoExportConfigurator> {
+public class WfoBackboneExportWizard extends
+               AbstractExportWizard<WfoBackboneExportConfigurator> {
 
-    private WfoExportConfigurator configurator;
+    private WfoBackboneExportConfigurator configurator;
        private ExportToFileDestinationWizardPage page;
 
     @Inject
-       public WFOExportWizard(IEclipseContext context,
+       public WfoBackboneExportWizard(IEclipseContext context,
                @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
            super(context, selection);
        }
 
        @Override
        public void init() {
-               configurator = WfoExportConfigurator.NewInstance();
+               configurator = WfoBackboneExportConfigurator.NewInstance();
                if (selection instanceof TreeSelection && !selection.isEmpty()){
                        Iterator<?> it = selection.iterator();
 
@@ -75,7 +75,7 @@ public class WFOExportWizard extends
        }
 
        @Override
-       public WfoExportConfigurator getConfigurator() {
+       public WfoBackboneExportConfigurator getConfigurator() {
                return configurator;
        }
 
index c1822da2400378996c4a6ead51db41cbcc49b08c..41c1c407e0330bc35faf82fa21311000d626a51a 100644 (file)
@@ -47,7 +47,7 @@ import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;
 import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
 import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;
 import eu.etaxonomy.cdm.io.tcsxml.out.TcsXmlExportConfigurator;
-import eu.etaxonomy.cdm.io.wfo.out.WfoExportConfigurator;
+import eu.etaxonomy.cdm.io.wfo.out.WfoBackboneExportConfigurator;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.taxon.Classification;
@@ -104,7 +104,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
 
     private boolean colDPExport = false;
     private boolean dwcaExport = false;
-    private boolean wfoExport = false;
+    private boolean wfoBackboneExport = false;
 
     private DirectoryDialog folderDialog;
     private Text text_exportFileName;
@@ -160,7 +160,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
             dwcaExport = true;
             break;
         case WFO_EXPORT:
-            wfoExport = true;
+            wfoBackboneExport = true;
             break;
         default:
             throw new RuntimeException("Export type not yet handeled: " + type);
@@ -189,7 +189,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
         return new ExportToFileDestinationWizardPage(DWCA_EXPORT, DWCA_EXPORT, "DwC-Archive Export",
                 "Export the content of the currently selected database into Darwin Core Archive format.", ZIP, config);
     }
-    public static ExportToFileDestinationWizardPage WFO(WfoExportConfigurator config) {
+    public static ExportToFileDestinationWizardPage WFO(WfoBackboneExportConfigurator config) {
         return new ExportToFileDestinationWizardPage(WFO_EXPORT, WFO_EXPORT, "WFO Backbone Export",
                 "Export the content of the currently selected database into WFO Backbone format."
                 , ZIP, config);
@@ -273,7 +273,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
             gridDataSep.horizontalSpan = 2;
             separator.setLayoutData(gridDataSep);
         }
-        if (classifications == null && !wfoExport) {
+        if (classifications == null && !wfoBackboneExport) {
             classifications = CdmStore.getService(IClassificationService.class).list(null, null, null, null, null);
             Collections.sort(classifications, (o1, o2) -> {
                 if (o1.equals(o2)) {
@@ -294,7 +294,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
             }
         }
 
-        if (csvExport || csvPrintExport || cdmLightExport || csvNameExport || dwcaExport || colDPExport || wfoExport) {
+        if (csvExport || csvPrintExport || cdmLightExport || csvNameExport || dwcaExport || colDPExport || wfoBackboneExport) {
 
             // Label comboBoxLabel = new Label(composite, SWT.NONE);
             // comboBoxLabel.setText("Classification");
@@ -302,8 +302,8 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
             GridLayout grid = new GridLayout();
             grid.numColumns = 1;
             selectNodeOrClassification.setLayout(grid);
-            if ((cdmLightExport || dwcaExport || colDPExport || wfoExport) && !configurator.getTaxonNodeFilter().getSubtreeFilter().isEmpty()) {
-                if (!wfoExport) {
+            if ((cdmLightExport || dwcaExport || colDPExport || wfoBackboneExport) && !configurator.getTaxonNodeFilter().getSubtreeFilter().isEmpty()) {
+                if (!wfoBackboneExport) {
                     checkUseSelectedTaxonNode = new Button(selectNodeOrClassification, SWT.RADIO);
                 }
                 String taxonStr = "";
@@ -320,7 +320,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                         }
                     }
                 }
-                if (!wfoExport) {
+                if (!wfoBackboneExport) {
                     checkUseSelectedTaxonNode.setText("Export all selected subtree(s) (" + taxonStr + ")");
                     checkUseSelectedTaxonNode.addListener(SWT.Selection, e -> {
                         Button b = (Button) e.widget;
@@ -351,7 +351,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                     text_familyString.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
                 }
-            }else if (wfoExport) {
+            }else if (wfoBackboneExport) {
 
                 Label label = new Label(composite, SWT.NONE);
                 label.setText("WFO Backbone export is only available for subtrees, not for classifications");
@@ -387,10 +387,10 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                 });
             }
 
-            if (node != null && !wfoExport) {
+            if (node != null && !wfoBackboneExport) {
                 selectedClassification = node.getClassification();
             }
-            if (!wfoExport) {
+            if (!wfoBackboneExport) {
                 createClassificationSelectionCombo(selectNodeOrClassification);
             }
             if (cdmLightExport) {
@@ -654,6 +654,6 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
 
     @Override
     public boolean canFlipToNextPage() {
-        return getFolderText() != null && !(wfoExport && configurator.getTaxonNodeFilter().getSubtreeFilter().isEmpty());
+        return getFolderText() != null && !(wfoBackboneExport && configurator.getTaxonNodeFilter().getSubtreeFilter().isEmpty());
     }
 }
index 71c88029bd5eb370486942278c5df3afd716a146..39309b04b7a144bade73467e7599dd0c7d84e7da 100644 (file)
@@ -249,7 +249,7 @@ public class AppModelId {
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_CSV_OPENCSVEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.csv.OpenCsvExportWizard";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_CSV_PRINT_OPENCSVPRINTEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.csv.print.OpenCsvPrintExportWizard";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_DWCA_OPENDWCAEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.dwca.OpenDwcaExportWizard";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_DWCA_OPENWFOEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.dwca.OpenWFOExportWizard";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_DWCA_OPENWFOBACKBONEEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.dwca.OpenWfoBackboneExportWizard";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_JAXB_OPENJAXBEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.jaxb.OpenJaxbExportWizard";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_OWL_OPENOWLTERMEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.owl.OpenOwlTermExportWizard";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_IO_E4_OUT_SDD_OPENSDDEXPORTWIZARD = "eu.etaxonomy.taxeditor.io.e4.out.sdd.OpenSddExportWizard";