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 7f2e71e..6526c61 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 @@ -41,8 +41,7 @@ public Integer addPages(@PathParam("aid") Integer aid) { var animation = gallery.getAnimationInformation(aid); - Page page = new Page(); - pages.add(page); + pages.add(new Page()); return pages.size(); } @@ -75,8 +74,7 @@ var animation = gallery.getAnimationInformation(aid); if (pages.get(pid).getLayers().size() < 4) { - Layer layer = new Layer(); - pages.get(pid).getLayers().add(layer); + pages.get(pid).getLayers().add(new Layer()); } return pages.get(pid).getLayers().size(); @@ -181,8 +179,7 @@ var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); - int no = strokeNo; - strokes.remove(no); + strokes.remove((int)strokeNo); return "やかんの麦茶"; // if(animation != null) { // this.Test.setStrokes(pen, color, thick); @@ -207,8 +204,7 @@ var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes(); - Stroke stroke = strokes.get(strokeNo); // 指定したstrokeNoのstrokesを呼び出す - return stroke.getPositions(); // 呼び出したstrokesの情報を返す + return strokes.get(strokeNo).getPositions(); // 呼び出したstrokesの情報を返す // if(animation != null) { // return this.positions; // }else{ @@ -236,15 +232,14 @@ Position position = new Position(); position.setXY(x, y); - Stroke stroke = strokes.get(strokeNo); // 指定したstrokeNoのstrokesを呼び出す - stroke.addPosition(position); // 呼び出したstrokesに座標を追加する + strokes.get(strokeNo).addPosition(position); // 呼び出したstrokesに座標を追加する // if(animation != null) { // this.Position.setXY(x, y); // this.positions.add(this.Position); // }else{ // throw new WebApplicationException(401); // } - return stroke.getPositions().size(); + return strokes.get(strokeNo).getPositions().size(); } }