ref #8631: remove the possibility to search for dna when importing from abcd file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
index 342ca9d2166d3d6830682b8a097fd739457d8ac8..d63ae6323b88b6bb5d903267f9c09655013e3453 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
@@ -74,7 +74,7 @@ public class AbcdImportWizardE4 extends AbstractImportWizardE4<Abcd206ImportConf
 
        @Override
        protected void addConfiguratorPage() {
-           AbcdImportConfiguratorWizardPage configuratorWizardPage = AbcdImportConfiguratorWizardPage.createPage(configurator);//AbcdImportConfiguratorWizardPage.createPage(configurator);
+           AbcdImportConfiguratorWizardPage configuratorWizardPage = AbcdImportConfiguratorWizardPage.createFileImportPage(configurator);//AbcdImportConfiguratorWizardPage.createPage(configurator);
            //configuratorWizardPage.setConfigurator(configurator);
                addPage(configuratorWizardPage);
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
index 15d1ae14a9fefae171260b267eba546144f8d615..2eaf95bf697644bb58389abc4038d94b358b8b34 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
@@ -52,6 +52,7 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
 
        private List<URI> biocaseProvider = new ArrayList<>();
 
+       private boolean isFileImport = false;
        private boolean isPreferencePage = false;
 
     private Combo nomenclaturalCodeSelectionCombo;
@@ -65,22 +66,27 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
         setDescription(description);
     }
 
-       protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator, boolean isPreferencePage) {
+       protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator, boolean isPreferencePage, boolean isFileImport) {
                super(PAGE_NAME);
                this.abcdImportConfigurator = configurator;
                setTitle(title);
                setDescription(description);
                this.isPreferencePage = isPreferencePage;
+               this.isFileImport = isFileImport;
        }
 
        public static AbcdImportConfiguratorWizardPage createPage(Abcd206ImportConfigurator configurator){
                return new AbcdImportConfiguratorWizardPage("Configure import parameters",
                                "Tooltips will explain parameters in more detail", configurator);
        }
+       public static AbcdImportConfiguratorWizardPage createFileImportPage(Abcd206ImportConfigurator configurator){
+        return new AbcdImportConfiguratorWizardPage("Configure import parameters",
+                "Tooltips will explain parameters in more detail", configurator, false, true);
+    }
 
        public static AbcdImportConfiguratorWizardPage createPreferencePage(Abcd206ImportConfigurator configurator){
         return new AbcdImportConfiguratorWizardPage("Configure import parameters",
-                "Tooltips will explain parameters in more detail", configurator, true);
+                "Tooltips will explain parameters in more detail", configurator, true, false);
     }
 
 
@@ -233,30 +239,35 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
             }
         });
 
-        Label labelRef = new Label(composite, SWT.NONE);
-        labelRef.setText("Biocase provider for associated DNA");
-        new Label(composite, SWT.NONE);
 
-        textDNAProviderString = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
-        textDNAProviderString.setLayoutData(gridData);
-        textDNAProviderString.add("Do not search for DNA");
-        String allProviderString = PreferencesUtil.getStringValue(PreferencePredicate.BioCaseProvider.getKey(), false);
-        if (StringUtils.isNotBlank(allProviderString)){
-            String[] providerArray = allProviderString.split(";"); //$NON-NLS-1$
-            for (String providerString : providerArray){
-                if (!StringUtils.isBlank(providerString)){
-                    textDNAProviderString.add(providerString);
+        if (!isFileImport){
+            Label labelRef = new Label(composite, SWT.NONE);
+            labelRef.setText("Biocase provider for associated DNA");
+            new Label(composite, SWT.NONE);
+            textDNAProviderString = new Combo(composite, SWT.BORDER);
+            textDNAProviderString.setLayoutData(gridData);
+            textDNAProviderString.add("Do not search for DNA");
 
+            String allProviderString = PreferencesUtil.getStringValue(PreferencePredicate.BioCaseProvider.getKey(), false);
+            if (StringUtils.isNotBlank(allProviderString)){
+                String[] providerArray = allProviderString.split(";"); //$NON-NLS-1$
+                for (String providerString : providerArray){
+                    if (!StringUtils.isBlank(providerString)){
+                        textDNAProviderString.add(providerString);
+
+                    }
                 }
             }
-        }
-        textDNAProviderString.setEnabled(true);
-        textDNAProviderString.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 1, 1));
-        if (abcdImportConfigurator.getDnaSoure() != null){
-               textDNAProviderString.setText(abcdImportConfigurator.getDnaSoure().toString());
-        }
-        textDNAProviderString.addSelectionListener(this);
+            textDNAProviderString.setEnabled(true);
 
+            textDNAProviderString.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 1, 1));
+            if (abcdImportConfigurator.getDnaSoure() != null){
+               textDNAProviderString.select(0);
+            }
+            textDNAProviderString.addSelectionListener(this);
+        }else{
+            abcdImportConfigurator.setDnaSoure(null);
+        }
 //        GridData gridData = new GridData();
 //        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
 //        gridData.horizontalIndent = 5;