Project

General

Profile

« Previous | Next » 

Revision 940769b9

Added by Katja Luther over 6 years ago

ref #6974: move the configurator page behind the file selection page

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
99 99
    /** {@inheritDoc} */
100 100
    @Override
101 101
    public void addPages() {
102
        addConfiguratorPage();
103 102
        addDataSourcePage();
104

  
103
        addConfiguratorPage();
105 104

  
106 105
    }
107 106
    @Override
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
60 60
	/** {@inheritDoc} */
61 61
	@Override
62 62
	public void addPages() {
63
		super.addPages();
64 63
		dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
65 64
        dataSourcePage.setTitle("Choose Specimen CDM Excel");
66 65
        dataSourcePage.setDescription("Please choose an xls file in the SpecimenCdmExcel format.");
67 66
        dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
68 67

  
69 68
		addPage(dataSourcePage);
69
		super.addPages();
70 70
	}
71 71

  
72 72
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
104 104
	/** {@inheritDoc} */
105 105
	@Override
106 106
	public void addPages() {
107
		super.addPages();
108

  
109
		dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
107
	    dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
110 108
		dataSourcePage.setTitle("Choose NormalExplicit");
111 109
		dataSourcePage.setDescription("Please choose an xls file in the NormalExplicit format.");
112 110
		dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
113 111
		addPage(dataSourcePage);
112
		  super.addPages();
113

  
114 114
	}
115 115
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
52 52

  
53 53
	@Override
54 54
	public void addPages() {
55
		super.addPages();
55

  
56 56
		dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
57 57
        dataSourcePage.setTitle("Choose File");
58 58
        dataSourcePage.setDescription("Please choose an XML file in the SDD format.");
59 59
        dataSourcePage.setExtensions(new String[]{"*.xml", "*.sdd"});
60 60

  
61 61
		addPage(dataSourcePage);
62
		super.addPages();
62 63
	}
63 64

  
64 65
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java
72 72
	/** {@inheritDoc} */
73 73
	@Override
74 74
	public void addPages() {
75
		super.addPages();
76 75
		dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
77 76
		addPage(dataSourcePage);
77
		super.addPages();
78 78
	}
79 79
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/jaxb/JaxbExportWizardE4.java
70 70
	/** {@inheritDoc} */
71 71
	@Override
72 72
	public void addPages() {
73
		super.addPages();
74

  
75 73
		page = ExportToFileDestinationWizardPage.Jaxb(configurator);
76 74
		addPage(page);
75
		super.addPages();
77 76
	}
78 77

  
79 78
	/** {@inheritDoc} */

Also available in: Unified diff