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 899e920..92a5df6 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 @@ -8,19 +8,6 @@ import javax.ws.rs.core.MediaType; import java.util.ArrayList; -@Component -@Path("/gallery") public class LayersRest { - /* - * 指定したレイヤー情報(順番、枚数)を獲得 - * @PathParam Integer aid 作品ID - */ - @Path("/{aid}/pageMap/0/layers/0") - @GET - @Produces(MediaType.APPLICATION_JSON) - public ArrayList getLayersRest(@PathParam("aid") Integer aid) { - return null; - } - } 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 0cafbd3..e8bef76 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 @@ -15,8 +15,8 @@ @Component @Path("/gallery") public class StrokesRest { - Position Position = new Position(); - + private Position Position = new Position(); + private Stroke Test = new Stroke(); /* * 1ページの1レイヤーに置ける筆跡情報を全て取得します。 @@ -29,12 +29,11 @@ @GET @Produces(MediaType.APPLICATION_JSON) public ArrayList> getStrokeRest(@PathParam("aid") Integer aid) { - Stroke Test = new Stroke(); - Test.putStroke("strokeNo", 2); - Test.putStroke("pen", 3); - Test.putStroke("color", 5); - Test.putStroke("thickness", 1); - return Test.getStrokeRest(); + this.Test.putStroke("strokeNo", 2); + this.Test.putStroke("pen", 3); + this.Test.putStroke("color", 5); + this.Test.putStroke("thickness", 1); + return this.Test.getStrokeRest(); } /* @@ -63,7 +62,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public ArrayList> getPositions(@PathParam("aid") Integer aid, @PathParam("strokeNo") Integer strokeNo) { - return Position.getPosition(); + return this.Position.getPosition(); } /* @@ -76,7 +75,7 @@ @POST @Produces(MediaType.APPLICATION_JSON) public void addPositions(@PathParam("aid") Integer aid, @FormParam("x") Integer x, @FormParam("y") Integer y) { - Position.putPosition(x, y); + this.Position.putPosition(x, y); } }