diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 2112b1c..01f8cb2 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -141,17 +141,17 @@ return ""; } - public void update(Position3D position, Quaternion3D angle, String modelID, String areaURI) { + public void update(Position3D position, Quaternion3D angle, int modelID) { setPosition(position); setAngle(angle); - if (modelID != null) { - setModelID(Integer.parseInt(modelID)); - } - if (areaURI != null) { - setAreaURI(areaURI); - } else { - updateAreaURI(); - } + setModelID(modelID); + updateAreaURI(); + } + + public void update(Position3D position, Quaternion3D angle, String areaURI) { + setPosition(position); + setAngle(angle); + setAreaURI(areaURI); } private void updateAreaURI() { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 7e6ea0e..0b6d6b4 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -3,6 +3,8 @@ import java.util.HashMap; import java.util.HashSet; +import javax.json.bind.annotation.JsonbTransient; + import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; @@ -47,7 +49,7 @@ setName(name); setState(Instance.State.AVAILABLE); setStageID(stageID); - // initUniverse(); + initUniverse(); } private void initUniverse() { @@ -98,7 +100,6 @@ return characterMap; } - @JSONHint(ignore = true) public HashMap getCharacters(String accountURI) { if (accountURI == null || accountURI.isEmpty()) { return getCharacters(); @@ -167,9 +168,9 @@ return this; } - public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, String modelID) { + public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, int modelID) { Character character = characterMap.get(characterId); - character.update(position, angle, modelID, null); // areaURI(��4����)�̍X�V�͌Ăяo����Ŏ����ōs���� + character.update(position, angle, modelID); return character; } diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 8ca34d1..3ec5e45 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -176,6 +176,6 @@ private void writeCharacterData(String characterURI) { Character character = getCharacter(characterURI); - character.update(position, angle, null, areaURI); // model(��3����)�̍X�V�͏o���Ȃ� + character.update(position, angle, areaURI); } } diff --git a/src/main/java/cactusServer/utils/JSONProvider.java b/src/main/java/cactusServer/utils/JSONProvider.java index 4cab69f..307f805 100644 --- a/src/main/java/cactusServer/utils/JSONProvider.java +++ b/src/main/java/cactusServer/utils/JSONProvider.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import javax.inject.Singleton; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -14,8 +15,9 @@ import net.arnx.jsonic.JSON; -@Provider() +@Provider @Produces(MediaType.APPLICATION_JSON) +@Singleton public class JSONProvider implements MessageBodyWriter { @Override public long getSize(Object obj, Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { @@ -28,14 +30,15 @@ @Override public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { - // return true; - return mediaType.isCompatible(MediaType.APPLICATION_JSON_TYPE); + return true; } @Override public void writeTo(Object obj, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { + System.out.println("JSONProvider#writeTo()���J�n"); JSON.encode(obj, entityStream); + System.out.println("JSONProvider#writeTo()���I��"); } } \ No newline at end of file