Project

General

Profile

« Previous | Next » 

Revision 091fb45b

Added by Andreas Müller about 7 years ago

ref #6265, ref #6362 Adapt SalvadorActivator to new name structure and cleanup

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorActivator.java
29 29
import eu.etaxonomy.cdm.model.description.FeatureTree;
30 30
import eu.etaxonomy.cdm.model.name.INonViralName;
31 31
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
32
import eu.etaxonomy.cdm.model.name.NonViralName;
33 32

  
34 33

  
35 34
/**
......
47 46
	//database validation status (create, update, validate ...)
48 47
	static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;
49 48
	static final Source berlinModelSource = BerlinModelSources.El_Salvador();
50
//	static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
49
	static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
51 50
//    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_salvador_preview();
52
    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_salvador_production();
51
//    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_salvador_production();
53 52
	static final UUID treeUuid = UUID.fromString("b010c84d-6049-45f4-9f13-c065101eaa26");
54 53
	static final UUID secUuid = UUID.fromString("d03ef02a-f226-4cb1-bdb4-f6c154f08a34");
55 54
	static final int sourceSecId = 7331;
......
175 174
		config.setFeatureTreeTitle("Salvador Portal Feature Tree");
176 175

  
177 176
		// invoke import
178
		CdmDefaultImport<BerlinModelImportConfigurator> bmImport = new CdmDefaultImport<BerlinModelImportConfigurator>();
177
		CdmDefaultImport<BerlinModelImportConfigurator> bmImport = new CdmDefaultImport<>();
179 178
		ImportResult result = bmImport.invoke(config);
180 179

  
181 180
		createFeatureTree(config, bmImport);
......
233 232
	private Method getHandleNameRelationshipTypeMethod(){
234 233
		String methodName = "handleNameRelationshipType";
235 234
		try {
236
			Method method = this.getClass().getDeclaredMethod(methodName, Integer.class, NonViralName.class, NonViralName.class);
235
			Method method = this.getClass().getDeclaredMethod(methodName, Integer.class, INonViralName.class, INonViralName.class);
237 236
			method.setAccessible(true);
238 237
			return method;
239 238
		} catch (Exception e) {
......
245 244

  
246 245
	//used by BerlinModelImportConfigurator
247 246
	@SuppressWarnings("unused")
248
	private static boolean handleNameRelationshipType(Integer relQualifierFk, INonViralName nameTo, NonViralName nameFrom){
247
	private static boolean handleNameRelationshipType(Integer relQualifierFk, INonViralName nameTo, INonViralName nameFrom){
249 248
		if (relQualifierFk == 72){
250 249
			nameTo.getHomotypicalGroup().merge(nameFrom.getHomotypicalGroup());
251 250
			return true;

Also available in: Unified diff