Project

General

Profile

« Previous | Next » 

Revision 55c054e2

Added by Cherian Mathew about 10 years ago

reverting back cdm application configuration refactoring

View differences:

cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/CentralAfricaEricaceaeActivator.java
16 16
import org.apache.log4j.Logger;
17 17
import org.springframework.transaction.TransactionStatus;
18 18

  
19
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
19
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
20 20
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
21
import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
22 21
import eu.etaxonomy.cdm.api.service.ITermService;
23 22
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;
24 23
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
......
151 150
		
152 151
		//deduplicate
153 152
		if (doDeduplicate){
154
			ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
153
			ICdmApplicationConfiguration app = myImport.getCdmAppController();
155 154
			if (app == null){
156
				app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);
155
				app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);
157 156
			}
158 157
			app.getAgentService().updateTitleCache(Team.class, null, null, null);
159 158
			return;
......
172 171

  
173 172
		if (doSpecimen){
174 173
			logger.warn("Start specimen import");
175
			ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
174
			ICdmApplicationConfiguration app = myImport.getCdmAppController();
176 175
			SpecimenCdmExcelImportConfigurator specimenConfig= SpecimenCdmExcelImportConfigurator.NewInstance(specimenSource, cdmDestination);
177
			specimenConfig.setCdmAppController((CdmApplicationDefaultController)app);
176
			specimenConfig.setCdmAppController((CdmApplicationController)app);
178 177
			specimenConfig.setAreaMatchMode(specimenAreaMatchMode);
179 178
			
180 179
			config.setDbSchemaValidation(DbSchemaValidation.VALIDATE);
......
193 192
	}
194 193

  
195 194
	private void newNamedAreas(CdmDefaultImport<EfloraImportConfigurator> myImport) {
196
		ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
195
		ICdmApplicationConfiguration app = myImport.getCdmAppController();
197 196
		if (app == null){
198
			app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);
197
			app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false);
199 198
		}
200 199
		TransactionStatus tx = app.startTransaction();
201 200
		
cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaProspectiveTester.java
14 14

  
15 15
import org.apache.log4j.Logger;
16 16

  
17
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
17
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
18 18
import eu.etaxonomy.cdm.api.service.ITermService;
19 19
import eu.etaxonomy.cdm.database.DbSchemaValidation;
20 20
import eu.etaxonomy.cdm.database.ICdmDataSource;
......
54 54
	private void doImport(ICdmDataSource cdmDestination){
55 55
		observerList.add(observer);
56 56

  
57
		CdmApplicationDefaultController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);
57
		CdmApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll);
58 58
		ITermService service = app.getTermService();
59 59
	}		
60 60
	
cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
16 16
import org.apache.log4j.Logger;
17 17
import org.springframework.transaction.TransactionStatus;
18 18

  
19
import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
19
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
20 20
import eu.etaxonomy.cdm.app.eflora.CdmDestinations;
21 21
import eu.etaxonomy.cdm.app.eflora.EfloraSources;
22 22
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;
......
91 91
		
92 92
		CdmDefaultImport<EfloraImportConfigurator> myImport = new CdmDefaultImport<EfloraImportConfigurator>();
93 93
		
94
		ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
94
		ICdmApplicationConfiguration app = myImport.getCdmAppController();
95 95
		
96 96
		
97 97
		//
......
121 121
	 * @param app
122 122
	 * @param tree
123 123
	 */
124
	private void moveChild(ICdmApplicationDefaultConfiguration app, FeatureTree tree) {
124
	private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) {
125 125
		FeatureNode root = tree.getRoot();
126 126
		int count = root.getChildCount();
127 127
		FeatureNode lastChild = root.getChildAt(count - 1);

Also available in: Unified diff