Revision 9bd84319
Added by Cherian Mathew about 10 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
| 31 | 31 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 32 | 32 |
import eu.etaxonomy.cdm.api.service.IService; |
| 33 |
import eu.etaxonomy.cdm.config.ICdmSource; |
|
| 33 | 34 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| 34 | 35 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 35 | 36 |
import eu.etaxonomy.cdm.ext.geo.IEditGeoService; |
| ... | ... | |
| 83 | 84 |
|
| 84 | 85 |
private Language language; |
| 85 | 86 |
|
| 86 |
private ICdmDataSource cdmDatasource;
|
|
| 87 |
private ICdmSource cdmSource;
|
|
| 87 | 88 |
|
| 88 | 89 |
private boolean isConnected; |
| 89 | 90 |
|
| ... | ... | |
| 130 | 131 |
* @param datasource |
| 131 | 132 |
* a {@link eu.etaxonomy.cdm.database.ICdmDataSource} object.
|
| 132 | 133 |
*/ |
| 133 |
public static void connect(ICdmDataSource datasource) {
|
|
| 134 |
connect(datasource, DEFAULT_DB_SCHEMA_VALIDATION,
|
|
| 134 |
public static void connect(ICdmSource cdmSource) {
|
|
| 135 |
connect(cdmSource, DEFAULT_DB_SCHEMA_VALIDATION,
|
|
| 135 | 136 |
DEFAULT_APPLICATION_CONTEXT); |
| 136 | 137 |
} |
| 137 | 138 |
|
| ... | ... | |
| 142 | 143 |
* @param dbSchemaValidation |
| 143 | 144 |
* @param applicationContextBean |
| 144 | 145 |
*/ |
| 145 |
private static void connect(final ICdmDataSource datasource,
|
|
| 146 |
private static void connect(final ICdmSource cdmSource,
|
|
| 146 | 147 |
final DbSchemaValidation dbSchemaValidation, |
| 147 | 148 |
final Resource applicationContextBean) {
|
| 148 |
StoreUtil.info("Connecting to datasource: " + datasource);
|
|
| 149 |
StoreUtil.info("Connecting to datasource: " + cdmSource);
|
|
| 149 | 150 |
|
| 150 |
job = new CdmStoreConnector(Display.getDefault(), datasource,
|
|
| 151 |
job = new CdmStoreConnector(Display.getDefault(), cdmSource,
|
|
| 151 | 152 |
dbSchemaValidation, applicationContextBean); |
| 152 | 153 |
job.setUser(true); |
| 153 | 154 |
job.setPriority(Job.BUILD); |
| ... | ... | |
| 185 | 186 |
|
| 186 | 187 |
private void close() {
|
| 187 | 188 |
isConnected = false; |
| 188 |
cdmDatasource = null;
|
|
| 189 |
cdmSource = null;
|
|
| 189 | 190 |
} |
| 190 | 191 |
|
| 191 | 192 |
static void setInstance(ICdmApplicationConfiguration applicationController, |
| 192 |
ICdmDataSource dataSource) {
|
|
| 193 |
instance = new CdmStore(applicationController, dataSource);
|
|
| 193 |
ICdmSource cdmSource) {
|
|
| 194 |
instance = new CdmStore(applicationController, cdmSource);
|
|
| 194 | 195 |
} |
| 195 | 196 |
|
| 196 | 197 |
private CdmStore(ICdmApplicationConfiguration applicationController, |
| 197 |
ICdmDataSource dataSource) {
|
|
| 198 |
ICdmSource cdmSource) {
|
|
| 198 | 199 |
this.applicationConfiguration = applicationController; |
| 199 | 200 |
AbstractLazyInitializer.setConfiguration(applicationController); |
| 200 | 201 |
AbstractPersistentCollection.setConfiguration(applicationController); |
| 201 |
this.cdmDatasource = dataSource;
|
|
| 202 |
this.cdmSource = cdmSource;
|
|
| 202 | 203 |
isConnected = true; |
| 203 | 204 |
} |
| 204 | 205 |
|
| ... | ... | |
| 500 | 501 |
return instance != null && instance.isConnected; |
| 501 | 502 |
} |
| 502 | 503 |
|
| 504 |
public static ICdmSource getActiveCdmSource() {
|
|
| 505 |
if (isActive()) {
|
|
| 506 |
return instance.getCdmSource(); |
|
| 507 |
} |
|
| 508 |
return null; |
|
| 509 |
} |
|
| 510 |
|
|
| 503 | 511 |
/** |
| 504 | 512 |
* <p> |
| 505 | 513 |
* getDataSource |
| 506 | 514 |
* </p> |
| 507 | 515 |
* |
| 508 | 516 |
* @return a {@link eu.etaxonomy.cdm.database.ICdmDataSource} object.
|
| 517 |
* @deprecated currently retained for backward compatibility - use {@link getActiveCdmSource()} instead
|
|
| 509 | 518 |
*/ |
| 510 | 519 |
public static ICdmDataSource getDataSource() {
|
| 511 | 520 |
if (isActive()) {
|
| 512 |
return instance.getDatasource();
|
|
| 521 |
return (ICdmDataSource)instance.getCdmSource();
|
|
| 513 | 522 |
} |
| 514 | 523 |
return null; |
| 515 | 524 |
} |
| ... | ... | |
| 517 | 526 |
/** |
| 518 | 527 |
* @return |
| 519 | 528 |
*/ |
| 520 |
private ICdmDataSource getDatasource() {
|
|
| 521 |
return cdmDatasource;
|
|
| 529 |
private ICdmSource getCdmSource() {
|
|
| 530 |
return cdmSource;
|
|
| 522 | 531 |
} |
| 523 | 532 |
|
| 524 | 533 |
} |
Also available in: Unified diff
updating to align with refactored cdm source classes / interfaces