Project

General

Profile

Revision 1e816532

ID1e8165329a7ccab52bfe34a8b2dd75ead7147ede
Parent c87fb375
Child 45fd1bf4

Added by Katja Luther over 2 years ago

smaller changes in io wizards and navigator menu

View differences:

eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
51 51
        <children xsi:type="menu:HandledMenuItem" xmi:id="_9hdNkJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.fixclassificationhierarchy" label="%command.label.fixClassificationHierarchy" command="_jXX0YJIxEeeJAdt8ZUxyaw"/>
52 52
        <children xsi:type="menu:HandledMenuItem" xmi:id="_ivOrwJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.cloneclassification" label="Clone Classification" command="_nOOxMJIxEeeJAdt8ZUxyaw"/>
53 53
        <children xsi:type="menu:MenuSeparator" xmi:id="_ktyqMJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.1"/>
54
        <children xsi:type="menu:HandledMenuItem" xmi:id="_lALasJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonym" label="%command.label.6" command="_p7Oi8JIxEeeJAdt8ZUxyaw"/>
54
        <children xsi:type="menu:HandledMenuItem" xmi:id="_lALasJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonym" label="%command.label.6" command="_p7Oi8JIxEeeJAdt8ZUxyaw">
55
          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_v0c4YFerEeiKs7VTbRzV-A" coreExpressionId="isTaxonBase"/>
56
        </children>
55 57
        <children xsi:type="menu:HandledMenuItem" xmi:id="_nh_3MJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.moveTaxon" label="%command.label.7" command="_w4RNkJIxEeeJAdt8ZUxyaw"/>
56 58
        <children xsi:type="menu:HandledMenuItem" xmi:id="_o1PAsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.movefactualdata" label="%command.label.moveFactualData" command="_3PRy8JIxEeeJAdt8ZUxyaw"/>
57 59
        <children xsi:type="menu:MenuSeparator" xmi:id="_rBdnsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.2"/>
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
7 7
 */
