Merge pull request #68 from lacerta-doc/improve_document_object

WIP: 全体的なオブジェクトの修正/変更/追加/削除

component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerDataManagerStubFragment.java

@@ -123,109 +123,110 @@ public class ScannerDataManagerStubFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
+//        view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
-            Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
+//            Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
-            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-            if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
+//            if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
-                File photoFile = null;
+//                File photoFile = null;
-                try {
+//                try {
-                    String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
+//                    String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
-                    String imageFileName = "JPEG_" + timeStamp + "_";
+//                    String imageFileName = "JPEG_" + timeStamp + "_";
-                    File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+//                    File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
-                    photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
+//                    photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
-                } catch (IOException ex) {
+//                } catch (IOException ex) {
-                    Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
+//                    Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
-                }
+//                }
-                if (photoFile != null) {
+//                if (photoFile != null) {
-                    photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
+//                    photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
-                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
+//                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
-                    cameraLauncher.launch(takePictureIntent);
+//                    cameraLauncher.launch(takePictureIntent);
-                }
+//                }
-                else {
+//                else {
-                    Log.d("ScannerDataManagerStubFragment", "photoFile is null");
+//                    Log.d("ScannerDataManagerStubFragment", "photoFile is null");
-                }
+//                }
-            }
+//            }
-            else {
+//            else {
-                Log.d("ScannerDataManagerStubFragment", "camera not available");
+//                Log.d("ScannerDataManagerStubFragment", "camera not available");
-            }
+//            }
-            updateResults();
+//            updateResults();
-        });
+//        });
-
+//
-        view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
+//        view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
-            Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
+//            Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
-            Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
-
+//
-            this.documentDetail = createSampleDocumentDetail();
+//            this.documentDetail = createSampleDocumentDetail();
-
+//
-        });
+//        });
-
+//
-        view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
+//        view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
-            Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
+//            Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
-            Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
-            // TODO-rca: ここでDocumentProcessorを初期化する
+//            // TODO-rca: ここでDocumentProcessorを初期化する
-            if (this.documentDetail == null) {
+//            if (this.documentDetail == null) {
-                Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
+//                Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
-                return;
+//                return;
-            }
+//            }
-            this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
+//            this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
-            Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
-            try {
+//            try {
-                this.documentProcessor.init();
+//                this.documentProcessor.init();
-            } catch (Exception e) {
+//            } catch (Exception e) {
-                Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
+//                Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
-                Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
+//                Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
-            }
+//            }
-            Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
-        });
+//        });
-
+//
-        view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
+//        view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
-            Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
+//            Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
-            Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
-            if (this.documentProcessor == null) {
+//            if (this.documentProcessor == null) {
-                Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
+//                Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
-                return;
+//                return;
-            }
+//            }
-            Bitmap[] bitmaps = new Bitmap[results.size()];
+//            Bitmap[] bitmaps = new Bitmap[results.size()];
-            for (int i = 0; i < results.size(); i++) {
+//            for (int i = 0; i < results.size(); i++) {
-                bitmaps[i] = results.get(i).getBitmap();
+//                bitmaps[i] = results.get(i).getBitmap();
-            }
+//            }
-
+//
-            try {
+//            try {
-                this.documentProcessor.addNewPagesToLast(bitmaps);
+//                this.documentProcessor.addNewPagesToLast(bitmaps);
-            } catch (Exception e) {
+//            } catch (Exception e) {
-                Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
+//                Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
-                Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
+//                Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
-            }
+//            }
-
+//
-            Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
-
+//
-            try {
+//            try {
-                this.documentProcessor.close();
+//                this.documentProcessor.close();
-            } catch (Exception e) {
+//            } catch (Exception e) {
-                Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
+//                Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
-                Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
+//                Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
-            }
+//            }
-        });
+//        });
     }
 
     public DocumentDetail createSampleDocumentDetail() {
-
+//
-        String id = UUID.randomUUID().toString();
+//        String id = UUID.randomUUID().toString();
-
+//
-        Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
+//        Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
-        //logger.debug("CreateSample", "Generated id: " + id);
+//        //logger.debug("CreateSample", "Generated id: " + id);
-
+//
-        DocumentMeta meta = new DocumentMeta(
+//        DocumentMeta meta = new DocumentMeta(
-                id,
+//                id,
-                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
+//                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
-                new Date(),
+//                new Date(),
-                new Date());
+//                new Date());
-
+//
-        DocumentPath path = new DocumentPath(
+//        DocumentPath path = new DocumentPath(
-                deviceInfoUtils.getExternalStorageDirectoryString(),
+//                deviceInfoUtils.getExternalStorageDirectoryString(),
-                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
+//                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
-
+//
-        return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
+//        return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
+        return null;
     }
 
     @Override

data/build.gradle

@@ -56,4 +56,6 @@ dependencies {
 
     // データソースモジュール
     implementation project(':source')
+
+    implementation project(':vcs')
 }

data/src/main/java/one/nem/lacerta/data/Document.java

@@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
  */
 public interface Document {
 
-    ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
+    DocumentDetail createDocument(DocumentMeta meta);
 
-    ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
+    DocumentDetail createDocument();
 
-    /**
+    void deleteDocument(String documentId);
-     * 更新の新しいドキュメントから順に並べてlimit件取得する
-     * @param limit 取得する上限数
-     */
-    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
 
-    /**
+    void updateDocument(DocumentMeta meta, DocumentDetail detail);
-     * 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
-     * @param limit 取得する上限数
-     * @param offset 取得するオフセット
-     */
-    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
 
-    /**
+    DocumentDetail getDocument(String documentId);
-     * ドキュメントIDからDocumentDetailを取得する
-     * @param id ドキュメントID
-     */
-    DocumentDetail getDocumentDetail(String id);
-
-    /**
-     * DocumentMetaからDocumentDetailを取得する
-     * @param meta DocumentMeta
-     */
-    DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
-
-    DocumentDetail createDocumentByMeta(DocumentMeta meta);
 }

data/src/main/java/one/nem/lacerta/data/DocumentDebug.java

@@ -1,12 +0,0 @@
-package one.nem.lacerta.data;
-
-import one.nem.lacerta.model.document.DocumentMeta;
-import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.path.DocumentPath;
-import one.nem.lacerta.model.document.tag.DocumentTag;
-
-public interface DocumentDebug {
-
-    void insertDocument(DocumentMeta meta, DocumentDetail detail);
-
-}

data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java

@@ -18,5 +18,5 @@ public interface LacertaLibrary {
     LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
 
     // GetDocument
-    DocumentDetail getDocumentDetailById(String id);
+    DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
 }

data/src/main/java/one/nem/lacerta/data/impl/DocumentDebugImpl.java

@@ -1,47 +0,0 @@
-package one.nem.lacerta.data.impl;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.data.DocumentDebug;
-import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.DocumentMeta;
-
-import one.nem.lacerta.source.database.entity.DocumentEntity;
-import one.nem.lacerta.source.database.entity.LibraryEntity;
-import one.nem.lacerta.source.database.entity.TagEntity;
-
-import one.nem.lacerta.source.database.LacertaDatabase;
-
-public class DocumentDebugImpl implements DocumentDebug{
-
-    @Inject
-    LacertaDatabase database;
-
-    @Inject
-    public DocumentDebugImpl() {
-    }
-
-
-    public void insertDocument(DocumentMeta meta, DocumentDetail detail) {
-        DocumentEntity documentEntity = new DocumentEntity();
-        LibraryEntity libraryEntity = new LibraryEntity();
-
-        documentEntity.id = meta.getId();
-        documentEntity.title = meta.getTitle();
-        documentEntity.createdAt = meta.getCreatedAt();
-        documentEntity.updatedAt = meta.getUpdatedAt();
-        documentEntity.author = detail.getAuthor();
-        documentEntity.defaultBranch = detail.getDefaultBranch();
-        // ArrayListからListに変換
-        documentEntity.tagIds = meta.getTagIds();
-
-        libraryEntity.id = meta.getId();
-        libraryEntity.path = "Placeholder";
-        libraryEntity.rootPath = "Placeholder";
-
-        database.documentDao().insert(documentEntity);
-        database.libraryDao().insert(libraryEntity);
-    }
-}

data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java

@@ -1,12 +1,15 @@
 package one.nem.lacerta.data.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 import javax.inject.Inject;
 
 import one.nem.lacerta.data.Document;
 
+import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.DocumentDetail;
 
@@ -18,124 +21,90 @@ import one.nem.lacerta.source.database.entity.DocumentEntity;
 import one.nem.lacerta.source.database.entity.LibraryEntity;
 import one.nem.lacerta.source.database.entity.TagEntity;
 
+import one.nem.lacerta.source.database.entity.VcsLogEntity;
+import one.nem.lacerta.vcs.ActionType;
+import one.nem.lacerta.source.file.factory.FileManagerFactory;
 import one.nem.lacerta.source.jgit.JGitRepository;
+import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.utils.XmlMetaParser;
 import one.nem.lacerta.utils.repository.DeviceInfoUtils;
+import one.nem.lacerta.vcs.LacertaVcs;
 
 
-public class DocumentImpl implements Document{
+public class DocumentImpl implements Document {
 
-    private LacertaDatabase database;
+    String TAG = getClass().getSimpleName();
 
     @Inject
-    public DocumentImpl(LacertaDatabase database) {
+    LacertaLogger logger;
-        this.database = database;
+
+    @Inject
+    LacertaDatabase database;
+
+    @Inject
+    LacertaVcs vcs;
+
+
+    @Inject
+    public DocumentImpl() {
+        // Init
+        logger.debug(TAG, "called");
     }
 
-    @Inject
-    JGitRepository jGitRepository;
-
-    @Inject
-    DeviceInfoUtils deviceInfoUtils;
 
     @Override
-    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
+    public DocumentDetail createDocument(DocumentMeta meta) {
-        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
+        DocumentDetail detail = new DocumentDetail();
-        List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
+        detail.setMeta(meta);
+        detail.setPages(new ArrayList<>());
 
-        for (DocumentEntity documentEntity : documentEntities) {
+        // TODO-rca: UIスレッドから追い出す
-            // タグ取得
-            // TODO-rca: 切り出すべきかも？
-            List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
-            ArrayList<DocumentTag> documentTags = new ArrayList<>();
-            for (TagEntity tagEntity : tagEntities) {
-                documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
-            }
 
-            // 組み立て処理
+        // Create DocumentEntity
-            // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
+        DocumentEntity documentEntity = new DocumentEntity();
-            DocumentMeta documentMeta = new DocumentMeta();
+        documentEntity.id = meta.getId();
-            documentMeta.setId(documentEntity.id);
+        documentEntity.title = meta.getTitle();
-            documentMeta.setTitle(documentEntity.title);
+        documentEntity.author = meta.getAuthor();
-            documentMeta.setCreatedAt(documentEntity.createdAt);
+        documentEntity.defaultBranch = meta.getDefaultBranch();
-            documentMeta.setUpdatedAt(documentEntity.updatedAt);
+        documentEntity.updatedAt = meta.getUpdatedAt();
-            documentMeta.setTags(documentTags);
+        documentEntity.createdAt = meta.getCreatedAt();
+        documentEntity.publicPath = meta.getPath().getStringPath();
+        documentEntity.tagIds = meta.getTagIds();
 
-            documentMetas.add(documentMeta);
+        database.documentDao().insert(documentEntity);
-        }
 
-        return documentMetas;
+        // Vcs
+        vcs.createDocument(meta.getId());
+
+        return detail;
     }
 
     @Override
-    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
+    public DocumentDetail createDocument() {
-        return null; // TODO-rca: 実装する
+        DocumentMeta meta = new DocumentMeta();
+        meta.setId(UUID.randomUUID().toString());
+        meta.setTitle("New Document");
+        meta.setAuthor("author");
+        meta.setDefaultBranch("master");
+        meta.setUpdatedAt(new Date());
+        meta.setCreatedAt(new Date());
+        meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
+        meta.setTags(new ArrayList<>());
+        return createDocument(meta);
     }
 
     @Override
-    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
+    public void deleteDocument(String documentId) {
-//        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
+
-//        database.documentDao().
+    }
-        // TODO-rca: 履歴取得するDao実装する
+
+    @Override
+    public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
+
+    }
+
+    @Override
+    public DocumentDetail getDocument(String documentId) {
         return null;
     }
-
-    @Override
-    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
-        return null;
-    }
-
-    @Override
-    public DocumentDetail getDocumentDetail(String id) {
-        DocumentDetail documentDetail = new DocumentDetail();
-        DocumentEntity documentEntity = database.documentDao().findById(id);
-
-        // タグ取得
-        // TODO-rca: 切り出すべきかも？
-        List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
-        ArrayList<DocumentTag> documentTags = new ArrayList<>();
-        for (TagEntity tagEntity : tagEntities) {
-            documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
-        }
-
-        // パス取得
-        // TODO-rca: 切り出すべきかも？
-        LibraryEntity libraryEntity = database.libraryDao().findById(id);
-        DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
-
-        // リポジトリ取得
-        documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
-
-        // 組み立て処理
-        // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
-        DocumentMeta documentMeta = new DocumentMeta();
-        documentMeta.setId(documentEntity.id);
-        documentMeta.setTitle(documentEntity.title);
-        documentMeta.setCreatedAt(documentEntity.createdAt);
-        documentMeta.setUpdatedAt(documentEntity.updatedAt);
-        documentMeta.setTags(documentTags);
-
-        documentDetail.setMeta(documentMeta);
-        documentDetail.setAuthor(documentEntity.author);
-        documentDetail.setPath(documentPath);
-        documentDetail.setDefaultBranch(documentEntity.defaultBranch);
-
-        return documentDetail;
-    }
-
-    @Override
-    public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
-        return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする（処理を切り分ける？）
-    }
-
-    @Override
-    public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
-        DocumentDetail documentDetail = new DocumentDetail();
-
-        documentDetail.setMeta(meta);
-        documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
-        documentDetail.setPath(new DocumentPath(deviceInfoUtils.getExternalStorageDirectoryString(), meta.getId()));
-        documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする？
-
-        return documentDetail;
-    }
 }

