Projects information

Chunk

Conflicting content
return null; } <<<<<<< HEAD ======= // @POST // @Path("/d/{documentId}") // @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON }) // @Restrict("#{identity.loggedIn}") // public Response updateDocument( // @PathParam("documentId") String documentId, // Document document) { // return null; // } >>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db @PUT @Path("/d/{documentId}") @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })

Conflicting content

		return null;
	}

<<<<<<< HEAD
=======
//	@POST
//	@Path("/d/{documentId}")
//	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })
//	@Restrict("#{identity.loggedIn}")
//	public Response updateDocument(
//			@PathParam("documentId") String documentId,
//			Document document) {
//		return null;
//	}
	
>>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db
	@PUT
	@Path("/d/{documentId}")
	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })

Solution content
return null; } // @POST // @Path("/d/{documentId}") // @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON }) // @Restrict("#{identity.loggedIn}") // public Response updateDocument( // @PathParam("documentId") String documentId, // Document document) { // return null; // } @PUT @Path("/d/{documentId}") @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })

Solution content

		return null;
	}

//	@POST
//	@Path("/d/{documentId}")
//	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })
//	@Restrict("#{identity.loggedIn}")
//	public Response updateDocument(
//			@PathParam("documentId") String documentId,
//			Document document) {
//		return null;
//	}

	@PUT
	@Path("/d/{documentId}")
	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENT_XML, MediaType.APPLICATION_JSON })

File
DocumentService.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) @Restrict("#{identity.loggedIn}") public Response addDocuments(Documents documents) { <<<<<<< HEAD ======= // TODO >>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db return Response.ok().build(); }

Conflicting content

	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON })
	@Restrict("#{identity.loggedIn}")
	public Response addDocuments(Documents documents) {
<<<<<<< HEAD
=======
	    // TODO
>>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db
	    return Response.ok().build();
	}

Solution content
@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) @Restrict("#{identity.loggedIn}") public Response addDocuments(Documents documents) { return Response.ok().build(); }

Solution content

	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON })
	@Restrict("#{identity.loggedIn}")
	public Response addDocuments(Documents documents) {
	    return Response.ok().build();
	}

File
DocumentService.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content
@GET @Path("/all") @Produces({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) <<<<<<< HEAD public Documents getAllDocuments() { ======= public Documents getDocuments() { // TODO >>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db return new Documents(); }

Conflicting content

	@GET
	@Path("/all")
	@Produces({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON })
<<<<<<< HEAD
	public Documents getAllDocuments() {
=======
	public Documents getDocuments() {
	    // TODO
>>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db
	    return new Documents();
	}

Solution content
@GET @Path("/all") @Produces({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) public Documents getDocuments() { return new Documents(); }

File
DocumentService.java

Developer's decision
Combination

Kind of conflict
Comment
Method signature

Chunk

Conflicting content
@PUT @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) <<<<<<< HEAD public Response replaceDocuments(Documents documents) { return Response.ok().build(); } private HProjectIteration getIterationOrFail(){ HProjectIteration hProjectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug); if(hProjectIteration == null) throw new NotFoundException("Project Iteration not found"); return hProjectIteration; ======= @Restrict("#{identity.loggedIn}") public Response replace(Documents documents) { // TODO return Response.ok().build(); >>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db } private String convertToRealDocumentId(String uriId){

Conflicting content

	@PUT
	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON })
<<<<<<< HEAD
	public Response replaceDocuments(Documents documents) {
	    return Response.ok().build();
	}

	
	private HProjectIteration getIterationOrFail(){
		HProjectIteration hProjectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug);
		
		if(hProjectIteration == null)
			throw new NotFoundException("Project Iteration not found");
		
		return hProjectIteration;
=======
	@Restrict("#{identity.loggedIn}")
	public Response replace(Documents documents) {
	    // TODO
	    return Response.ok().build();
>>>>>>> 018dffe93c3dcada1e72c2cf1d1b005f6ad9c9db
	}

	private String convertToRealDocumentId(String uriId){

Solution content
@PUT @Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON }) @Restrict("#{identity.loggedIn}") return Response.ok().build(); } private HProjectIteration getIterationOrFail(){ HProjectIteration hProjectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug); if(hProjectIteration == null) throw new NotFoundException("Project Iteration not found"); return hProjectIteration; } private String convertToRealDocumentId(String uriId){

Solution content

	@PUT
	@Consumes({ MediaTypes.APPLICATION_FLIES_DOCUMENTS_XML, MediaType.APPLICATION_JSON })
	@Restrict("#{identity.loggedIn}")
	    return Response.ok().build();
    }
	
	private HProjectIteration getIterationOrFail(){
		HProjectIteration hProjectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug);
		
		if(hProjectIteration == null)
			throw new NotFoundException("Project Iteration not found");
		
		return hProjectIteration;
	}

	private String convertToRealDocumentId(String uriId){

File
DocumentService.java

Developer's decision
Combination

Kind of conflict
Annotation
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable

Projects >> zanata-server >>4fa2fab17a6d907e30559e85bd6114c1e728c31b