Project

General

Profile

Revision 2eb8c59a

ID2eb8c59a1827b0a6a1a6cbe74af5cf30f5b1d62d
Parent 525e9751
Child 49db4e78

Added by Andreas Müller 5 months ago

cleanup

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
118 118
	public static final UUID uuidUserDefinedNomenclaturalStatusTypeVocabulary = UUID.fromString("1a5c7745-5588-4151-bc43-9ca22561977b");
119 119

  
120 120

  
121

  
122 121
	private static final String UuidOnly = "UUIDOnly";
123 122
	private static final String UuidLabel = "UUID or label";
124 123
	private static final String UuidLabelAbbrev = "UUID, label or abbreviation";
......
127 126
	private final static String authorSeparator = ", ";
128 127
    private final static String lastAuthorSeparator = " & ";
129 128

  
130
	public enum TermMatchMode{
129
    public enum TermMatchMode{
131 130
		UUID_ONLY(0, UuidOnly)
132 131
		,UUID_LABEL(1, UuidLabel)
133 132
		,UUID_LABEL_ABBREVLABEL(2, UuidLabelAbbrev)
134 133
		,UUID_ABBREVLABEL(3, UuidAbbrev)
135 134
		;
136 135

  
137

  
138 136
		private final int id;
139 137
		private final String representation;
140 138
		private TermMatchMode(int id, String representation){
......
156 154
				default: return UUID_ONLY;
157 155
			}
158 156
 		}
157
	}
159 158

  
160 159

  
161 160
	}
......
178 177
		Classification tree = Classification.NewInstance(treeName);
179 178
		tree.setReference(reference);
180 179

  
181

  
182 180
		// use defined uuid for first tree
183 181
		CONFIG config = (CONFIG)state.getConfig();
184 182
		if (state.countTrees() < 1 ){
......
219 217
		return tree;
220 218
	}
221 219

  
222

  
223

  
224

  
225 220
	protected ExtensionType getExtensionType(STATE state, UUID uuid, String label, String text, String labelAbbrev){
226 221
		return getExtensionType(state, uuid, label, text, labelAbbrev, null);
227 222
	}
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmIO.java
16 16
 * @author a.mueller
17 17
 * @since 20.06.2008
18 18
 */
19

  
20 19
public interface ICdmIO<STATE extends IoStateBase> extends  IIoObservable {
21 20

  
22 21
	final String TEAM_STORE = "team";
......
31 30

  
32 31
//	public boolean invoke(T config, Map<String, MapWrapper<? extends CdmBase>> stores);
33 32

  
34

  
35

  
36 33
//	public boolean invoke(IoState<T> state);
37 34

  
38 35
	public void updateProgress(STATE state, String message);
......
45 42

  
46 43
//******************** Observers *********************************************************
47 44

  
48

  
49 45
	/**
50 46
	 * If this object fires an event then notify all of its observers.
51 47
	 */
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/fact/altitude/in/AltitudeExcelImportRow.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.io.fact.altitude.in;
10

  
11
import java.util.UUID;
12

  
13
/**
14
 * Data holder class for altitude import for taxa.
15
 *
16
 * @author a.mueller
17
 * @since 28.05.2020
18
 */
19
public class AltitudeExcelImportRow {
20
    private UUID taxonUuid;
21
    private String fullTaxonName;
22
    private String fileName;
23
    private String copyright;
24
    private String artist;
25

  
26
}
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
44 44

  
45 45
/**
46 46
 * @author a.mueller
47
 *
48 47
 */
49 48
@Component
50 49
public class MarkupDocumentImport
......
114 113
		}
115 114

  
116 115
		return;
117

  
118 116
	}
119 117

  
120

  
121 118
	/**
122 119
	 * This comes from the old version, needs to be checked on need
123 120
	 *
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
165 165
     * @see #addStateData(StateData)
166 166
     * @param state
167 167
     */
168
    public void addStateData(State state){
168
    public StateData addStateData(State state){
169 169
        StateData stateData = StateData.NewInstance(state);
170 170
        addStateData(stateData);
171
        return stateData;
171 172
    }
172 173

  
173 174

  

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)