Project

General

Profile

« Previous | Next » 

Revision 86536e03

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase in app-import

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/synthesysImport/SynthesysCacheActivator.java
36 36
import eu.etaxonomy.cdm.model.location.NamedArea;
37 37
import eu.etaxonomy.cdm.model.location.Point;
38 38
import eu.etaxonomy.cdm.model.name.ITaxonNameBase;
39
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
39
import eu.etaxonomy.cdm.model.name.TaxonName;
40 40
import eu.etaxonomy.cdm.model.occurrence.Collection;
41 41
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
42 42
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
......
168 168
			ITaxonNameBase taxonName = null;
169 169
			Taxon taxon = null;
170 170
			DeterminationEvent determinationEvent = null;
171
			List<TaxonNameBase> names = null;
171
			List<TaxonName> names = null;
172 172
			NonViralNameParserImpl nvnpi = NonViralNameParserImpl.NewInstance();
173 173
			String scientificName="";
174 174
			boolean preferredFlag=false;
......
204 204

  
205 205

  
206 206
//				tx = app.startTransaction();
207
				app.getNameService().saveOrUpdate(TaxonNameBase.castAndDeproxy(taxonName));
207
				app.getNameService().saveOrUpdate(TaxonName.castAndDeproxy(taxonName));
208 208
				taxon = Taxon.NewInstance(taxonName, sec); //TODO use real reference for sec
209 209
//				app.commitTransaction(tx);
210 210

  
......
254 254
				//.searchCollectionByCode(this.collectionCode);
255 255
			}catch(Exception e){
256 256
				System.out.println("BLA"+e);
257
				collections=new ArrayList<Collection>();
257
				collections=new ArrayList<>();
258 258
			}
259 259
			if (collections.size() ==0){
260 260
				System.out.println("Collection not found "+this.collectionCode);

Also available in: Unified diff