Revision 59cf966f
Added by Lutz Suhrbier over 12 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java | ||
|---|---|---|
| 19 | 19 |
import org.eclipse.swt.widgets.Display; |
| 20 | 20 |
import org.springframework.core.io.Resource; |
| 21 | 21 |
|
| 22 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
|
| 23 | 22 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
| 24 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration;
|
|
| 23 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
|
| 25 | 24 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum; |
| 26 | 25 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 27 | 26 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| ... | ... | |
| 84 | 83 |
CdmStore.close(monitor); |
| 85 | 84 |
} |
| 86 | 85 |
|
| 87 |
ICdmApplicationRemoteConfiguration applicationController = null;
|
|
| 86 |
ICdmApplicationConfiguration applicationController = null; |
|
| 88 | 87 |
|
| 89 | 88 |
if (!monitor.isCanceled()) {
|
| 90 | 89 |
CdmProgressMonitorAdapter subprogressMonitor = CdmProgressMonitorAdapter |
Also available in: Unified diff
Result of first merge, updated getTaxon() String