Revision a500a93f
Added by Cherian Mathew about 10 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java | ||
---|---|---|
20 | 20 |
import org.eclipse.swt.widgets.Display; |
21 | 21 |
import org.springframework.core.io.Resource; |
22 | 22 |
|
23 |
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
|
|
23 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
|
24 | 24 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
25 | 25 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum; |
26 | 26 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
27 | 27 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
28 | 28 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData; |
29 | 29 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName; |
30 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
|
31 | 30 |
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; |
32 | 31 |
import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog; |
33 | 32 |
import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart; |
... | ... | |
92 | 91 |
.CreateSubMonitor(monitor, 7); |
93 | 92 |
// This is where we instantiate the application controller |
94 | 93 |
try { |
95 |
//FIXME:Remoting change this to toggle remoting |
|
94 |
|
|
96 | 95 |
applicationController = |
97 |
CdmApplicationDefaultController.NewInstance(applicationContextBean,
|
|
96 |
CdmApplicationController.NewInstance(applicationContextBean, |
|
98 | 97 |
dataSource, |
99 | 98 |
dbSchemaValidation, |
100 | 99 |
false, |
101 | 100 |
subprogressMonitor); |
102 |
//applicationController = CdmApplicationRemoteController.NewInstance(); |
|
101 |
|
|
103 | 102 |
} catch (Exception e) { |
104 | 103 |
if(! causeIsCancelationExceptionRecursive(e)){ |
105 | 104 |
return new Status(IStatus.ERROR, "Could not connect to CDM Store", "An error occurred while trying to connect to datasource: " + dataSource.getName(), e); |
Also available in: Unified diff
reverting cdm application / controller refactoring and simply extending the CdmApplicationRemoteConfiguration class
by throwing UnsupportedOperationException for methods that are not supported by remoting