Project

General

Profile

« Previous | Next » 

Revision 0869e41d

Added by Katja Luther over 6 years ago

fix #6974: missing io wizards adapted

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
88 88

  
89 89
		addPage(classificationChooserWizardPage);
90 90
		addPage(dataSourcePage);
91
		addConfiguratorPage();
91 92
		super.addPages();
92 93

  
93 94
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
56 56
    /** {@inheritDoc} */
57 57
    @Override
58 58
    public ExcelDistributionUpdateConfigurator getConfigurator() {
59
        return configurator;
59
              return configurator;
60 60
    }
61 61

  
62 62
    /** {@inheritDoc} */
......
109 109
        ignoreMethods.add("setIgnoreNull");
110 110
        ignoreMethods.add("setInteractWithUser");
111 111
        ignoreMethods.add("setUseClassification");
112
        ignoreMethods.add("setRegisterAuditing");
113
        ignoreMethods.add("setDeduplicateAuthors");
114
        ignoreMethods.add("setDeduplicateReferences");
112 115
        pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
113 116
        pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelDistributionUpdateWizard_ConfiguratorWizard_label);
114 117
        addPage(pageConfiguration);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
4 4
package eu.etaxonomy.taxeditor.io.e4.in.excel.specimen;
5 5

  
6 6
import java.net.URI;
7
import java.util.ArrayList;
8
import java.util.List;
7 9

  
8 10
import javax.inject.Inject;
9 11

  
......
14 16
import eu.etaxonomy.cdm.database.DbSchemaValidation;
15 17
import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
16 18
import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
19
import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
17 20
import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
21
import eu.etaxonomy.taxeditor.l10n.Messages;
18 22
import eu.etaxonomy.taxeditor.store.CdmStore;
19 23

  
20 24
/**
......
69 73
		super.addPages();
70 74
	}
71 75

  
76
	 @Override
77
	 protected void addConfiguratorPage(){
78
	     List<String> ignoreMethods = new ArrayList<>();
79
         ignoreMethods.add("setIgnoreNull");
80
         ignoreMethods.add("setInteractWithUser");
81
         ignoreMethods.add("setUseClassification");
82
         ignoreMethods.add("setRegisterAuditing");
83
         pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
84
         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelSpecimenUpdateWizard_ConfiguratorWizard_label);
85
         addPage(pageConfiguration);
86
    }
87

  
72 88
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
14 14
import java.io.FileNotFoundException;
15 15
import java.io.IOException;
16 16
import java.net.URI;
17
import java.util.ArrayList;
18
import java.util.List;
17 19

  
18 20
import javax.inject.Inject;
19 21
import javax.inject.Named;
......
34 36
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
35 37
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
36 38
import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
39
import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
37 40
import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
41
import eu.etaxonomy.taxeditor.l10n.Messages;
38 42
import eu.etaxonomy.taxeditor.store.CdmStore;
39 43

  
40 44

  
......
112 116
		  super.addPages();
113 117

  
114 118
	}
119
	 @Override
120
     protected void addConfiguratorPage(){
121
         List<String> ignoreMethods = new ArrayList<>();
122
         ignoreMethods.add("setIgnoreNull");
123
         ignoreMethods.add("setInteractWithUser");
124
         ignoreMethods.add("setUseClassification");
125
         ignoreMethods.add("setRegisterAuditing");
126
         pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
127
         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelSpecimenUpdateWizard_ConfiguratorWizard_label);
128
         addPage(pageConfiguration);
129
    }
115 130
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/sdd/SddExportWizardE4.java
63 63
	/** {@inheritDoc} */
64 64
	@Override
65 65
	public void addPages() {
66
		super.addPages();
67

  
68 66
		page = ExportToFileDestinationWizardPage.Sdd(configurator);
69 67
		addPage(page);
68
		super.addPages();
70 69
	}
71 70

  
72 71
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
297 297
    public static String SetPublishConfiguration_IncludeSynonyms;
298 298

  
299 299

  
300
    public static String ExcelSpecimenUpdateWizard_ConfiguratorWizard_label;
301

  
302

  
303
    public static String ExcelTaxonUpdateWizard_ConfiguratorWizard_label;
304

  
305

  
300 306

  
301 307

  
302 308

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
235 235
SetPublishConfiguration_Description_Configurator=Configure where the publish flag should be set
236 236
SetPublishConfiguration_IncludeAcceptedTaxa=Accepted taxa
237 237
SetPublishConfiguration_IncludeSharedtaxa=Shared taxa
238
SetPublishConfiguration_IncludeSynonyms=Synonyms
238
SetPublishConfiguration_IncludeSynonyms=Synonyms
239

  
240
ExcelSpecimenUpdateWizard_ConfiguratorWizard_label=Configuration of excel specimen import
241
ExcelTaxonUpdateWizard_ConfiguratorWizard_label=Configuration of excel taxon import
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
236 236
SetPublishConfiguration_Description_Configurator=Konfigurieren Sie, wie das Setzen des Publish Flags durchgef?hrt werden soll.
237 237
SetPublishConfiguration_IncludeAcceptedTaxa=Akzeptierte Taxa
238 238
SetPublishConfiguration_IncludeSharedtaxa=Mehrfach verwendete Taxa mit einbeziehen
239
SetPublishConfiguration_IncludeSynonyms=Synonyme
239
SetPublishConfiguration_IncludeSynonyms=Synonyme
240

  
241
ExcelSpecimenUpdateWizard_ConfiguratorWizard_label=Konfiguration des Excel Specimen Imports
242
ExcelTaxonUpdateWizard_ConfiguratorWizard_label=Konfiguration des Excel Taxon Imports

Also available in: Unified diff