From: Patrick Plitzner Date: Fri, 26 Apr 2019 07:59:46 +0000 (+0200) Subject: ref #8248 Split import wizard page X-Git-Tag: 5.7.0^2~25 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/e8e9ccfaea5b73d1d12108c149d2deacc2caf72a ref #8248 Split import wizard page --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java index ec26adae1..8dba54e9b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java @@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore; * @date 04.05.2017 * */ -public class ImportFromFileAndChooseVocIdWizardPageE4 extends ImportFromFileDataSourceWizardPageE4 { +public class ImportFromFileAndChooseVocIdWizardPageE4 extends ImportFromFileDataSourceWithReferenceWizardPage { private Combo vocabularyCombo; UUID vocUuid; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java new file mode 100644 index 000000000..3418760ac --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java @@ -0,0 +1,59 @@ +/** +* Copyright (C) 2007 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ + +package eu.etaxonomy.taxeditor.io.e4.in; + +import javax.inject.Inject; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; + +/** + * + * @author pplitzner + * @since Oct 5, 2017 + * + */ +public class ImportFromFileDataSourceWithReferenceWizardPage extends ImportFromFileDataSourceWizardPage { + + private Text textReferenceString; + + protected Text text_source; + + @Inject + public ImportFromFileDataSourceWithReferenceWizardPage() { + super(); + } + + /** {@inheritDoc} */ + @Override + public void createControl(Composite parent) { + super.createControl(parent); + + Label labelRef = new Label(composite, SWT.NONE); + labelRef.setText("Default import source reference"); + new Label(composite, SWT.NONE); + textReferenceString = new Text(composite, SWT.NONE); + textReferenceString.setEnabled(true); + textReferenceString.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 1, 1)); + new Label(composite, SWT.NONE); + } + + public Text getTextReferenceString() { + return textReferenceString; + } + + public void setTextReferenceString(Text textReferenceString) { + this.textReferenceString = textReferenceString; + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPageE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java similarity index 63% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPageE4.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java index 7a08b4b72..a28fb75f2 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPageE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java @@ -34,19 +34,20 @@ import eu.etaxonomy.cdm.common.CdmUtils; * @since Oct 5, 2017 * */ -public class ImportFromFileDataSourceWizardPageE4 extends WizardPage { +public class ImportFromFileDataSourceWizardPage extends WizardPage { - public static final String PAGE_NAME = "CdmXmlDataSourceWizardPage"; + public static final String PAGE_NAME = "ImportDataSourceWizardPage"; private String[] extensions = {"*.xml"}; private FileDialog fileDialog; - private Text textReferenceString; protected Text text_source; + protected Composite composite; + @Inject - public ImportFromFileDataSourceWizardPageE4() { + public ImportFromFileDataSourceWizardPage() { super(PAGE_NAME); setTitle("Xml File"); @@ -63,12 +64,12 @@ public class ImportFromFileDataSourceWizardPageE4 extends WizardPage { /** {@inheritDoc} */ @Override public void createControl(Composite parent) { - final Composite composite = new Composite(parent, SWT.NULL); + composite = new Composite(parent, SWT.NULL); setPageComplete(false); GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 3; + gridLayout.numColumns = 2; composite.setLayout(gridLayout); Label folderLabel = new Label(composite, SWT.NONE); @@ -77,6 +78,7 @@ public class ImportFromFileDataSourceWizardPageE4 extends WizardPage { fileDialog = new FileDialog(parent.getShell()); fileDialog.setFilterExtensions(extensions); + new Label(composite, SWT.NONE); text_source = new Text(composite, SWT.BORDER); text_source.setEditable(false); @@ -88,40 +90,25 @@ public class ImportFromFileDataSourceWizardPageE4 extends WizardPage { button.addSelectionListener(new SelectionAdapter(){ - @Override - public void widgetSelected(SelectionEvent e) { - String path = fileDialog.open(); - if(path!=null){ - text_source.setText(path); - setPageComplete(isPageComplete()); - } - } + @Override + public void widgetSelected(SelectionEvent e) { + String path = fileDialog.open(); + if(path!=null){ + text_source.setText(path); + setPageComplete(isPageComplete()); + } + } }); - Label labelRef = new Label(composite, SWT.NONE); - labelRef.setText("Default import souce reference"); - labelRef.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 3, 1)); - textReferenceString = new Text(composite, SWT.NONE); - textReferenceString.setEnabled(true); - GridData gd_textReferenceString = new GridData(SWT.LEFT, SWT.TOP, true, true, 1, 1); - gd_textReferenceString.widthHint = 229; - textReferenceString.setLayoutData(gd_textReferenceString); - setControl(composite); + + setControl(composite); } public File getFile() { return new File(text_source.getText()); } - public Text getTextReferenceString() { - return textReferenceString; - } - - public void setTextReferenceString(Text textReferenceString) { - this.textReferenceString = textReferenceString; - } - public URI getUri() { return getFile().toURI(); } 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 4f463c530..8453003f2 100644 --- 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 @@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE; import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4; -import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4; +import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWithReferenceWizardPage; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore; public class AbcdImportWizardE4 extends AbstractImportWizardE4 { private Abcd206ImportConfigurator configurator; - private ImportFromFileDataSourceWizardPageE4 dataSourcePage; + private ImportFromFileDataSourceWithReferenceWizardPage dataSourcePage; private ClassificationChooserWizardPageE4 classificationChooserWizardPage; @Inject @@ -84,7 +84,7 @@ public class AbcdImportWizardE4 extends AbstractImportWizardE4