diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java index 190cb72..c25ab36 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java @@ -39,7 +39,7 @@ @Path("/{aid}/pageMap/{pid}/layers") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addLayers(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) { + public Integer addLayer(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) { var pages = gallery.getAnimationByAid(aid).getPages(); if (pages.get(pid).getLayers().size() < 4) { diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java index 77841a1..ba96364 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java @@ -18,7 +18,6 @@ public class PagesRest { private Gallery gallery = Gallery.getInstance(); - private ArrayList pages = new ArrayList<>(); // _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/ @@ -29,7 +28,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public ArrayList getPages(@PathParam("aid") Integer aid) { - pages = gallery.getAnimationByAid(aid).getPages(); + var pages = gallery.getAnimationByAid(aid).getPages(); return pages; } @@ -41,8 +40,8 @@ @Path("/{aid}/pageMap/") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addPages(@PathParam("aid") Integer aid) { - pages = gallery.getAnimationByAid(aid).getPages(); + public Integer addPage(@PathParam("aid") Integer aid) { + var pages = gallery.getAnimationByAid(aid).getPages(); pages.add(new Page()); return pages.size(); } 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 bef8538..01d7207 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 @@ -24,7 +24,7 @@ @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes") @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList getStrokeRest(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo) { + public ArrayList getStrokes(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo) { var pages = gallery.getAnimationByAid(aid).getPages(); return pages.get(pid).getLayers().get(layerNo).getStrokes(); } @@ -97,7 +97,7 @@ @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes/{strokeNo}") @DELETE @Produces(MediaType.APPLICATION_JSON) - public String deleteStrokeNo(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, + public String deleteStrokeByStrokeNo(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo, @PathParam("strokeNo") Integer strokeNo) { var pages = gallery.getAnimationByAid(aid).getPages(); var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); @@ -146,7 +146,7 @@ @Path("/{aid}/pageMap/{pid}/layers/{layerNo}/strokes/{strokeNo}/positions") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer addPositions(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("strokeNo") Integer strokeNo, + public Integer addPosition(@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 pages = gallery.getAnimationByAid(aid).getPages(); var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes();