mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2024-11-23 00:13:16 +00:00
WIP
This commit is contained in:
parent
efdf9c1fea
commit
68dddbabee
|
@ -142,9 +142,7 @@ public class LacertaApplyTagDialog extends DialogFragment {
|
|||
return CompletableFuture.supplyAsync(() -> {
|
||||
ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
|
||||
|
||||
setRegisteredTagList().join();
|
||||
setAppliedTagList(documentId).join();
|
||||
|
||||
setRegisteredTagList().thenRun(() -> setAppliedTagList(documentId)).thenAccept(Void -> {
|
||||
logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
|
||||
logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
|
||||
|
||||
|
@ -159,7 +157,7 @@ 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));
|
||||
}
|
||||
|
||||
}).join();
|
||||
return documentTagArrayList;
|
||||
});
|
||||
}
|
||||
|
@ -167,7 +165,11 @@ public class LacertaApplyTagDialog extends DialogFragment {
|
|||
private CompletableFuture<Void> setAppliedTagList(String documentId) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTags -> {
|
||||
if (documentTags == null) {
|
||||
this.appliedTags = new ArrayList<>();
|
||||
} else {
|
||||
this.appliedTags = documentTags;
|
||||
}
|
||||
});
|
||||
return null;
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue
Block a user