mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2026-11-07 19:47:36 +00:00
Compare commits
126
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3045c75c45 | ||
|
|
aac94922df | ||
|
|
78ff41b3e3 | ||
|
|
e026da96fa | ||
|
|
9245981233 | ||
|
|
bc74ee605e | ||
|
|
475e378b7c | ||
|
|
6c8233536c | ||
|
|
3878c139af | ||
|
|
56a3acf36d | ||
|
|
0cab05c581 | ||
|
|
9db85bb9b3 | ||
|
|
17cb2829ce | ||
|
|
397c923cc1 | ||
|
|
94cec3432e | ||
|
|
e78ee829ce | ||
|
|
4ae2a9fe3a | ||
|
|
d6a0dbeaa2 | ||
|
|
98c3820679 | ||
|
|
de85626d66 | ||
|
|
7e20d8e443 | ||
|
|
eba02abfd4 | ||
|
|
aa7f285773 | ||
|
|
e5e1b3a2bb | ||
|
|
cd5a588545 | ||
|
|
bd5a041424 | ||
|
|
9d793c3c0a | ||
|
|
0d4f0686b7 | ||
|
|
5e6fa45fed | ||
|
|
885cd77d5b | ||
|
|
cbd7c103c5 | ||
|
|
ddd303fa88 | ||
|
|
14fbb56dcd | ||
|
|
bf01610eb5 | ||
|
|
b63e2dd862 | ||
|
|
8f0f95d8af | ||
|
|
d75ecff0e7 | ||
|
|
bc20c92d44 | ||
|
|
5837a1a2d3 | ||
|
|
176d8da59d | ||
|
|
dc516bc083 | ||
|
|
5c83c8fe13 | ||
|
|
200af1955b | ||
|
|
951ee15235 | ||
|
|
9a35c218b3 | ||
|
|
52894cf19c | ||
|
|
656d3a5964 | ||
|
|
f95a2d64c3 | ||
|
|
92f9cfe4aa | ||
|
|
162f0a7bdb | ||
|
|
ba119fdb3d | ||
|
|
c711ad304b | ||
|
|
b2a619629f | ||
|
|
a3426b6620 | ||
|
|
a9fb6283e7 | ||
|
|
6153e944eb | ||
|
|
a0baaf02cb | ||
|
|
623be098d1 | ||
|
|
999de728f0 | ||
|
|
a032b9c1b1 | ||
|
|
34de82cec3 | ||
|
|
fb4ba28391 | ||
|
|
44baef8199 | ||
|
|
60f86cd9a2 | ||
|
|
add140ad39 | ||
|
|
4c40f9926e | ||
|
|
f119264599 | ||
|
|
7f7e7d4af3 | ||
|
|
b99277082d | ||
|
|
a6167b98af | ||
|
|
f75594233f | ||
|
|
32ee755d08 | ||
|
|
0758b697a2 | ||
|
|
1abfcc1e62 | ||
|
|
a1b6ed81df | ||
|
|
00a141a101 | ||
|
|
6845e552ef | ||
|
|
f98614c5f2 | ||
|
|
b040e2572c | ||
|
|
3eb94cade0 | ||
|
|
e9b7ad4d92 | ||
|
|
e07cbda769 | ||
|
|
80aeb8811b | ||
|
|
2d7dfe1b5b | ||
|
|
362eda782d | ||
|
|
b51eeb50ac | ||
|
|
2673fb6bce | ||
|
|
bb5c38cbca | ||
|
|
3f4614cf6b | ||
|
|
dc65cdbac8 | ||
|
|
dbbdda79f4 | ||
|
|
20c0dbd371 | ||
|
|
ccaed8387a | ||
|
|
bfb6bee14a | ||
|
|
3b283c1b05 | ||
|
|
e718e13ed9 | ||
|
|
8277258760 | ||
|
|
062e8c8bf9 | ||
|
|
0439370bd0 | ||
|
|
541b748501 | ||
|
|
88546fe89a | ||
|
|
53b3ebebef | ||
|
|
a7195c4079 | ||
|
|
e848f40b8b | ||
|
|
578f1ef8a8 | ||
|
|
fca44e1753 | ||
|
|
da1dba5fda | ||
|
|
c614230744 | ||
|
|
e5c3b3aa92 | ||
|
|
442ac4866a | ||
|
|
8d00386f20 | ||
|
|
9a14b1db23 | ||
|
|
385f2f327d | ||
|
|
f09d35b8c0 | ||
|
|
002c78d09b | ||
|
|
171c8b380c | ||
|
|
04651f3b8e | ||
|
|
180428fbb7 | ||
|
|
955e9fa6c8 | ||
|
|
1d3015a7e4 | ||
|
|
4ce8315678 | ||
|
|
3c66480f0f | ||
|
|
82d0187a11 | ||
|
|
dc340f1a96 | ||
|
|
1d24467c09 | ||
|
|
bf385b952c |
No files matched your search
Generated
+1
-1
@@ -4,7 +4,6 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="GRADLE" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleJvm" value="jbr-17" />
|
<option name="gradleJvm" value="jbr-17" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
@@ -30,6 +29,7 @@
|
|||||||
<option value="$PROJECT_DIR$/shared/ui" />
|
<option value="$PROJECT_DIR$/shared/ui" />
|
||||||
<option value="$PROJECT_DIR$/source" />
|
<option value="$PROJECT_DIR$/source" />
|
||||||
<option value="$PROJECT_DIR$/utils" />
|
<option value="$PROJECT_DIR$/utils" />
|
||||||
|
<option value="$PROJECT_DIR$/vcs" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveExternalAnnotations" value="false" />
|
<option name="resolveExternalAnnotations" value="false" />
|
||||||
|
|||||||
Generated
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
+101
-100
@@ -123,109 +123,110 @@ public class ScannerDataManagerStubFragment extends Fragment {
|
|||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, 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() {
|
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
|
@Override
|
||||||
|
|||||||
@@ -56,4 +56,6 @@ dependencies {
|
|||||||
|
|
||||||
// データソースモジュール
|
// データソースモジュール
|
||||||
implementation project(':source')
|
implementation project(':source')
|
||||||
|
|
||||||
|
implementation project(':vcs')
|
||||||
}
|
}
|
||||||
@@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
|||||||
*/
|
*/
|
||||||
public interface Document {
|
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);
|
|
||||||
}
|
}
|
||||||
@@ -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);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -18,5 +18,5 @@ public interface LacertaLibrary {
|
|||||||
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
||||||
|
|
||||||
// GetDocument
|
// GetDocument
|
||||||
DocumentDetail getDocumentDetailById(String id);
|
DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
package one.nem.lacerta.data;
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
public interface LacertaSearch {
|
public interface LacertaSearch {
|
||||||
|
|
||||||
ListItem autoSearch(String query, int limit);
|
ArrayList<ListItem> autoSearch(String query, int limit);
|
||||||
|
|
||||||
ListItem autoSearch(String query, int limit, int offset);
|
ArrayList<ListItem> autoSearch(String query, int limit, int offset);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import one.nem.lacerta.data.Document;
|
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.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
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.LibraryEntity;
|
||||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
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.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.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
|
@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
|
@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
|
@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
|
@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;
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -136,9 +136,9 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
|
|||||||
|
|
||||||
DocumentDetail documentDetail = new DocumentDetail();
|
DocumentDetail documentDetail = new DocumentDetail();
|
||||||
documentDetail.setMeta(documentMeta);
|
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;
|
return documentDetail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import one.nem.lacerta.data.LacertaSearch;
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
public class LacertaSearchStubImpl implements LacertaSearch {
|
||||||
|
|
||||||
|
private LacertaLibrary library;
|
||||||
|
private LacertaLogger logger;
|
||||||
|
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public LacertaSearchStubImpl(LacertaLibrary library, LacertaLogger logger) {
|
||||||
|
this.library = library;
|
||||||
|
this.logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 検索
|
||||||
|
* @param query 検索クエリ
|
||||||
|
* @param limit 最大取得件数
|
||||||
|
* @return 検索結果
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ArrayList<ListItem> autoSearch(String query, int limit) {
|
||||||
|
logger.debug("SearchStub", "autoSearch");
|
||||||
|
logger.debug("SearchStub", "query: " + query);
|
||||||
|
return library.getLibraryPage(limit).getListItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 検索
|
||||||
|
* @param query 検索クエリ
|
||||||
|
* @param limit 最大取得件数
|
||||||
|
* @param offset オフセット
|
||||||
|
* @return 検索結果
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
|
||||||
|
logger.debug("SearchStub", "autoSearch");
|
||||||
|
logger.debug("SearchStub", "query: " + query);
|
||||||
|
return library.getLibraryPage(limit, offset).getListItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package one.nem.lacerta.data.module;
|
||||||
|
|
||||||
|
import dagger.Binds;
|
||||||
|
import dagger.Module;
|
||||||
|
import dagger.hilt.InstallIn;
|
||||||
|
import dagger.hilt.android.components.FragmentComponent;
|
||||||
|
import one.nem.lacerta.data.LacertaSearch;
|
||||||
|
import one.nem.lacerta.data.impl.LacertaSearchStubImpl;
|
||||||
|
|
||||||
|
@Module
|
||||||
|
@InstallIn(FragmentComponent.class)
|
||||||
|
abstract public class LacertaSearchModule {
|
||||||
|
|
||||||
|
@Binds
|
||||||
|
public abstract LacertaSearch bindLacertaSearch(LacertaSearchStubImpl impl);
|
||||||
|
}
|
||||||
@@ -68,4 +68,7 @@ dependencies {
|
|||||||
// Processor
|
// Processor
|
||||||
implementation project(':processor')
|
implementation project(':processor')
|
||||||
|
|
||||||
|
// LacertaVcs
|
||||||
|
implementation project(':vcs')
|
||||||
|
|
||||||
}
|
}
|
||||||
-81
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-72
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-2
@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
|
|||||||
|
|
||||||
List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
|
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);
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public class DebugMenuTopFragment extends Fragment {
|
|||||||
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
|
||||||
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
||||||
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
|
||||||
|
|
||||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||||
recyclerView.setAdapter(adapter);
|
recyclerView.setAdapter(adapter);
|
||||||
|
|||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
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 javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsGeneralActionFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class DebugMenuVcsGeneralActionFragment extends Fragment {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
|
||||||
|
public DebugMenuVcsGeneralActionFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsGeneralActionFragment newInstance() {
|
||||||
|
DebugMenuVcsGeneralActionFragment fragment = new DebugMenuVcsGeneralActionFragment();
|
||||||
|
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_vcs_general_action, container, false);
|
||||||
|
|
||||||
|
view.findViewById(R.id.add_sample_log_rev_button).setOnClickListener(v -> {
|
||||||
|
LacertaVcs lacertaVcs = lacertaVcsFactory.create("example_id");
|
||||||
|
lacertaVcs.insertPage(1, "example_id");
|
||||||
|
});
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+59
@@ -0,0 +1,59 @@
|
|||||||
|
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.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
|
||||||
|
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsGeneralFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsGeneralFragment extends Fragment {
|
||||||
|
public DebugMenuVcsGeneralFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsGeneralFragment newInstance() {
|
||||||
|
DebugMenuVcsGeneralFragment fragment = new DebugMenuVcsGeneralFragment();
|
||||||
|
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_vcs_general, container, false);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||||
|
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
||||||
|
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("General Action", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("Log Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("Rev Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment, true));
|
||||||
|
|
||||||
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+42
@@ -0,0 +1,42 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsLogRecordFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsLogRecordFragment extends Fragment {
|
||||||
|
|
||||||
|
public DebugMenuVcsLogRecordFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsLogRecordFragment newInstance() {
|
||||||
|
DebugMenuVcsLogRecordFragment fragment = new DebugMenuVcsLogRecordFragment();
|
||||||
|
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_vcs_log_record, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
@@ -0,0 +1,41 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsRevRecordFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsRevRecordFragment extends Fragment {
|
||||||
|
public DebugMenuVcsRevRecordFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsRevRecordFragment newInstance() {
|
||||||
|
DebugMenuVcsRevRecordFragment fragment = new DebugMenuVcsRevRecordFragment();
|
||||||
|
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_vcs_rev_record, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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>
|
|
||||||
+3
-3
@@ -4,11 +4,11 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".DebugMenuDocumentTesterListFragment" >
|
tools:context=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/recycler_view_document_list"
|
android:id="@+id/recycler_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".DebugMenuVcsGeneralActionFragment">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/add_sample_log_rev_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Add Sample log/Rev" />
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?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=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/log_recycler_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
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>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?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=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rev_recycler_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
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>
|
||||||
@@ -19,29 +19,16 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
|
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
|
||||||
app:destination="@id/debugMenuLibraryItemListPageFragment" />
|
app:destination="@id/debugMenuLibraryItemListPageFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
|
||||||
|
app:destination="@id/debugMenuVcsGeneralFragment" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/debugMenuDocumentTesterTopFragment"
|
android:id="@+id/debugMenuDocumentTesterTopFragment"
|
||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
|
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
|
||||||
android:label="fragment_debug_menu_document_tester_top"
|
android:label="fragment_debug_menu_document_tester_top"
|
||||||
tools:layout="@layout/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>
|
||||||
<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
|
<fragment
|
||||||
android:id="@+id/scannerDataManagerStubFragment"
|
android:id="@+id/scannerDataManagerStubFragment"
|
||||||
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
|
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
|
||||||
@@ -51,4 +38,34 @@
|
|||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
|
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
|
||||||
android:label="fragment_debug_menu_library_item_list_page"
|
android:label="fragment_debug_menu_library_item_list_page"
|
||||||
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
|
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsGeneralFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_general"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_general" >
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment"
|
||||||
|
app:destination="@id/debugMenuVcsGeneralActionFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment"
|
||||||
|
app:destination="@id/debugMenuVcsRevRecordFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment"
|
||||||
|
app:destination="@id/debugMenuVcsLogRecordFragment" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsGeneralActionFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralActionFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_general_action"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_general_action" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsLogRecordFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsLogRecordFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_log_record"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_log_record" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsRevRecordFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_rev_record"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
|
||||||
</navigation>
|
</navigation>
|
||||||
+6
-6
@@ -33,8 +33,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
|||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
public class LibraryTopFragment extends Fragment {
|
public class LibraryTopFragment extends Fragment {
|
||||||
|
|
||||||
@Inject
|
// @Inject
|
||||||
Document document;
|
// Document document;
|
||||||
|
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
// 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
|
// 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
|
// Use a LinearLayoutManager to specify the layout
|
||||||
return view;
|
return view;
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package one.nem.lacerta.model;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PublicPath {
|
||||||
|
/*
|
||||||
|
* ユーザーが扱うパス(内部パスの代替)
|
||||||
|
* (時間がないのでInjectされることは考慮しない)
|
||||||
|
*
|
||||||
|
* TODO-rca:
|
||||||
|
* - こわれたパスを検知する
|
||||||
|
* - バリデーション
|
||||||
|
*/
|
||||||
|
|
||||||
|
List<String> path = new ArrayList<String>();
|
||||||
|
|
||||||
|
public PublicPath() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath(List<String> path) {
|
||||||
|
this.path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void add(String path) {
|
||||||
|
this.path.add(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void resolveInternal(String path) {
|
||||||
|
if (path.equals("..")) {
|
||||||
|
this.path.remove(this.path.size() - 1);
|
||||||
|
} else {
|
||||||
|
add(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(String path) {
|
||||||
|
resolveInternal(path);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(List<String> path) {
|
||||||
|
for (String p : path) {
|
||||||
|
resolveInternal(p);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(PublicPath path) {
|
||||||
|
for (String p : path.getPath()) {
|
||||||
|
resolveInternal(p);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath parent() {
|
||||||
|
this.path.remove(this.path.size() - 1);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStringPath() {
|
||||||
|
return String.join("/", path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath getRoot() {
|
||||||
|
PublicPath root = new PublicPath();
|
||||||
|
root.add("/");
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,11 +3,14 @@ package one.nem.lacerta.model.document;
|
|||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントの詳細データ
|
* ドキュメントの詳細データ
|
||||||
*/
|
*/
|
||||||
@@ -19,31 +22,21 @@ public class DocumentDetail {
|
|||||||
DocumentMeta meta;
|
DocumentMeta meta;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントのパス(DocumentPathインスタンス)
|
* ドキュメントのページ(Pageインスタンスのリスト)
|
||||||
*/
|
*/
|
||||||
DocumentPath path;
|
ArrayList<Page> pages;
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントの作者(String)
|
|
||||||
*/
|
|
||||||
String author;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのデフォルトブランチ(String)
|
|
||||||
*/
|
|
||||||
String defaultBranch;
|
|
||||||
|
|
||||||
Repository repository;
|
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
public DocumentDetail() {
|
public DocumentDetail() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) {
|
public DocumentDetail(DocumentMeta meta) {
|
||||||
this.meta = 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
|
// 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
|
// 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package one.nem.lacerta.model.document;
|
package one.nem.lacerta.model.document;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -9,7 +11,7 @@ import java.util.UUID;
|
|||||||
/**
|
/**
|
||||||
* ドキュメントのメタデータ
|
* ドキュメントのメタデータ
|
||||||
*/
|
*/
|
||||||
public class DocumentMeta {
|
public class DocumentMeta { // TODO-rca: JavaDoc対応
|
||||||
/**
|
/**
|
||||||
* ドキュメントのID(String)
|
* ドキュメントのID(String)
|
||||||
*/
|
*/
|
||||||
@@ -35,42 +37,52 @@ public class DocumentMeta {
|
|||||||
*/
|
*/
|
||||||
List<DocumentTag> tags;
|
List<DocumentTag> tags;
|
||||||
|
|
||||||
|
PublicPath path;
|
||||||
|
|
||||||
|
String author;
|
||||||
|
|
||||||
|
String defaultBranch;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
|
|
||||||
public DocumentMeta() {
|
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.id = id;
|
||||||
this.title = title;
|
this.title = title;
|
||||||
this.updatedAt = updatedAt;
|
this.updatedAt = updatedAt;
|
||||||
this.createdAt = createdAt;
|
this.createdAt = createdAt;
|
||||||
this.tags = tags;
|
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.id = id;
|
||||||
this.title = title;
|
this.title = title;
|
||||||
this.updatedAt = updatedAt;
|
this.updatedAt = updatedAt;
|
||||||
this.createdAt = createdAt;
|
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
|
// Getter
|
||||||
@@ -121,6 +133,27 @@ public class DocumentMeta {
|
|||||||
return tagIds;
|
return tagIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PublicPathを取得する
|
||||||
|
*/
|
||||||
|
public PublicPath getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントの作者(String)を取得する
|
||||||
|
*/
|
||||||
|
public String getAuthor() {
|
||||||
|
return author;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントのデフォルトブランチ(String)を取得する
|
||||||
|
*/
|
||||||
|
public String getDefaultBranch() {
|
||||||
|
return defaultBranch;
|
||||||
|
}
|
||||||
|
|
||||||
// Setter
|
// Setter
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -163,6 +196,30 @@ public class DocumentMeta {
|
|||||||
this.tags = tags;
|
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を現在時刻に設定する
|
* updatedAtを現在時刻に設定する
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -4,12 +4,8 @@ import java.util.ArrayList;
|
|||||||
|
|
||||||
public class XmlMetaModel {
|
public class XmlMetaModel {
|
||||||
|
|
||||||
String title;
|
String revisionId;
|
||||||
String author;
|
|
||||||
String description;
|
|
||||||
// Date created;
|
|
||||||
// Date updated;
|
|
||||||
String defaultBranch;
|
|
||||||
ArrayList<XmlMetaPageModel> pages;
|
ArrayList<XmlMetaPageModel> pages;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
@@ -17,31 +13,15 @@ public class XmlMetaModel {
|
|||||||
public 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;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Getter
|
// 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() {
|
public ArrayList<XmlMetaPageModel> getPages() {
|
||||||
@@ -50,24 +30,11 @@ public class XmlMetaModel {
|
|||||||
|
|
||||||
// Setter
|
// 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) {
|
public void setPages(ArrayList<XmlMetaPageModel> pages) {
|
||||||
this.pages = pages;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -44,4 +44,5 @@ dependencies {
|
|||||||
implementation project(':source')
|
implementation project(':source')
|
||||||
implementation project(':utils')
|
implementation project(':utils')
|
||||||
implementation project(':data')
|
implementation project(':data')
|
||||||
|
implementation project(':vcs')
|
||||||
}
|
}
|
||||||
@@ -2,13 +2,14 @@ package one.nem.lacerta.processor;
|
|||||||
|
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
public interface DocumentProcessor {
|
public interface DocumentProcessor {
|
||||||
|
|
||||||
// ページ操作
|
// ページ操作
|
||||||
void addNewPageToLast(Bitmap bitmap) throws Exception;
|
void addNewPageToLast(Bitmap bitmap) throws Exception;
|
||||||
void addNewPagesToLast(Bitmap[] bitmaps) 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;
|
void removePageAtIndex(int index) throws Exception;
|
||||||
|
|
||||||
// 更新
|
// 更新
|
||||||
@@ -18,7 +19,5 @@ public interface DocumentProcessor {
|
|||||||
Bitmap getPageAtIndex(int index);
|
Bitmap getPageAtIndex(int index);
|
||||||
int getPageCount();
|
int getPageCount();
|
||||||
|
|
||||||
void close() throws Exception;
|
DocumentDetail getDocumentDetail();
|
||||||
void init() throws Exception; // TODO-rca: 例外処理
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -14,12 +14,18 @@ import one.nem.lacerta.processor.DocumentProcessor;
|
|||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
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.FileManager;
|
||||||
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
||||||
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
import one.nem.lacerta.utils.XmlMetaParser;
|
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{
|
public class DocumentProcessorImpl implements DocumentProcessor{
|
||||||
@@ -32,77 +38,47 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
private XmlMetaModel xmlMetaModel;
|
private XmlMetaModel xmlMetaModel;
|
||||||
private Path documentRootPath;
|
private Path documentRootPath;
|
||||||
private FileManager fileManager;
|
private FileManager fileManager;
|
||||||
|
private LacertaVcs lacertaVcs;
|
||||||
|
|
||||||
// Injection
|
// Injection
|
||||||
private final FileManagerFactory fileManagerFactory;
|
private final FileManagerFactory fileManagerFactory;
|
||||||
private final LacertaLogger logger;
|
private final LacertaLogger logger;
|
||||||
private final XmlMetaParser xmlMetaParser;
|
private final XmlMetaParser xmlMetaParser;
|
||||||
|
private final LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
private final DeviceInfoUtils deviceInfoUtils;
|
||||||
@AssistedInject
|
@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.fileManagerFactory = fileManagerFactory;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.xmlMetaParser = xmlMetaParser;
|
this.xmlMetaParser = xmlMetaParser;
|
||||||
if (documentDetail == null) {
|
if (documentDetail == null) {
|
||||||
throw new IllegalArgumentException("documentDetail must not be null");
|
throw new IllegalArgumentException("documentDetail must not be null");
|
||||||
}
|
}
|
||||||
|
this.lacertaVcsFactory = lacertaVcsFactory;
|
||||||
this.documentDetail = documentDetail;
|
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);
|
logger.debug("init", "documentRootPath: " + this.documentRootPath);
|
||||||
|
|
||||||
this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
|
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
|
@Override
|
||||||
public void addNewPageToLast(Bitmap bitmap) throws Exception{
|
public void addNewPageToLast(Bitmap bitmap) throws Exception{
|
||||||
logger.debug("addNewPageToLast", "called");
|
logger.debug("addNewPageToLast", "called");
|
||||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
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", "finished");
|
||||||
logger.info("addNewPageToLast", "filename: " + filename);
|
logger.info("addNewPageToLast", "filename: " + filename);
|
||||||
@@ -118,27 +94,18 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
|
public void insertPageAtIndex(Bitmap bitmap, int index) throws Exception {
|
||||||
logger.debug("addNewPageAfterIndex", "called");
|
logger.debug("addNewPageAfterIndex", "called");
|
||||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
||||||
|
|
||||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
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
|
@Override
|
||||||
@@ -162,14 +129,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -31,3 +31,4 @@ include ':model'
|
|||||||
include ':processor'
|
include ':processor'
|
||||||
include ':shared:ui'
|
include ':shared:ui'
|
||||||
include ':shared:icon'
|
include ':shared:icon'
|
||||||
|
include ':vcs'
|
||||||
@@ -7,15 +7,21 @@ import androidx.room.RoomDatabase;
|
|||||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
import one.nem.lacerta.source.database.entity.TagEntity;
|
||||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
||||||
|
import one.nem.lacerta.source.database.entity.VcsRevEntity;
|
||||||
|
import one.nem.lacerta.source.database.entity.VcsLogEntity;
|
||||||
|
|
||||||
// Daos
|
// Daos
|
||||||
import one.nem.lacerta.source.database.dao.TagDao;
|
import one.nem.lacerta.source.database.dao.TagDao;
|
||||||
import one.nem.lacerta.source.database.dao.DocumentDao;
|
import one.nem.lacerta.source.database.dao.DocumentDao;
|
||||||
import one.nem.lacerta.source.database.dao.LibraryDao;
|
import one.nem.lacerta.source.database.dao.LibraryDao;
|
||||||
|
import one.nem.lacerta.source.database.dao.VcsRevDao;
|
||||||
|
import one.nem.lacerta.source.database.dao.VcsLogDao;
|
||||||
|
|
||||||
@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class}, version = 1)
|
@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class}, version = 2)
|
||||||
public abstract class LacertaDatabase extends RoomDatabase {
|
public abstract class LacertaDatabase extends RoomDatabase {
|
||||||
public abstract TagDao tagDao();
|
public abstract TagDao tagDao();
|
||||||
public abstract DocumentDao documentDao();
|
public abstract DocumentDao documentDao();
|
||||||
public abstract LibraryDao libraryDao();
|
public abstract LibraryDao libraryDao();
|
||||||
|
public abstract VcsRevDao vcsRevDao();
|
||||||
|
public abstract VcsLogDao vcsLogDao();
|
||||||
}
|
}
|
||||||
@@ -20,6 +20,8 @@ public class LacertaDatabaseModule {
|
|||||||
LacertaDatabase.class,
|
LacertaDatabase.class,
|
||||||
"lacerta.db")
|
"lacerta.db")
|
||||||
.allowMainThreadQueries() // Debug
|
.allowMainThreadQueries() // Debug
|
||||||
|
.fallbackToDestructiveMigration() // Debug Only: マイグレーションがない場合などにデータベースを再生成する
|
||||||
|
.fallbackToDestructiveMigrationOnDowngrade() // Debug Only: マイグレーションがない場合などにデータベースを再生成する
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -5,7 +5,7 @@ import androidx.room.TypeConverter;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
public class TagArrayListConverter {
|
public class ArrayListConverter {
|
||||||
|
|
||||||
@TypeConverter
|
@TypeConverter
|
||||||
public static ArrayList<String> fromString(String value) {
|
public static ArrayList<String> fromString(String value) {
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package one.nem.lacerta.source.database.dao;
|
||||||
|
|
||||||
|
import androidx.room.Dao;
|
||||||
|
import androidx.room.Insert;
|
||||||
|
import androidx.room.Query;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import one.nem.lacerta.source.database.entity.VcsLogEntity;
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
public interface VcsLogDao {
|
||||||
|
|
||||||
|
// Select
|
||||||
|
@Query("SELECT * FROM vcs_log WHERE id = :id")
|
||||||
|
VcsLogEntity findById(String id);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_log")
|
||||||
|
List<VcsLogEntity> findAll();
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_log WHERE id IN (:ids)")
|
||||||
|
List<VcsLogEntity> findByIds(List<String> ids);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_log WHERE document_id = :documentId")
|
||||||
|
List<VcsLogEntity> findByDocumentId(String documentId);
|
||||||
|
|
||||||
|
// Insert
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insertAll(VcsLogEntity... vcsLogs);
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insertAll(List<VcsLogEntity> vcsLogs);
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insert(VcsLogEntity vcsLog);
|
||||||
|
|
||||||
|
// TODO-rca: Update, Deleteが必要か検討
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package one.nem.lacerta.source.database.dao;
|
||||||
|
|
||||||
|
import androidx.room.Dao;
|
||||||
|
import androidx.room.Insert;
|
||||||
|
import androidx.room.Query;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import one.nem.lacerta.source.database.entity.VcsRevEntity;
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
public interface VcsRevDao {
|
||||||
|
|
||||||
|
// Select
|
||||||
|
@Query("SELECT * FROM vcs_rev WHERE id = :id")
|
||||||
|
VcsRevEntity findById(String id);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_rev")
|
||||||
|
List<VcsRevEntity> findAll();
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_rev WHERE id IN (:ids)")
|
||||||
|
List<VcsRevEntity> findByIds(List<String> ids);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId")
|
||||||
|
List<VcsRevEntity> findByDocumentId(String documentId);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId ORDER BY created_at DESC LIMIT 1")
|
||||||
|
VcsRevEntity findLatestByDocumentId(String documentId);
|
||||||
|
|
||||||
|
@Query("SELECT * FROM vcs_rev WHERE document_id = :documentId AND branch_name = :branchName ORDER BY created_at DESC LIMIT 1")
|
||||||
|
VcsRevEntity findLatestByDocumentIdAndBranchName(String documentId, String branchName);
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insertAll(VcsRevEntity... vcsRevs);
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insertAll(List<VcsRevEntity> vcsRevs);
|
||||||
|
|
||||||
|
@Insert
|
||||||
|
void insert(VcsRevEntity vcsRev);
|
||||||
|
|
||||||
|
// TODO-rca: Update, Deleteが必要か検討
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,7 +8,6 @@ import androidx.room.TypeConverter;
|
|||||||
import androidx.room.TypeConverters;
|
import androidx.room.TypeConverters;
|
||||||
|
|
||||||
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
import one.nem.lacerta.source.database.common.TagArrayListConverter;
|
|
||||||
import one.nem.lacerta.source.database.common.TagListConverter;
|
import one.nem.lacerta.source.database.common.TagListConverter;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -40,4 +39,7 @@ public class DocumentEntity {
|
|||||||
|
|
||||||
@ColumnInfo(name = "tag_ids")
|
@ColumnInfo(name = "tag_ids")
|
||||||
public List<String> tagIds; // タグ
|
public List<String> tagIds; // タグ
|
||||||
|
|
||||||
|
@ColumnInfo(name = "public_path")
|
||||||
|
public String publicPath; // 公開パス
|
||||||
}
|
}
|
||||||
@@ -16,10 +16,12 @@ public class LibraryEntity {
|
|||||||
@NonNull
|
@NonNull
|
||||||
public String id; // ドキュメントID
|
public String id; // ドキュメントID
|
||||||
|
|
||||||
@ColumnInfo(name = "root_path")
|
// TODO-rca: 廃止?
|
||||||
public String rootPath; // rootのパス
|
|
||||||
|
|
||||||
@ColumnInfo(name = "path")
|
@ColumnInfo(name = "path")
|
||||||
public String path; // パス
|
public String path; // パス
|
||||||
|
|
||||||
|
@ColumnInfo(name = "root_path")
|
||||||
|
public String rootPath; // ルートパス
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package one.nem.lacerta.source.database.entity;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.room.ColumnInfo;
|
||||||
|
import androidx.room.Entity;
|
||||||
|
import androidx.room.PrimaryKey;
|
||||||
|
import androidx.room.TypeConverters;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
|
|
||||||
|
@Entity(tableName = "vcs_log")
|
||||||
|
@TypeConverters({DateTypeConverter.class})
|
||||||
|
public class VcsLogEntity {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* イベントID
|
||||||
|
*/
|
||||||
|
@PrimaryKey
|
||||||
|
@ColumnInfo(name = "id")
|
||||||
|
@NonNull
|
||||||
|
public String id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントID
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "document_id")
|
||||||
|
public String documentId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ブランチ名
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "branch_name")
|
||||||
|
public String branchName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 発生日時
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "created_at")
|
||||||
|
public Date createdAt;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 発生アクション
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "action")
|
||||||
|
public String action;
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package one.nem.lacerta.source.database.entity;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.room.ColumnInfo;
|
||||||
|
import androidx.room.Entity;
|
||||||
|
import androidx.room.PrimaryKey;
|
||||||
|
import androidx.room.TypeConverters;
|
||||||
|
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import one.nem.lacerta.source.database.common.ArrayListConverter;
|
||||||
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
|
|
||||||
|
@Entity(tableName = "vcs_rev")
|
||||||
|
@TypeConverters({DateTypeConverter.class, ArrayListConverter.class})
|
||||||
|
public class VcsRevEntity {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* リビジョンID
|
||||||
|
*/
|
||||||
|
@PrimaryKey
|
||||||
|
@ColumnInfo(name = "id")
|
||||||
|
@NonNull
|
||||||
|
public String id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントID
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "document_id")
|
||||||
|
public String documentId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ブランチ名
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "branch_name")
|
||||||
|
public String branchName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* コミットメッセージ
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "commit_message")
|
||||||
|
public String commitMessage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* コミット日時
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "created_at")
|
||||||
|
public Date createdAt;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 含まれるLogのID
|
||||||
|
*/
|
||||||
|
@ColumnInfo(name = "log_ids")
|
||||||
|
public ArrayList<String> logIds;
|
||||||
|
}
|
||||||
@@ -32,10 +32,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{
|
|||||||
|
|
||||||
XmlMetaModel meta = new XmlMetaModel();
|
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<>();
|
ArrayList<XmlMetaPageModel> pages = new ArrayList<>();
|
||||||
for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
|
for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
|
||||||
@@ -64,10 +61,7 @@ public class XmlMetaParserImpl implements XmlMetaParser{
|
|||||||
|
|
||||||
Element rootElement = document.createElement("meta");
|
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");
|
Element pagesElement = document.createElement("pages");
|
||||||
for(XmlMetaPageModel page : meta.getPages()) {
|
for(XmlMetaPageModel page : meta.getPages()) {
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.vcs'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
testImplementation libs.junit
|
||||||
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
// Hilt (DI)
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
|
implementation project(':model')
|
||||||
|
implementation project(':source')
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
// Jackson
|
||||||
|
// TODO-rca: バージョンカタログにうつす
|
||||||
|
|
||||||
|
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
|
||||||
|
implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
|
||||||
|
|
||||||
|
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
|
||||||
|
implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
|
||||||
|
|
||||||
|
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
|
||||||
|
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.1'
|
||||||
|
|
||||||
|
// Room
|
||||||
|
implementation libs.androidx.room.runtime
|
||||||
|
annotationProcessor libs.androidx.room.compiler
|
||||||
|
}
|
||||||
Whitespace-only changes.
Vendored
+21
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.vcs;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.vcs.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package one.nem.lacerta.vcs;
|
||||||
|
|
||||||
|
public enum ActionType {
|
||||||
|
|
||||||
|
INSERT_PAGE("insert_page"),
|
||||||
|
UPDATE_PAGE("update_page"),
|
||||||
|
DELETE_PAGE("delete_page"),
|
||||||
|
|
||||||
|
// TODO-rca: 実装----------------------------------------
|
||||||
|
UPDATE_PAGE_ORDER("update_page_order"),
|
||||||
|
INSERT_PAGE_CONTENT("insert_page_content"),
|
||||||
|
UPDATE_PAGE_CONTENT("update_page_content"),
|
||||||
|
DELETE_PAGE_CONTENT("delete_page_content"),
|
||||||
|
|
||||||
|
CREATE_BRANCH("create_branch"),
|
||||||
|
DROP_BRANCH("drop_branch"),
|
||||||
|
REBASE_BRANCH("rebase_branch"),
|
||||||
|
|
||||||
|
// -----------------------------------------------------
|
||||||
|
|
||||||
|
CREATE_DOCUMENT("create_document"),
|
||||||
|
DROP_DOCUMENT("drop_document"),
|
||||||
|
|
||||||
|
// TODO-rca: 実装----------------------------------------
|
||||||
|
UPDATE_DOCUMENT_META("update_document_meta"),
|
||||||
|
// -----------------------------------------------------
|
||||||
|
|
||||||
|
OTHER("other");
|
||||||
|
|
||||||
|
private final String value;
|
||||||
|
|
||||||
|
ActionType(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ActionType fromValue(String value) {
|
||||||
|
for (ActionType actionType : ActionType.values()) {
|
||||||
|
if (actionType.getValue().equals(value)) {
|
||||||
|
return actionType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ActionType.OTHER;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.vcs;
|
||||||
|
|
||||||
|
public interface LacertaVcs {
|
||||||
|
|
||||||
|
// Actions
|
||||||
|
public void updatePage(int index, String fileName);
|
||||||
|
|
||||||
|
public void insertPage(int index, String fileName);
|
||||||
|
|
||||||
|
public void deletePage(int index);
|
||||||
|
|
||||||
|
public void createDocument(String documentId);
|
||||||
|
|
||||||
|
// debug
|
||||||
|
public void printLog();
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package one.nem.lacerta.vcs.factory;
|
||||||
|
|
||||||
|
import dagger.assisted.AssistedFactory;
|
||||||
|
import one.nem.lacerta.vcs.impl.LacertaVcsImpl;
|
||||||
|
|
||||||
|
@AssistedFactory
|
||||||
|
public interface LacertaVcsFactory {
|
||||||
|
|
||||||
|
LacertaVcsImpl create(String documentId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package one.nem.lacerta.vcs.impl;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.assisted.Assisted;
|
||||||
|
import dagger.assisted.AssistedInject;
|
||||||
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
|
import one.nem.lacerta.source.database.entity.VcsLogEntity;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
|
||||||
|
public class LacertaVcsImpl implements LacertaVcs {
|
||||||
|
|
||||||
|
// TAG
|
||||||
|
private static final String TAG = LacertaVcsImpl.class.getSimpleName();
|
||||||
|
|
||||||
|
String documentId;
|
||||||
|
|
||||||
|
LacertaDatabase database;
|
||||||
|
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@AssistedInject
|
||||||
|
public LacertaVcsImpl(LacertaLogger logger, LacertaDatabase database, @Assisted String documentId) {
|
||||||
|
this.logger = logger;
|
||||||
|
this.database = database;
|
||||||
|
this.documentId = documentId;
|
||||||
|
logger.debug(TAG, "LacertaVcsImpl constructor");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updatePage(int index, String fileName) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void insertPage(int index, String fileName) {
|
||||||
|
logger.debug(TAG, "insertPage");
|
||||||
|
VcsLogEntity vcsLogEntity = new VcsLogEntity();
|
||||||
|
vcsLogEntity.id = UUID.randomUUID().toString();
|
||||||
|
vcsLogEntity.documentId = documentId;
|
||||||
|
vcsLogEntity.branchName = "master";
|
||||||
|
vcsLogEntity.createdAt = new java.util.Date();
|
||||||
|
vcsLogEntity.action = "placeholder";
|
||||||
|
database.vcsLogDao().insert(vcsLogEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deletePage(int index) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void createDocument(String documentId) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void printLog() {
|
||||||
|
logger.debug(TAG, "printLog");
|
||||||
|
database.vcsLogDao().findAll().forEach(vcsLog -> {
|
||||||
|
logger.debug(TAG, vcsLog.id);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package one.nem.lacerta.vcs.internal;
|
||||||
|
|
||||||
|
import android.provider.ContactsContract;
|
||||||
|
|
||||||
|
import one.nem.lacerta.vcs.ActionType;
|
||||||
|
import one.nem.lacerta.vcs.model.action.DeletePage;
|
||||||
|
import one.nem.lacerta.vcs.model.action.InsertPage;
|
||||||
|
import one.nem.lacerta.vcs.model.action.UpdatePage;
|
||||||
|
import one.nem.lacerta.vcs.model.action.common.ActionBase;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
public class JsonUtils {
|
||||||
|
|
||||||
|
// TODO-rca: Injectionで実装しなおす
|
||||||
|
|
||||||
|
// Public methods
|
||||||
|
|
||||||
|
public static String toJson(Object object) {
|
||||||
|
ActionBase converted;
|
||||||
|
if (object == null) {
|
||||||
|
return null;
|
||||||
|
} else if (object instanceof ActionBase) {
|
||||||
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
switch (((ActionBase) object).getActionType()) {
|
||||||
|
case INSERT_PAGE:
|
||||||
|
converted = (InsertPage) object;
|
||||||
|
break;
|
||||||
|
case UPDATE_PAGE:
|
||||||
|
converted = (UpdatePage) object;
|
||||||
|
break;
|
||||||
|
case DELETE_PAGE:
|
||||||
|
converted = (DeletePage) object;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new IllegalArgumentException("Unknown action type");
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return mapper.writeValueAsString(converted);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new IllegalArgumentException("Unknown object type");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Object fromJson(String json, ActionType actionType) {
|
||||||
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
try {
|
||||||
|
switch (actionType) {
|
||||||
|
case INSERT_PAGE:
|
||||||
|
return mapper.readValue(json, InsertPage.class);
|
||||||
|
case UPDATE_PAGE:
|
||||||
|
return mapper.readValue(json, UpdatePage.class);
|
||||||
|
case DELETE_PAGE:
|
||||||
|
return mapper.readValue(json, DeletePage.class);
|
||||||
|
default:
|
||||||
|
throw new IllegalArgumentException("Unknown action type");
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package one.nem.lacerta.vcs.model.action;
|
||||||
|
|
||||||
|
import one.nem.lacerta.vcs.model.action.common.ActionBase;
|
||||||
|
|
||||||
|
public class DeletePage extends ActionBase {
|
||||||
|
|
||||||
|
private int index;
|
||||||
|
|
||||||
|
public DeletePage() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public DeletePage(int index) {
|
||||||
|
this.index = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getIndex() {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package one.nem.lacerta.vcs.model.action;
|
||||||
|
|
||||||
|
import one.nem.lacerta.vcs.model.action.common.ActionBase;
|
||||||
|
|
||||||
|
public class InsertPage extends ActionBase {
|
||||||
|
|
||||||
|
private int index;
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
public InsertPage() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public InsertPage(int index, String fileName) {
|
||||||
|
this.index = index;
|
||||||
|
this.fileName = fileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getIndex() {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getFileName() {
|
||||||
|
return fileName;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package one.nem.lacerta.vcs.model.action;
|
||||||
|
|
||||||
|
import one.nem.lacerta.vcs.model.action.common.ActionBase;
|
||||||
|
|
||||||
|
public class UpdatePage extends ActionBase {
|
||||||
|
|
||||||
|
private int index;
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
public UpdatePage() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public UpdatePage(int index, String fileName) {
|
||||||
|
this.index = index;
|
||||||
|
this.fileName = fileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getIndex() {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getFileName() {
|
||||||
|
return fileName;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package one.nem.lacerta.vcs.model.action.common;
|
||||||
|
|
||||||
|
import one.nem.lacerta.vcs.ActionType;
|
||||||
|
|
||||||
|
public class ActionBase {
|
||||||
|
private ActionType actionType;
|
||||||
|
|
||||||
|
public ActionBase() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public ActionBase(ActionType actionType) {
|
||||||
|
this.actionType = actionType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ActionType getActionType() {
|
||||||
|
return actionType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setActionType(ActionType actionType) {
|
||||||
|
this.actionType = actionType;
|
||||||
|
}
|
||||||
|
}
|
||||||
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.vcs;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user