data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryStubImpl.java

@@ -136,9 +136,9 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
 
         DocumentDetail documentDetail = new DocumentDetail();
         documentDetail.setMeta(documentMeta);
-        documentDetail.setPath(null); // TODO-rca: なんとかする
+//        documentDetail.setPath(null); // TODO-rca: なんとかする
-        documentDetail.setAuthor(faker.name().fullName());
+//        documentDetail.setAuthor(faker.name().fullName());
-        documentDetail.setRepository(null); // TODO-rca: なんとかする
+//        documentDetail.setRepository(null); // TODO-rca: なんとかする
         return documentDetail;
     }
 

data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java

@@ -1,16 +0,0 @@
-package one.nem.lacerta.data.module;
-
-import dagger.Binds;
-import dagger.Module;
-import dagger.hilt.InstallIn;
-import dagger.hilt.components.SingletonComponent;
-import one.nem.lacerta.data.DocumentDebug;
-import one.nem.lacerta.data.impl.DocumentDebugImpl;
-
-@Module
-@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する
-abstract public class DocumentDebugModule {
-
-    @Binds
-    public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl);
-}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java

@@ -1,81 +0,0 @@
-package one.nem.lacerta.feature.debug;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter;
-import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem;
-import one.nem.lacerta.model.document.DocumentMeta;
-import one.nem.lacerta.utils.LacertaLogger;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-
-@AndroidEntryPoint
-public class DebugMenuDocumentTesterListFragment extends Fragment {
-
-    @Inject
-    Document document;
-
-    @Inject
-    LacertaLogger logger;
-
-    public DebugMenuDocumentTesterListFragment() {
-        // Required empty public constructor
-    }
-
-    public static DebugMenuDocumentTesterListFragment newInstance() {
-        DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false);
-
-        RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list);
-        recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
-
-        ArrayList<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
-
-        logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
-
-        List<DebugMenuDocumentListItem> debugMenuDocumentListItems = new ArrayList<>();
-
-        for (DocumentMeta documentMeta : documentMetas) {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt())));
-        }
-
-        DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems);
-        recyclerView.setAdapter(adapter);
-
-        return view;
-    }
-}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java