8 8
package eu.etaxonomy.taxeditor.navigation.navigator;
9 9

  
10
import java.util.ArrayList;
11 10
import java.util.Collection;
12 11

  
13 12
import org.eclipse.core.expressions.PropertyTester;
14 13

  
15
import eu.etaxonomy.cdm.model.taxon.Classification;
16 14
import eu.etaxonomy.cdm.model.taxon.Taxon;
17 15
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
16
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
18 17
public class TaxonNodePropertyTester extends PropertyTester {
19
	
18

  
20 19
	private static final Object HAS_SYNONYMS = "hasSynonyms"; //$NON-NLS-1$
21 20
	private static final Object HAS_TAXA = "hasTaxa"; //$NON-NLS-1$
22 21
	private static final Object IS_CLASSIFICATION = "isClassification"; //$NON-NLS-1$
23
	
22

  
24 23
	/** {@inheritDoc} */
25
	public boolean test(Object receiver, String property, Object[] args,
24
	@Override
25
    public boolean test(Object receiver, String property, Object[] args,
26 26
			Object expectedValue) {
27 27
		if (receiver instanceof Collection){
28 28
			if (((Collection)receiver).iterator().hasNext()){
......
44 44
				return false;
45 45
			}
46 46
		}
47
		if (receiver instanceof TaxonNode && IS_CLASSIFICATION.equals(property)) {
48
			TaxonNode node = (TaxonNode) receiver;
49
			return !node.hasTaxon();
47
		if (receiver instanceof TaxonNodeDto && IS_CLASSIFICATION.equals(property)) {
48
			TaxonNodeDto node = (TaxonNodeDto) receiver;
49
			return node.getTaxonUuid() == null;
50 50
		}
51
		
51

  
52 52
		return false;
53 53
	}
54 54
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
18 18
import java.util.UUID;
19 19

  
20 20
import org.apache.commons.io.IOUtils;
21
import org.apache.commons.lang.StringUtils;
22 21
import org.eclipse.core.runtime.Assert;
23 22
import org.eclipse.core.runtime.IProgressMonitor;
24 23
import org.eclipse.core.runtime.IStatus;
......
30 29
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
31 30
import eu.etaxonomy.cdm.api.application.ICdmRepository;
32 31
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
33
import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
34 32
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
35 33
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
36 34
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
37 35
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
38 36
import eu.etaxonomy.cdm.io.common.ImportResult;
39
import eu.etaxonomy.cdm.io.operation.config.SortIndexUpdaterConfigurator;
40 37
import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
41 38
import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
42 39
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
43 40
import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator;
41
import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
42
import eu.etaxonomy.cdm.io.operation.config.SortIndexUpdaterConfigurator;
44 43
import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator;
45 44
import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
46 45
import eu.etaxonomy.cdm.io.service.IIOService;
......
67 66
 * @version 1.0
68 67
 */
69 68
public class ImportManager extends AbstractIOManager<IImportConfigurator> implements IPostMoniteredOperationEnabled {
70
	
69

  
71 70
	String importSuccessMessage = "The import was successfull.";
72 71
	String updateSuccessMessage = "The update was successfull.";
73 72

  
......
565 564

  
566 565

  
567 566

  
568
   
567

  
569 568

  
570 569

  
571 570

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
34 34
import eu.etaxonomy.cdm.database.DbSchemaValidation;
35 35
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
36 36
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
37
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
37
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
38 38
import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
39 39
import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
40 40
import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
......
99 99
    public void init() {
100 100
		configurator =  CdmStore.getImportManager().NormalExplicitConfigurator();
101 101
		if (selection instanceof TreeSelection && !selection.isEmpty()){
102
			TaxonNode node = (TaxonNode)selection.getFirstElement();
103
			configurator.setParentUUID(node.getTaxon().getUuid());
104
			configurator.setClassificationUuid(node.getClassification().getUuid());
102
			TaxonNodeDto node = (TaxonNodeDto)selection.getFirstElement();
103
			configurator.setParentUUID(node.getTaxonUuid());
104
			configurator.setClassificationUuid(node.getClassificationUUID());
105 105
		}
106 106
	}
107 107

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
109 109
    private void addDataSourcePage(){
110 110
        dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
111 111
        dataSourcePage.setTitle("Choose Ris File");
112
        dataSourcePage.setDescription("Please choose an xls file in the Distribution Update format.");
112
        dataSourcePage.setDescription("Please choose a file in RIS format.");
113 113
        dataSourcePage.setExtensions(new String[]{"*.txt"});
114 114
        addPage(dataSourcePage);
115 115
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/name/CsvNameExportWizardE4.java
12 12
import java.io.File;
13 13

  
14 14
import javax.inject.Inject;
15
import javax.inject.Named;
15 16

  
16 17
import org.eclipse.core.runtime.jobs.Job;
17 18
import org.eclipse.e4.core.contexts.IEclipseContext;
19
import org.eclipse.e4.core.di.annotations.Optional;
20
import org.eclipse.e4.ui.services.IServiceConstants;
21
import org.eclipse.jface.viewers.IStructuredSelection;
22
import org.eclipse.jface.viewers.TreeSelection;
18 23
import org.eclipse.swt.widgets.Combo;
19 24
import org.eclipse.ui.progress.IProgressConstants;
20 25

  
21 26
import eu.etaxonomy.cdm.io.csv.caryophyllales.out.CsvNameExportConfigurator;
27
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
22 28
import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizardE4;
23 29
import eu.etaxonomy.taxeditor.io.wizard.ExportToFileDestinationWizardPage;
24 30
import eu.etaxonomy.taxeditor.store.CdmStore;
......
35 41
	protected ExportToFileDestinationWizardPage page;
36 42

  
37 43
    @Inject
38
	public CsvNameExportWizardE4(IEclipseContext context) {
39
	    super(context);
44
	public CsvNameExportWizardE4(IEclipseContext context,
45
            @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
46
	    super(context, selection);
40 47
	}
41 48

  
42 49
	@Override
43 50
	public void init() {
44 51
		configurator = CsvNameExportConfigurator.NewInstance(null,null);
45 52
		configurator.setNamesOnly(true);
53
		if (selection instanceof TreeSelection && !selection.isEmpty()){
54
            TaxonNodeDto node = (TaxonNodeDto)selection.getFirstElement();
55
            configurator.setClassificationUUID(node.getClassificationUUID());
56
        }
46 57
	}
47 58

  
48 59
	@Override
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/print/CsvPrintExportWizardE4.java
3 3
import java.io.File;
4 4

  
5 5
import javax.inject.Inject;
6
import javax.inject.Named;
6 7

  
7 8
import org.eclipse.e4.core.contexts.IEclipseContext;
9
import org.eclipse.e4.core.di.annotations.Optional;
10
import org.eclipse.e4.ui.services.IServiceConstants;
11
import org.eclipse.jface.viewers.IStructuredSelection;
8 12

  
9 13
import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
10 14
import eu.etaxonomy.cdm.io.common.ExportResultType;
......
16 20
public class CsvPrintExportWizardE4 extends CsvNameExportWizardE4{
17 21

  
18 22
    @Inject
19
    public CsvPrintExportWizardE4(IEclipseContext context) {
20
        super(context);
23
    public CsvPrintExportWizardE4(IEclipseContext context,
24
            @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
25
        super(context, selection);
21 26
    }
22 27

  
23 28
	@Override
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java
24 24

  
25 25
import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
26 26
import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;
27
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
27
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
28 28
import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizardE4;
29 29
import eu.etaxonomy.taxeditor.io.wizard.ExportToFileDestinationWizardPage;
30 30
import eu.etaxonomy.taxeditor.store.CdmStore;
......
55 55

  
56 56
			while(it.hasNext()){
57 57
				Object obj = it.next();
58
				if (obj instanceof TaxonNode){
59
					TaxonNode node = (TaxonNode) obj;
60
					if (node.getParent() == null){
58
				if (obj instanceof TaxonNodeDto){
59
					TaxonNodeDto node = (TaxonNodeDto) obj;
60
					if (node.getParentUUID() == null){
61 61
						if (configurator.getTaxonNodeFilter() == null){
62
							configurator.setTaxonNodeFilter(TaxonNodeFilter.NewClassificationInstance(node.getClassification().getUuid()));
62
							configurator.setTaxonNodeFilter(TaxonNodeFilter.NewClassificationInstance(node.getClassificationUUID()));
63 63
						}else{
64
							configurator.getTaxonNodeFilter().orClassification(node.getClassification().getUuid());
64
							configurator.getTaxonNodeFilter().orClassification(node.getClassificationUUID());
65 65
						}
66 66
					}else{
67 67
						if (configurator.getTaxonNodeFilter() == null){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
68 68
	@Override
69 69
	protected void createControls(ICdmFormElement formElement,
70 70
			TaxonRelationship entity, int style) {
71
		if (!(entity.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) || entity.getType().equals(TaxonRelationshipType.PRO_PARTE_MISAPPLIED_NAME_FOR())) ){
72
		    combo_taxonRelationshipType = formFactory.createTermComboElement(
73
                    TaxonRelationshipTypeInverseContainer.class,
74
                    formElement, "Relationship Type",
75
                    getTaxonRelationshipTypeInverseContainer(), style);
71
		if ((entity.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) || entity.getType().equals(TaxonRelationshipType.PRO_PARTE_MISAPPLIED_NAME_FOR())) ){
76 72

  
77
			combo_taxonRelationshipType.setEnabled(false);
78
			selection_relatedTaxon = formFactory.createSelectionElement(
79
					Taxon.class, //getConversationHolder(),
80
					formElement, "Related Taxon", getRelatedTaxon(),
81
					EntitySelectionElement.SELECTABLE, style);
82
			checkBoxDoubtful = formFactory.createCheckbox(formElement, "Relation Doubtful", entity.isDoubtful(), style);
83

  
84
		}else{
85 73
			taxon = entity.getFromTaxon();
86 74

  
87
			taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
88
			taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
89
			addControl(taxonElement);
90
			addElement(taxonElement);
91
			combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
75
            taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
76
            taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
77
            addControl(taxonElement);
78
            addElement(taxonElement);
79
            combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
80
                    entity.getType(), style);
81

  
82
            combo_misappliedRelationshipType.setEnabled(true);
83

  
84
            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
85
                 formElement, "Sensu",
86
                taxon.getSec(), EntitySelectionElement.ALL,
87
                style);
88

  
89
            text_sensu_microreference = formFactory.createTextWithLabelElement(
90
                    formElement, "Detail",
91
                    taxon.getSecMicroReference(),null,
92
                    SWT.WRAP);
93

  
94
            secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
95
                    formElement, "Misappl. Sec.",
96
                    entity.getCitation(), EntitySelectionElement.ALL,
97
                    style);
98

  
99
            text_secundum_microreference = formFactory.createTextWithLabelElement(
100
                    formElement, "Detail",
101
                    entity.getCitationMicroReference(),null,
102
                    SWT.WRAP);
103
            checkBoxDoubtful = formFactory.createCheckbox(formElement, "Misapplication Doubtful", entity.isDoubtful(), style);
104
		}else if ((entity.getType().equals(TaxonRelationshipType.PRO_PARTE_SYNONYM_FOR()) || entity.getType().equals(TaxonRelationshipType.PARTIAL_SYNONYM_FOR())) ){
105
		    taxon = entity.getFromTaxon();
106

  
107
            taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
108
            taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
109
            addControl(taxonElement);
110
            addElement(taxonElement);
111
            combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
92 112
                    entity.getType(), style);
93 113

  
94
			combo_misappliedRelationshipType.setEnabled(true);
114
            combo_misappliedRelationshipType.setEnabled(true);
115

  
116
            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
117
                 formElement, "Sensu",
118
                taxon.getSec(), EntitySelectionElement.ALL,
119
                style);
120

  
121
            text_sensu_microreference = formFactory.createTextWithLabelElement(
122
                    formElement, "Detail",
123
                    taxon.getSecMicroReference(),null,
124
                    SWT.WRAP);
95 125

  
96
			sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
97
				 formElement, "Sensu",
98
				taxon.getSec(), EntitySelectionElement.ALL,
99
				style);
126
            secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
127
                    formElement, "Syn Sec.",
128
                    entity.getCitation(), EntitySelectionElement.ALL,
129
                    style);
100 130

  
101
			text_sensu_microreference = formFactory.createTextWithLabelElement(
102
					formElement, "Detail",
103
					taxon.getSecMicroReference(),null,
104
					SWT.WRAP);
131
            text_secundum_microreference = formFactory.createTextWithLabelElement(
132
                    formElement, "Detail",
133
                    entity.getCitationMicroReference(),null,
134
                    SWT.WRAP);
135
            checkBoxDoubtful = formFactory.createCheckbox(formElement, "PP Doubtful", entity.isDoubtful(), style);
105 136

  
106
			secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
107
					formElement, "Misappl. Sec.",
108
					entity.getCitation(), EntitySelectionElement.ALL,
109
					style);
137
        }else{
138
            combo_taxonRelationshipType = formFactory.createTermComboElement(
139
                    TaxonRelationshipTypeInverseContainer.class,
140
                    formElement, "Relationship Type",
141
                    getTaxonRelationshipTypeInverseContainer(), style);
110 142

  
111
			text_secundum_microreference = formFactory.createTextWithLabelElement(
112
		            formElement, "Detail",
113
		            entity.getCitationMicroReference(),null,
114
		            SWT.WRAP);
115
			checkBoxDoubtful = formFactory.createCheckbox(formElement, "Misapplication Doubtful", entity.isDoubtful(), style);
143
            combo_taxonRelationshipType.setEnabled(false);
144
            selection_relatedTaxon = formFactory.createSelectionElement(
145
                    Taxon.class, //getConversationHolder(),
146
                    formElement, "Related Taxon", getRelatedTaxon(),
147
                    EntitySelectionElement.SELECTABLE, style);
148
            checkBoxDoubtful = formFactory.createCheckbox(formElement, "Relation Doubtful", entity.isDoubtful(), style);
116 149

  
117 150

  
118 151
		}

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)