diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Position.java b/src/main/java/org/ntlab/acanthus_server/entities/Position.java index 6ba3e62..d1c638d 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Position.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Position.java @@ -7,17 +7,19 @@ import java.util.UUID; public class Position { - private HashMap positionMap = new HashMap<>(); - private ArrayList> positionList = new ArrayList<>(); + private float x; + private float y; - public void putPosition(Integer x, Integer y) { - this.positionMap.put("x", x); - this.positionMap.put("y", y); - this.positionList.add(this.positionMap); + public float getX() { + return x; + } + public float getY() { + return y; } - public ArrayList> getPosition() { - return this.positionList; + public void setXY(float x, float y) { + this.x = x; + this.y = y; } } diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java index e8bef76..c0cb115 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java @@ -16,6 +16,7 @@ @Path("/gallery") public class StrokesRest { private Position Position = new Position(); + private ArrayList positions = new ArrayList<>(); private Stroke Test = new Stroke(); /* @@ -61,8 +62,8 @@ @Path("/{aid}/pageMap/0/layers/0/strokes/{strokeNo}/position") @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList> getPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo) { - return this.Position.getPosition(); + public ArrayList getPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo) { + return this.positions; } /* @@ -74,8 +75,9 @@ @Path("/{aid}/pageMap/0/layers/0/strokes/{strokeNo}/position") @POST @Produces(MediaType.APPLICATION_JSON) - public void addPositions(@PathParam("aid") Integer aid, @FormParam("x") Integer x, @FormParam("y") Integer y) { - this.Position.putPosition(x, y); + public void addPositions(@PathParam("aid") Integer aid, @FormParam("x") Float x, @FormParam("y") Float y) { + this.Position.setXY(x, y); + this.positions.add(this.Position); } }