@@ -1,72 +0,0 @@
-package one.nem.lacerta.feature.debug;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.google.android.material.textfield.TextInputEditText;
-
-import java.util.UUID;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import dagger.multibindings.IntKey;
-import one.nem.lacerta.data.DocumentDebug;
-
-import one.nem.lacerta.model.document.DocumentMeta;
-import one.nem.lacerta.model.document.DocumentDetail;
-
-import one.nem.lacerta.model.document.path.DocumentPath;
-import one.nem.lacerta.model.document.tag.DocumentTag;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class DebugMenuDocumentTesterManageFragment extends Fragment {
-
-    @Inject
-    DocumentDebug documentDebug;
-
-    public DebugMenuDocumentTesterManageFragment() {
-        // Required empty public constructor
-    }
-
-    public static DebugMenuDocumentTesterManageFragment newInstance() {
-        DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false);
-
-        TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title);
-        view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> {
-
-            DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable
-            DocumentPath path = new DocumentPath("root", "test_path");
-            DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch");
-
-            documentDebug.insertDocument(meta, detail);
-        });
-
-        return view;
-    }
-}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java

@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
 
         List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
 
-        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
+//        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
-        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
+//        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
 
 
         DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);

feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DebugMenuDocumentTesterListFragment" >
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view_document_list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DebugMenuDocumentTesterManageFragment" >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_margin="16dp"
-                android:background="@drawable/rounded_secondary_container">
-
-                <TextView
-                    android:id="@+id/textView2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    android:textSize="16sp"
-                    android:textColor="@color/colorOnSecondaryContainer"
-                    android:text="Debug actions" />
-
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="Document title"
-                    android:id="@+id/edit_text_document_title"
-                    android:layout_margin="16dp"
-                    android:inputType="text"
-                    android:textSize="16sp"
-                    style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_insert_test_data"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
-                    android:text="Insert test data"/>
-
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml

