addNewPageBeforeIndex実装

addNewPageAfterIndex実装
WIP
2026-11-07 19:47:36 +00:00 · 2024-01-09 17:12:13 +09:00 · 2024-01-09 17:07:37 +09:00 · 2024-01-09 17:05:25 +09:00 · 2024-01-09 17:04:42 +09:00 · 2024-01-09 16:26:20 +09:00
2 changed files with 38 additions and 7 deletions
@@ -7,9 +7,9 @@ public interface DocumentProcessor {
    // ページ操作
    void addNewPageToLast(Bitmap bitmap) throws Exception;
    void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
-    void addNewPageAfterIndex(Bitmap bitmap, int index);
-    void addNewPageBeforeIndex(Bitmap bitmap, int index);
-    void removePageAtIndex(int index);
+    void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception;
+    void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception;
+    void removePageAtIndex(int index) throws Exception;

    // 更新
    void updatePageAtIndex(Bitmap bitmap, int index);
@@ -118,14 +118,45 @@ public class DocumentProcessorImpl implements DocumentProcessor{
        } // TODO-rca: 効率悪いので改善する
    }

-    @Override
-    public void addNewPageAfterIndex(Bitmap bitmap, int index) {
-
+    // Internal
+    // Indexを振り直す
+    private ArrayList<XmlMetaPageModel> reIndexPages(ArrayList<XmlMetaPageModel> pages) {
+        logger.debug("reIndexPages", "called"); // TODO-rca: 効率化
+        ArrayList<XmlMetaPageModel> newPages = new ArrayList<>();
+        for (int i = 0; i < pages.size(); i++) {
+            XmlMetaPageModel xmlMetaPageModel = pages.get(i);
+            xmlMetaPageModel.setIndex(i + 1);
+            newPages.add(xmlMetaPageModel);
+        }
+        return newPages;
    }

    @Override
-    public void addNewPageBeforeIndex(Bitmap bitmap, int index) {
+    public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
+        logger.debug("addNewPageAfterIndex", "called");
+        String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする

+        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
+
+        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
+        xmlMetaPageModel.setFilename(filename);
+        xmlMetaPageModel.setIndex(index + 1);
+        xmlMetaModel.getPages().add(index, xmlMetaPageModel);
+        xmlMetaModel.setPages(reIndexPages(xmlMetaModel.getPages()));
+    }
+
+    @Override
+    public void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception {
+        logger.debug("addNewPageBeforeIndex", "called");
+        String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
+
+        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
+
+        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
+        xmlMetaPageModel.setFilename(filename);
+        xmlMetaPageModel.setIndex(index);
+        xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
+        xmlMetaModel.setPages(reIndexPages(xmlMetaModel.getPages()));
    }

    @Override
Author	SHA1	Message	Date
r-ca	0c59c85b28	addNewPageBeforeIndex実装	2024-01-09 17:12:13 +09:00
r-ca	e3a5dee36c	addNewPageAfterIndex実装	2024-01-09 17:07:37 +09:00
r-ca	1805cd7d73	WIP	2024-01-09 17:05:25 +09:00
r-ca	513a91b41e	throws追加	2024-01-09 17:04:42 +09:00
ろむねこ	3f2534b1eb	Merge pull request #30 from lacerta-doc/improve/improve_file_manager FileManagerの修正	2024-01-09 16:26:20 +09:00