Revision f380627e
Added by Andreas Kohlbecker about 7 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenter.java | ||
|---|---|---|
| 11 | 11 |
import org.json.JSONException; |
| 12 | 12 |
import org.springframework.transaction.TransactionStatus; |
| 13 | 13 |
|
| 14 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
|
|
| 14 |
import eu.etaxonomy.cdm.api.application.ICdmRepository;
|
|
| 15 | 15 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 17 | 17 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 32 | 32 |
private final D3ConceptRelationshipTree crTree; |
| 33 | 33 |
private final ITaxonService taxonService; |
| 34 | 34 |
|
| 35 |
private final ICdmApplicationConfiguration app;
|
|
| 35 |
private final ICdmRepository app;
|
|
| 36 | 36 |
|
| 37 | 37 |
|
| 38 | 38 |
public ConceptRelationshipPresenter(D3ConceptRelationshipTree crTree) {
|
| src/main/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenter.java | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
import com.vaadin.data.util.filter.Compare; |
| 20 | 20 |
|
| 21 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
|
|
| 21 |
import eu.etaxonomy.cdm.api.application.ICdmRepository;
|
|
| 22 | 22 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| ... | ... | |
| 41 | 41 |
|
| 42 | 42 |
private final ITaxonService taxonService; |
| 43 | 43 |
private final ITermService termService; |
| 44 |
private final ICdmApplicationConfiguration app;
|
|
| 44 |
private final ICdmRepository app;
|
|
| 45 | 45 |
|
| 46 | 46 |
public final static String REL_TYPE_KEY = "relTypeIun"; |
| 47 | 47 |
public final static String TO_TAXON_KEY = "toTaxonIun"; |
| src/main/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenter.java | ||
|---|---|---|
| 17 | 17 |
|
| 18 | 18 |
import com.vaadin.data.util.sqlcontainer.RowId; |
| 19 | 19 |
|
| 20 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
|
|
| 20 |
import eu.etaxonomy.cdm.api.application.ICdmRepository;
|
|
| 21 | 21 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| 22 | 22 |
import eu.etaxonomy.cdm.api.service.INameService; |
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.IReferenceService; |
| ... | ... | |
| 55 | 55 |
private final ITaxonService taxonService; |
| 56 | 56 |
private final IClassificationService classificationService; |
| 57 | 57 |
private final INameService nameService; |
| 58 |
private final ICdmApplicationConfiguration app;
|
|
| 58 |
private final ICdmRepository app;
|
|
| 59 | 59 |
|
| 60 | 60 |
|
| 61 | 61 |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java | ||
|---|---|---|
| 14 | 14 |
import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; |
| 15 | 15 |
import com.vaadin.server.VaadinServlet; |
| 16 | 16 |
|
| 17 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
|
|
| 17 |
import eu.etaxonomy.cdm.api.application.ICdmRepository;
|
|
| 18 | 18 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| 19 | 19 |
import eu.etaxonomy.cdm.api.service.ICommonService; |
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.IDescriptionService; |
| ... | ... | |
| 119 | 119 |
return databaseMetaData; |
| 120 | 120 |
} |
| 121 | 121 |
|
| 122 |
public static ICdmApplicationConfiguration getApplicationConfiguration() {
|
|
| 123 |
return (ICdmApplicationConfiguration) getCurrent().getBean("cdmApplicationDefaultConfiguration");
|
|
| 122 |
public static ICdmRepository getApplicationConfiguration() {
|
|
| 123 |
return (ICdmRepository) getCurrent().getBean("cdmRepository");
|
|
| 124 | 124 |
} |
| 125 | 125 |
public static ITaxonService getTaxonService() {
|
| 126 | 126 |
return (ITaxonService)getCurrent().getBean(ITaxonService.class); |
| src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java | ||
|---|---|---|
| 19 | 19 |
import org.springframework.transaction.TransactionStatus; |
| 20 | 20 |
import org.unitils.dbunit.annotation.DataSet; |
| 21 | 21 |
|
| 22 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
|
|
| 22 |
import eu.etaxonomy.cdm.api.application.ICdmRepository;
|
|
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.INameService; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| ... | ... | |
| 44 | 44 |
|
| 45 | 45 |
private static INameService nameService; |
| 46 | 46 |
|
| 47 |
private static ICdmApplicationConfiguration app;
|
|
| 47 |
private static ICdmRepository app;
|
|
| 48 | 48 |
|
| 49 | 49 |
@BeforeClass |
| 50 | 50 |
public static void init() {
|
Also available in: Unified diff
ref #6419 renaming CdmApplicationDefaultConfiguration to CdmRepository