@@ -28,23 +28,7 @@
         android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
         android:label="fragment_debug_menu_document_tester_top"
         tools:layout="@layout/fragment_debug_menu_document_tester_top" >
-        <action
-            android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
-            app:destination="@id/debugMenuDocumentTesterListFragment" />
-        <action
-            android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
-            app:destination="@id/debugMenuDocumentTesterManageFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/debugMenuDocumentTesterListFragment"
-        android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
-        android:label="fragment_debug_menu_document_tester_list"
-        tools:layout="@layout/fragment_debug_menu_document_tester_list" />
-    <fragment
-        android:id="@+id/debugMenuDocumentTesterManageFragment"
-        android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
-        android:label="fragment_debug_menu_document_tester_manage"
-        tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
     <fragment
         android:id="@+id/scannerDataManagerStubFragment"
         android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java

@@ -33,8 +33,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
 @AndroidEntryPoint
 public class LibraryTopFragment extends Fragment {
 
-    @Inject
+//    @Inject
-    Document document;
+//    Document document;
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -90,13 +90,13 @@ public class LibraryTopFragment extends Fragment {
 
         //データを取得
 
-        List<DocumentMeta>  metas = document.getAllDocumentMetas(100);
+//        List<DocumentMeta>  metas = document.getAllDocumentMetas(100);
 
-        Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
+//        Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
 
 // Create and set the adapter
-        DocumentAdapter adapter = new DocumentAdapter(metas);
+//        DocumentAdapter adapter = new DocumentAdapter(metas);
-        documentRecyclerView.setAdapter(adapter);
+//        documentRecyclerView.setAdapter(adapter);
 
 // Use a LinearLayoutManager to specify the layout
         return view;

model/src/main/java/one/nem/lacerta/model/PublicPath.java

@@ -65,4 +65,10 @@ public class PublicPath {
     public String getStringPath() {
         return String.join("/", path);
     }
+
+    public PublicPath getRoot() {
+        PublicPath root = new PublicPath();
+        root.add("/");
+        return root;
+    }
 }

model/src/main/java/one/nem/lacerta/model/document/DocumentDetail.java

@@ -3,11 +3,14 @@ package one.nem.lacerta.model.document;
 import org.eclipse.jgit.lib.Repository;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Date;
 
 import one.nem.lacerta.model.document.path.DocumentPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 
+import one.nem.lacerta.model.document.page.Page;
+
 /**
  * ドキュメントの詳細データ
  */
@@ -19,31 +22,21 @@ public class DocumentDetail {
     DocumentMeta meta;
 
     /**
-     * ドキュメントのパス(DocumentPathインスタンス)
+     * ドキュメントのページ(Pageインスタンスのリスト)
      */
-    DocumentPath path;
+    ArrayList<Page> pages;
-
-    /**
-     * ドキュメントの作者(String)
-     */
-    String author;
-
-    /**
-     * ドキュメントのデフォルトブランチ(String)
-     */
-    String defaultBranch;
-
-    Repository repository;
 
     // Constructor
     public DocumentDetail() {
     }
 
-    public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) {
+    public DocumentDetail(DocumentMeta meta) {
         this.meta = meta;
-        this.path = path;
+    }
-        this.author = author;
+
-        this.defaultBranch = defaultBranch;
+    public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) {
+        this.meta = meta;
+        this.pages = pages;
     }
 
     // Getter
@@ -56,34 +49,12 @@ public class DocumentDetail {
     }
 
     /**
-     * ドキュメントのパス(DocumentPathインスタンス)を取得する
+     * ドキュメントのページ(Pageインスタンスのリスト)を取得する
      */
-    public DocumentPath getPath() {
+    public ArrayList<Page> getPages() {
-        return path;
+        return pages;
     }
 
-    /**
-     * ドキュメントの作者(String)を取得する
-     */
-    public String getAuthor() {
-        return author;
-    }
-
-    /**
-     * ドキュメントのデフォルトブランチ(String)を取得する
-     */
-    public String getDefaultBranch() {
-        return defaultBranch;
-    }
-
-    /**
-     * ドキュメントのリポジトリを取得する
-     */
-    public Repository getRepository() {
-        return repository;
-    }
-
-
     // Setter
 
     /**
@@ -95,34 +66,11 @@ public class DocumentDetail {
     }
 
     /**
-     * ドキュメントのパス(DocumentPathインスタンス)を設定する
+     * ドキュメントのページ(Pageインスタンスのリスト)を設定する
-     * @param path DocumentPathインスタンス
+     * @param pages Pageインスタンスのリスト
      */
-    public void setPath(DocumentPath path) {
+    public void setPages(ArrayList<Page> pages) {
-        this.path =  path;
+        this.pages = pages;
-    }
-
-    /**
-     * ドキュメントの作者(String)を設定する
-     * @param author ドキュメントの作者
-     */
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    /**
-     * ドキュメントのデフォルトブランチ(String)を設定する
-     * @param defaultBranch ドキュメントのデフォルトブランチ
-     */
-    public void setDefaultBranch(String defaultBranch) {
-        this.defaultBranch = defaultBranch;
-    }
-
-    /**
-     * ドキュメントのリポジトリを設定する
-     */
-    public void setRepository(Repository repository) {
-        this.repository = repository;
     }
 
 }

model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java

@@ -1,6 +1,8 @@
 package one.nem.lacerta.model.document;
 
 import java.util.ArrayList;
+
+import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.tag.DocumentTag;
 import java.util.Date;
 import java.util.List;
@@ -9,7 +11,7 @@ import java.util.UUID;
 /**
  * ドキュメントのメタデータ
  */
-public class DocumentMeta {
+public class DocumentMeta { // TODO-rca: JavaDoc対応
     /**
      * ドキュメントのID(String)
      */
@@ -35,42 +37,52 @@ public class DocumentMeta {
      */
     List<DocumentTag> tags;
 
+    PublicPath path;
+
+    String author;
+
+    String defaultBranch;
+
     // Constructor
+
     public DocumentMeta() {
     }
 
-    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
+    public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
+        this.id = UUID.randomUUID().toString();
+        this.title = title;
+        this.tags = tags;
+        this.author = author;
+        this.defaultBranch = defaultBranch;
+    }
+
+    public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
+        this.id = id;
+        this.title = title;
+        this.tags = tags;
+        this.author = author;
+        this.defaultBranch = defaultBranch;
+    }
+
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String author, String defaultBranch) {
         this.id = id;
         this.title = title;
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
         this.tags = tags;
+        this.author = author;
+        this.defaultBranch = defaultBranch;
     }
 
-    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
         this.id = id;
         this.title = title;
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
-        this.tags = new ArrayList<>();
+        this.tags = tags;
-    }
+        this.path = path;
-
+        this.author = author;
-    public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt
+        this.defaultBranch = defaultBranch;
-        this.id = id;
-        this.title = title;
-        // 現在時刻を設定
-        this.updatedAt = new Date();
-        this.createdAt = new Date();
-        this.tags = new ArrayList<>();
-    }
-
-    public DocumentMeta(String title) { // title only
-        this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので)
-        this.title = title;
-        // 現在時刻を設定
-        this.updatedAt = new Date();
-        this.createdAt = new Date();
-        this.tags = new ArrayList<>();
     }
 
     // Getter
