Revision b83da0d9
Added by Andreas Müller over 2 years ago
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementController.java | ||
|---|---|---|
| 27 | 27 |
import org.springframework.web.bind.annotation.RequestMethod; |
| 28 | 28 |
import org.springframework.web.servlet.ModelAndView; |
| 29 | 29 |
|
| 30 |
import eu.etaxonomy.cdm.api.service.IDescriptionService; |
|
| 30 |
import eu.etaxonomy.cdm.api.service.IDescriptionElementService;
|
|
| 31 | 31 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 32 | 32 |
import eu.etaxonomy.cdm.api.service.ITermTreeService; |
| 33 | 33 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 34 |
import eu.etaxonomy.cdm.ext.geo.IEditGeoService; |
|
| 35 | 34 |
import eu.etaxonomy.cdm.model.common.Annotation; |
| 36 | 35 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 37 | 36 |
import eu.etaxonomy.cdm.model.description.CategoricalData; |
| ... | ... | |
| 78 | 77 |
@Autowired |
| 79 | 78 |
private ITermService termService; |
| 80 | 79 |
|
| 81 |
|
|
| 82 |
@Autowired |
|
| 83 |
private IEditGeoService geoService; |
|
| 84 |
|
|
| 85 |
private IDescriptionService service; |
|
| 80 |
private IDescriptionElementService service; |
|
| 86 | 81 |
|
| 87 | 82 |
@InitBinder |
| 88 | 83 |
public void initBinder(WebDataBinder binder) {
|
| ... | ... | |
| 96 | 91 |
* @see eu.etaxonomy.cdm.remote.controller.GenericController#setService(eu.etaxonomy.cdm.api.service.IService) |
| 97 | 92 |
*/ |
| 98 | 93 |
@Autowired |
| 99 |
public void setService(IDescriptionService service) {
|
|
| 94 |
public void setService(IDescriptionElementService service) {
|
|
| 100 | 95 |
this.service = service; |
| 101 | 96 |
} |
| 102 | 97 |
|
| ... | ... | |
| 130 | 125 |
HttpServletRequest request, |
| 131 | 126 |
HttpServletResponse response) throws IOException {
|
| 132 | 127 |
logger.info("doGetDescriptionElementAnnotations() - " + request.getRequestURI());
|
| 133 |
DescriptionElementBase annotatableEntity = service.getDescriptionElementByUuid(uuid);
|
|
| 128 |
DescriptionElementBase annotatableEntity = service.load(uuid);
|
|
| 134 | 129 |
if(annotatableEntity == null){
|
| 135 | 130 |
HttpStatusMessage.UUID_INVALID.send(response); |
| 136 | 131 |
// method will exit here |
| ... | ... | |
| 150 | 145 |
|
| 151 | 146 |
ModelAndView mv = new ModelAndView(); |
| 152 | 147 |
|
| 153 |
DescriptionElementBase descriptionElement = service.loadDescriptionElement(uuid, STATE_INIT_STRATEGY);
|
|
| 148 |
DescriptionElementBase descriptionElement = service.load(uuid, STATE_INIT_STRATEGY); |
|
| 154 | 149 |
if(descriptionElement == null){
|
| 155 | 150 |
HttpStatusMessage.UUID_INVALID.send(response); |
| 156 | 151 |
// method will exit here |
Also available in: Unified diff
ref #694 add DescriptionElementService and move some methods