mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2026-11-02 11:37:37 +00:00
WIP
This commit is contained in:
1 file changed
+11
-6
+11
-6
@@ -141,8 +141,13 @@ public class LacertaApplyTagDialog extends DialogFragment {
|
||||
private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
|
||||
setRegisteredTagList().thenAccept(Void -> {
|
||||
|
||||
setRegisteredTagList().join();
|
||||
setAppliedTagList(documentId).join();
|
||||
|
||||
logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
|
||||
logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
|
||||
|
||||
for (int i = 0; i < this.registeredTags.size(); i++) {
|
||||
boolean isChecked = false;
|
||||
for (int j = 0; j < this.appliedTags.size(); j++) {
|
||||
@@ -154,26 +159,26 @@ public class LacertaApplyTagDialog extends DialogFragment {
|
||||
documentTagArrayList.add(new DocumentTagApplyTagDialogExtendedModel(
|
||||
new DocumentTag(this.registeredTags.get(i).getId(), this.registeredTags.get(i).getName(), this.registeredTags.get(i).getColor()), isChecked));
|
||||
}
|
||||
});
|
||||
|
||||
return documentTagArrayList;
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setAppliedTagList(String documentId) {
|
||||
private CompletableFuture<ArrayList<DocumentTag>> setAppliedTagList(String documentId) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTags -> {
|
||||
this.appliedTags = documentTags;
|
||||
});
|
||||
return null;
|
||||
return this.appliedTags;
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setRegisteredTagList() {
|
||||
private CompletableFuture<ArrayList<DocumentTag>> setRegisteredTagList() {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
lacertaLibrary.getTagList().thenAccept(documentTags -> {
|
||||
this.registeredTags = documentTags;
|
||||
});
|
||||
return null;
|
||||
return this.registeredTags;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user