Revision 37d9e2ca
Added by Cherian Mathew about 10 years ago
| 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.CdmApplicationController; |
|
| 19 |
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
|
|
| 20 | 20 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
| 21 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration; |
|
| 21 | 22 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 22 | 23 |
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; |
| 23 | 24 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
| ... | ... | |
| 150 | 151 |
|
| 151 | 152 |
//deduplicate |
| 152 | 153 |
if (doDeduplicate){
|
| 153 |
ICdmApplicationConfiguration app = myImport.getCdmAppController(); |
|
| 154 |
ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
|
|
| 154 | 155 |
if (app == null){
|
| 155 |
app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false); |
|
| 156 |
app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);
|
|
| 156 | 157 |
} |
| 157 | 158 |
app.getAgentService().updateTitleCache(Team.class, null, null, null); |
| 158 | 159 |
return; |
| ... | ... | |
| 171 | 172 |
|
| 172 | 173 |
if (doSpecimen){
|
| 173 | 174 |
logger.warn("Start specimen import");
|
| 174 |
ICdmApplicationConfiguration app = myImport.getCdmAppController(); |
|
| 175 |
ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
|
|
| 175 | 176 |
SpecimenCdmExcelImportConfigurator specimenConfig= SpecimenCdmExcelImportConfigurator.NewInstance(specimenSource, cdmDestination); |
| 176 |
specimenConfig.setCdmAppController((CdmApplicationController)app); |
|
| 177 |
specimenConfig.setCdmAppController((CdmApplicationDefaultController)app);
|
|
| 177 | 178 |
specimenConfig.setAreaMatchMode(specimenAreaMatchMode); |
| 178 | 179 |
|
| 179 | 180 |
config.setDbSchemaValidation(DbSchemaValidation.VALIDATE); |
| ... | ... | |
| 192 | 193 |
} |
| 193 | 194 |
|
| 194 | 195 |
private void newNamedAreas(CdmDefaultImport<EfloraImportConfigurator> myImport) {
|
| 195 |
ICdmApplicationConfiguration app = myImport.getCdmAppController(); |
|
| 196 |
ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
|
|
| 196 | 197 |
if (app == null){
|
| 197 |
app = CdmApplicationController.NewInstance(cdmDestination, hbm2dll, false); |
|
| 198 |
app = CdmApplicationDefaultController.NewInstance(cdmDestination, hbm2dll, false);
|
|
| 198 | 199 |
} |
| 199 | 200 |
TransactionStatus tx = app.startTransaction(); |
| 200 | 201 |
|
| 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.CdmApplicationController; |
|
| 17 |
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
|
|
| 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 |
CdmApplicationController app = CdmIoApplicationController.NewInstance(cdmDestination, hbm2dll); |
|
| 57 |
CdmApplicationDefaultController 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.ICdmApplicationConfiguration; |
|
| 19 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
|
|
| 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 |
ICdmApplicationConfiguration app = myImport.getCdmAppController(); |
|
| 94 |
ICdmApplicationDefaultConfiguration app = myImport.getCdmAppController();
|
|
| 95 | 95 |
|
| 96 | 96 |
|
| 97 | 97 |
// |
| ... | ... | |
| 121 | 121 |
* @param app |
| 122 | 122 |
* @param tree |
| 123 | 123 |
*/ |
| 124 |
private void moveChild(ICdmApplicationConfiguration app, FeatureTree tree) {
|
|
| 124 |
private void moveChild(ICdmApplicationDefaultConfiguration 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
refactoring cdm application configuration / controller