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 386bef0..bcd9e09 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 @@ -30,27 +30,27 @@ return pages.size(); } - @Path("/{aid}/pageMap/0/layers") + @Path("/{aid}/pageMap/{pid}/layers") @GET @Produces(MediaType.APPLICATION_JSON) - public Integer getLayers(@PathParam("aid") Integer aid) { + public Integer getLayers(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) { var animation = gallery.getAnimationInformation(aid); - return pages.get(0).getLayers().size(); + return pages.get(pid).getLayers().size(); } - @Path("/{aid}/pageMap/0/layers") + @Path("/{aid}/pageMap/{pid}/layers") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addLayers(@PathParam("aid") Integer aid) { + public Integer addLayers(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) { var animation = gallery.getAnimationInformation(aid); - if (pages.get(0).getLayers().size() < 4) { + if (pages.get(pid).getLayers().size() < 4) { Layer layer = new Layer(); - pages.get(0).getLayers().add(layer); + pages.get(pid).getLayers().add(layer); } - return pages.get(0).getLayers().size(); + return pages.get(pid).getLayers().size(); } // _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/ @@ -59,13 +59,13 @@ // @PathParam Integer aid 作品ID // @PathParam Integer pid ページのID 今回は0 // @PathParam Integer layerNo レイヤーの番号 今回は0 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes") @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList getStrokeRest(@PathParam("aid") Integer aid, @PathParam("layerNo") Integer layerNo) { + public ArrayList getStrokeRest(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo) { var animation = gallery.getAnimationInformation(aid); - return pages.get(0).getLayers().get(layerNo).getStrokes(); + return pages.get(pid).getLayers().get(layerNo).getStrokes(); // if(animation != null) { // return this.Test; @@ -85,14 +85,14 @@ // @Formparam Integer pen ペン情報 // @Formparam Integer color 色情報 // @Formparam Integer thick 太さ情報 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addStrokes(@PathParam("aid") Integer aid, @PathParam("layerNo") Integer layerNo, @FormParam("uid") Integer uid, @FormParam("uidToken") String uidToken, + public Integer addStrokes(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo, @FormParam("uid") Integer uid, @FormParam("uidToken") String uidToken, @FormParam("pen") Integer pen, @FormParam("color") Integer color, @FormParam("thick") Integer thick) { var animation = gallery.getAnimationInformation(aid); - var strokes = pages.get(0).getLayers().get(layerNo).getStrokes(); + var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); Stroke stroke = new Stroke(); stroke.addStrokes(pen, color, thick); // 線の情報を追加 @@ -109,13 +109,13 @@ // レイヤーごとのstrokeをすべて消去 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes") @DELETE @Produces(MediaType.APPLICATION_JSON) - public String deleteStrokes(@PathParam("aid") Integer aid, @PathParam("layerNo") Integer layerNo, @FormParam("uid") Integer uid) { + public String deleteStrokes(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo, @FormParam("uid") Integer uid) { var animation = gallery.getAnimationInformation(aid); - var strokes = pages.get(0).getLayers().get(layerNo).getStrokes(); + var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); strokes.clear(); return "LGTM?"; @@ -128,13 +128,13 @@ // strokeNoを指定してstrokeを消去 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes/{strokeNo}") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes/{strokeNo}") @DELETE @Produces(MediaType.APPLICATION_JSON) - public String deleteStrokeNo(@PathParam("aid") Integer aid, @PathParam("layerNo") Integer layerNo, @PathParam("strokeNo") Integer strokeNo) { + public String deleteStrokeNo(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo, @PathParam("strokeNo") Integer strokeNo) { var animation = gallery.getAnimationInformation(aid); - var strokes = pages.get(0).getLayers().get(layerNo).getStrokes(); + var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); int no = strokeNo; strokes.remove(no); @@ -150,13 +150,13 @@ // 全座標値を取得する // @PathParam Integer aid 作品のID // @PathParam Integer strokeNo 線番号 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes/{strokeNo}/positions") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes/{strokeNo}/positions") @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList getPositions(@PathParam("aid") Integer aid, @PathParam("layerNo") Integer layerNo, @PathParam("strokeNo") Integer strokeNo) { + public ArrayList getPositions(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo, @PathParam("strokeNo") Integer strokeNo) { var animation = gallery.getAnimationInformation(aid); - var strokes = pages.get(0).getLayers().get(layerNo).getStrokes(); + var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); Stroke stroke = strokes.get(strokeNo); // 指定したstrokeNoのstrokesを呼び出す return stroke.getPositions(); // 呼び出したstrokesの情報を返す @@ -174,13 +174,13 @@ // @PathParam Integer strokeNo 線番号 // @FormParam Integer x x座標 // @FormParam Integer y y座標 - @Path("/{aid}/pageMap/0/layers/{layerNo}/strokes/{strokeNo}/positions") + @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes/{strokeNo}/positions") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo, @PathParam("layerNo") Integer layerNo, @FormParam("x") Float x, @FormParam("y") Float y) { + public Integer addPositions(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("strokeNo") Integer strokeNo, @PathParam("layerNo") Integer layerNo, @FormParam("x") Float x, @FormParam("y") Float y) { var animation = gallery.getAnimationInformation(aid); - var strokes = pages.get(0).getLayers().get(layerNo).getStrokes(); + var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); Position position = new Position(); position.setXY(x, y);