@@ -121,6 +133,27 @@ public class DocumentMeta {
         return tagIds;
     }
 
+    /**
+     * PublicPathを取得する
+     */
+    public PublicPath getPath() {
+        return path;
+    }
+
+    /**
+     * ドキュメントの作者(String)を取得する
+     */
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * ドキュメントのデフォルトブランチ(String)を取得する
+     */
+    public String getDefaultBranch() {
+        return defaultBranch;
+    }
+
     // Setter
 
     /**
@@ -163,6 +196,30 @@ public class DocumentMeta {
         this.tags = tags;
     }
 
+    /**
+     * PublicPathを設定する
+     * @param path PublicPath
+     */
+    public void setPath(PublicPath path) {
+        this.path = path;
+    }
+
+    /**
+     * ドキュメントの作者(String)を設定する
+     * @param author ドキュメントの作者
+     */
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    /**
+     * ドキュメントのデフォルトブランチ(String)を設定する
+     * @param defaultBranch ドキュメントのデフォルトブランチ
+     */
+    public void setDefaultBranch(String defaultBranch) {
+        this.defaultBranch = defaultBranch;
+    }
+
     /**
      * updatedAtを現在時刻に設定する
      */

model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java

@@ -4,12 +4,8 @@ import java.util.ArrayList;
 
 public class XmlMetaModel {
 
-    String title;
+    String revisionId;
-    String author;
+
-    String description;
-//    Date created;
-//    Date updated;
-    String defaultBranch;
     ArrayList<XmlMetaPageModel> pages;
 
     // Constructor
@@ -17,31 +13,15 @@ public class XmlMetaModel {
     public XmlMetaModel() {
     }
 
-    public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList<XmlMetaPageModel> pages) {
+    public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> pages) {
-        this.title = title;
+        this.revisionId = revisionId;
-        this.author = author;
-        this.description = description;
-        this.defaultBranch = defaultBranch;
         this.pages = pages;
     }
 
-
     // Getter
 
-    public String getTitle() {
+    public String getRevisionId() {
-        return title;
+        return revisionId;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getDefaultBranch() {
-        return defaultBranch;
     }
 
     public ArrayList<XmlMetaPageModel> getPages() {
@@ -50,24 +30,11 @@ public class XmlMetaModel {
 
     // Setter
 
-    public void setTitle(String title) {
+    public void setRevisionId(String revisionId) {
-        this.title = title;
+        this.revisionId = revisionId;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setDefaultBranch(String defaultBranch) {
-        this.defaultBranch = defaultBranch;
     }
 
     public void setPages(ArrayList<XmlMetaPageModel> pages) {
         this.pages = pages;
     }
-
 }

model/src/main/java/one/nem/lacerta/model/document/page/Page.java

@@ -0,0 +1,39 @@
+package one.nem.lacerta.model.document.page;
+
+import android.graphics.Bitmap;
+
+public class Page {
+
+    String fileName;
+    Bitmap bitmap;
+
+    // Constructor
+
+    public Page() {
+    }
+
+    public Page(String fileName, Bitmap bitmap) {
+        this.fileName = fileName;
+        this.bitmap = bitmap;
+    }
+
+    // Getter
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public Bitmap getBitmap() {
+        return bitmap;
+    }
+
+    // Setter
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public void setBitmap(Bitmap bitmap) {
+        this.bitmap = bitmap;
+    }
+}

processor/build.gradle

@@ -44,4 +44,5 @@ dependencies {
     implementation project(':source')
     implementation project(':utils')
     implementation project(':data')
+    implementation project(':vcs')
 }

processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java

@@ -2,13 +2,14 @@ package one.nem.lacerta.processor;
 
 import android.graphics.Bitmap;
 
+import one.nem.lacerta.model.document.DocumentDetail;
+
 public interface DocumentProcessor {
 
     // ページ操作
     void addNewPageToLast(Bitmap bitmap) throws Exception;
     void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
-    void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception;
+    void insertPageAtIndex(Bitmap bitmap, int index) throws Exception;
-    void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception;
     void removePageAtIndex(int index) throws Exception;
 
     // 更新
@@ -18,7 +19,5 @@ public interface DocumentProcessor {
     Bitmap getPageAtIndex(int index);
     int getPageCount();
 
-    void close() throws Exception;
+    DocumentDetail getDocumentDetail();
-    void init() throws Exception; // TODO-rca: 例外処理
-
 }

processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java

@@ -14,12 +14,18 @@ import one.nem.lacerta.processor.DocumentProcessor;
 import one.nem.lacerta.model.document.DocumentDetail;
 
 import one.nem.lacerta.model.document.internal.XmlMetaModel;
+
+import one.nem.lacerta.model.document.page.Page;
+
 import one.nem.lacerta.source.file.FileManager;
 import one.nem.lacerta.source.file.factory.FileManagerFactory;
 
 import one.nem.lacerta.utils.LacertaLogger;
 
 import one.nem.lacerta.utils.XmlMetaParser;
+import one.nem.lacerta.utils.repository.DeviceInfoUtils;
+import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
 public class DocumentProcessorImpl implements DocumentProcessor{
@@ -32,77 +38,47 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     private XmlMetaModel xmlMetaModel;
     private Path documentRootPath;
     private FileManager fileManager;
+    private LacertaVcs lacertaVcs;
 
     // Injection
     private final FileManagerFactory fileManagerFactory;
     private final LacertaLogger logger;
     private final XmlMetaParser xmlMetaParser;
+    private final LacertaVcsFactory lacertaVcsFactory;
+    private final DeviceInfoUtils deviceInfoUtils;
     @AssistedInject
-    public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) {
+    public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, LacertaVcsFactory lacertaVcsFactory, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) {
         this.fileManagerFactory = fileManagerFactory;
         this.logger = logger;
         this.xmlMetaParser = xmlMetaParser;
         if (documentDetail == null) {
             throw new IllegalArgumentException("documentDetail must not be null");
         }
+        this.lacertaVcsFactory = lacertaVcsFactory;
         this.documentDetail = documentDetail;
-    }
+        this.deviceInfoUtils = deviceInfoUtils;
 
-    @Override
+        // Init
-    public void init() throws Exception{
+        this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId());
-        logger.debug("init", "called");
-        // Init Variables
-        this.documentRootPath = this.documentDetail.getPath().getFullPath();
         logger.debug("init", "documentRootPath: " + this.documentRootPath);
-
         this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
-
+        this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId());
-        FileManager initFileManager = this.fileManager.getNewInstance();
-
-        logger.debug("init", "fileManager created");
-
-        // xmlファイルの読み込み
-        if (initFileManager.isExist("meta.xml")) {
-            logger.debug("init", "meta.xml found");
-            try {
-                this.xmlMetaModel = xmlMetaParser.deserialize(this.fileManager.loadXml("meta.xml"));
-                logger.debug("init", "meta.xml parsed");
-            } catch (Exception e) {
-                logger.debug("init", "meta.xml parse failed");
-                logger.trace("init", e.getMessage());
-            }
-        } else {
-            logger.debug("init", "meta.xml not found");
-            xmlMetaModel = new XmlMetaModel();
-
-            xmlMetaModel.setTitle(this.documentDetail.getMeta().getTitle());
-            xmlMetaModel.setAuthor(this.documentDetail.getAuthor());
-            xmlMetaModel.setDescription(""); // FIXME-rca:
-            xmlMetaModel.setDefaultBranch(this.documentDetail.getDefaultBranch());
-            xmlMetaModel.setPages(new ArrayList<>());
-
-            try {
-                initFileManager.createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
-                logger.debug("init", "meta.xml saved");
-            } catch (Exception e) {
-                logger.error("init", "meta.xml save failed");
-                logger.trace("init", e.getMessage());
-            }
-        }
-
-        logger.info("init", "finished");
     }
 
+
     @Override
     public void addNewPageToLast(Bitmap bitmap) throws Exception{
         logger.debug("addNewPageToLast", "called");
         String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
 
-        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
+        Page page = new Page();
+        page.setFileName(filename);
+        page.setBitmap(bitmap);
+        this.documentDetail.getPages().add(page);
 
-        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
+        lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
-        xmlMetaPageModel.setFilename(filename);
+
-        xmlMetaModel.getPages().add(xmlMetaPageModel);
+        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
 
         logger.info("addNewPageToLast", "finished");
         logger.info("addNewPageToLast", "filename: " + filename);
@@ -118,27 +94,18 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     }
 
     @Override
-    public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
+    public void insertPageAtIndex(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();
+        Page page = new Page();
-        xmlMetaPageModel.setFilename(filename);
+        page.setFileName(filename);
-        xmlMetaModel.getPages().add(index, xmlMetaPageModel);
+        page.setBitmap(bitmap);
-    }
+        this.documentDetail.getPages().add(index, page);
 
-    @Override
+        lacertaVcs.insertPage(index, filename);
-    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);
-        xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
     }
 
     @Override
@@ -162,14 +129,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     }
 
     @Override
-    public void close() throws Exception{
+    public DocumentDetail getDocumentDetail() {
-        logger.debug("close", "called");
+        return this.documentDetail;
-        try {
-            this.fileManager.getNewInstance().createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
-            logger.debug("close", "meta.xml saved");
-        } catch (Exception e) {
-            logger.error("close", "meta.xml save failed");
-            logger.trace("close", e.getMessage());
-        }
     }
 }

utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java

@@ -32,10 +32,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{
 
             XmlMetaModel meta = new XmlMetaModel();
 
-            meta.setTitle(rootElement.getElementsByTagName("title").item(0).getTextContent());
+            meta.setRevisionId(rootElement.getElementsByTagName("revisionId").item(0).getTextContent());
-            meta.setAuthor(rootElement.getElementsByTagName("author").item(0).getTextContent());
-            meta.setDescription(rootElement.getElementsByTagName("description").item(0).getTextContent());
-            meta.setDefaultBranch(rootElement.getElementsByTagName("defaultBranch").item(0).getTextContent());
 
             ArrayList<XmlMetaPageModel> pages = new ArrayList<>();
             for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
@@ -64,10 +61,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{
 
             Element rootElement = document.createElement("meta");
 
-            appendElement(document, rootElement, "title", meta.getTitle());
+            appendElement(document, rootElement, "revisionId", meta.getRevisionId());
-            appendElement(document, rootElement, "author", meta.getAuthor());
-            appendElement(document, rootElement, "description", meta.getDescription());
-            appendElement(document, rootElement, "defaultBranch", meta.getDefaultBranch());
 
             Element pagesElement = document.createElement("pages");
             for(XmlMetaPageModel page : meta.getPages()) {

vcs/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.com.android.library)
+    id 'com.google.dagger.hilt.android'
 }
 
 android {

vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java

@@ -9,6 +9,8 @@ public interface LacertaVcs {
 
     public void deletePage(int index);
 
+    public void createDocument(String documentId);
+
     // debug
     public void printLog();
 

vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java

@@ -52,6 +52,11 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     }
 
+    @Override
+    public void createDocument(String documentId) {
+
+    }
+
     @Override
     public void printLog() {
         logger.debug(TAG, "printLog");