updatecharacterの修正 #113

Merged y-ota merged 1 commit into nitta-lab-2018:master from nitta-lab-2018:charrest on 1 Aug 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          16 ■■■■■
          src/main/java/cactusServer/resources/CharactersRest.java
 	@Path("/{characterId}")
	@PUT
	//@Produces(MediaType.APPLICATION_JSON)
	@Produces(MediaType.TEXT_PLAIN)
	public String updateCharacter(@FormParam("characterId") String characterId,
	//@Produces(MediaType.TEXT_PLAIN)
	public void updateCharacter(@PathParam("instanceId") String instanceId, @PathParam("characterId") String characterId,
			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle,
			@FormParam("modelID") String modelID) {
		String character = updateCharacter(characterId, position, angle, modelID);
		if (character != null) {
			throw new WebApplicationException(200);
		} else {
			@FormParam("modelID") int modelID) {
		Character character = Instances.getInstance().getInstance(instanceId).getCharacter(characterId);
		if (character == null) {
			throw new WebApplicationException(400);
		}
		character.update(position, angle, modelID);
	}
 
}
 	@Path("/{characterId}")
 	@PUT
 	//@Produces(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.TEXT_PLAIN)
+	public String updateCharacter(@FormParam("characterId") String characterId,
+	//@Produces(MediaType.TEXT_PLAIN)
+	public void updateCharacter(@PathParam("instanceId") String instanceId, @PathParam("characterId") String characterId,
 			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle,
+			@FormParam("modelID") String modelID) {
+		String character = updateCharacter(characterId, position, angle, modelID);
+		if (character != null) {
+			throw new WebApplicationException(200);
+		} else {
+			@FormParam("modelID") int modelID) {
+		Character character = Instances.getInstance().getInstance(instanceId).getCharacter(characterId);
+		if (character == null) {
 			throw new WebApplicationException(400);
 		}
+		character.update(position, angle, modelID);
 	}
 }