Changeset 5616 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionResource.java
- Timestamp:
- 08/29/14 08:36:39 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionResource.java
r5514 r5616 69 69 } 70 70 71 // for testing 72 protected VirtualCollectionResource(VirtualCollectionRegistry registry, VirtualCollectionMarshaller marshaller, SecurityContext security, HttpHeaders headers, UriInfo uriInfo, Long id) { 73 this.registry = registry; 74 this.marshaller = marshaller; 75 this.security = security; 76 this.headers = headers; 77 this.uriInfo = uriInfo; 78 this.id = id; 79 } 80 81 82 71 83 /** 72 84 * Sets the id for this resource; should be called exactly once per … … 104 116 // exclude CMDI from the options and check if this is ok for request 105 117 final List<Variant> variants = Variant.mediaTypes( 106 MediaType.TEXT_XML_TYPE, 107 MediaType.APPLICATION_XML_TYPE, 118 MediaType.TEXT_XML_TYPE, 119 MediaType.APPLICATION_XML_TYPE, 108 120 MediaType.APPLICATION_JSON_TYPE).add().build(); 109 121 final Variant selectVariant = request.selectVariant(variants); … … 212 224 throws VirtualCollectionRegistryException { 213 225 VirtualCollection.State state = registry.getVirtualCollectionState(id); 214 State result = null;226 final State result; 215 227 switch (state) { 216 228 case PUBLIC_PENDING:
Note: See TracChangeset
for help on using the changeset viewer.