From 814ac0329349979c2250b4ad98d89430ab374c52 Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Tue, 14 Jun 2022 19:26:26 -0400 Subject: [PATCH 1/6] [CITE-141] Adding a property to identify if an item is deleted --- .../java/org/springframework/social/zotero/api/Item.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java index 279f1d8..737b53b 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java @@ -10,6 +10,7 @@ public class Item { private Library library; private Data data; private Meta meta; + private boolean isDeleted; public String getKey() { return key; @@ -41,7 +42,13 @@ public Meta getMeta() { public void setMeta(Meta meta) { this.meta = meta; } - + public boolean isDeleted() { + return isDeleted; + } + public void setDeleted(boolean isDeleted) { + this.isDeleted = isDeleted; + } + public boolean isMetaDataNote() { if (this.data.getItemType().equals(ZOTERO_NOTE_KEY) && this.data.getTags().stream().anyMatch(tag -> tag.getTag().equals(CITESPHERE_METADATA_TAG))) { From 628c6f8017bfc8a8c41a6f0b59c05985a68f46b7 Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Wed, 15 Jun 2022 19:37:14 -0400 Subject: [PATCH 2/6] [CITE-141] Introducing a new property to hide citations --- .../java/org/springframework/social/zotero/api/Data.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index 24aa9bf..3678b16 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -47,6 +47,7 @@ public class Data { private List tags; private List collections; private int deleted; + private boolean isHidden; public String getKey() { return key; @@ -288,4 +289,10 @@ public int getDeleted() { public void setDeleted(int deleted) { this.deleted = deleted; } + public boolean isHidden() { + return isHidden; + } + public void setDeletedProperty(boolean isHidden) { + this.isHidden = isHidden; + } } From 925371bf7897100dbb7a9ab7e8ec7da6d905db34 Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Fri, 17 Jun 2022 19:44:29 -0400 Subject: [PATCH 3/6] [CITE-141] data type changes --- .../org/springframework/social/zotero/api/Data.java | 10 +++++----- .../org/springframework/social/zotero/api/Item.java | 8 -------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index 3678b16..dec66c2 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -47,7 +47,7 @@ public class Data { private List tags; private List collections; private int deleted; - private boolean isHidden; + private int remove; public String getKey() { return key; @@ -289,10 +289,10 @@ public int getDeleted() { public void setDeleted(int deleted) { this.deleted = deleted; } - public boolean isHidden() { - return isHidden; + public int isRemoved() { + return remove; } - public void setDeletedProperty(boolean isHidden) { - this.isHidden = isHidden; + public void setRemoved(int remove) { + this.remove = remove; } } diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java index 737b53b..584250f 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Item.java @@ -10,7 +10,6 @@ public class Item { private Library library; private Data data; private Meta meta; - private boolean isDeleted; public String getKey() { return key; @@ -42,13 +41,6 @@ public Meta getMeta() { public void setMeta(Meta meta) { this.meta = meta; } - public boolean isDeleted() { - return isDeleted; - } - public void setDeleted(boolean isDeleted) { - this.isDeleted = isDeleted; - } - public boolean isMetaDataNote() { if (this.data.getItemType().equals(ZOTERO_NOTE_KEY) && this.data.getTags().stream().anyMatch(tag -> tag.getTag().equals(CITESPHERE_METADATA_TAG))) { From 508dd427fe959364fb5b3057ce12dbaaf6b202ec Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Tue, 21 Jun 2022 19:32:09 -0400 Subject: [PATCH 4/6] [CITE-141] fix sync items issue --- .../java/org/springframework/social/zotero/api/ZoteroFields.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java index 3521000..7dd412d 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java @@ -11,5 +11,6 @@ public interface ZoteroFields { public final String NOTE = "note"; public final String TAGS = "tags"; public final String PARENT_ITEM = "parentItem"; + public final String HIDDEN = "remove"; } From b60942bf48521fbb71e4c99f377403cb846c35e6 Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Thu, 23 Jun 2022 19:25:07 -0400 Subject: [PATCH 5/6] [CITE-141] Code clean up --- .../org/springframework/social/zotero/api/Data.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index dec66c2..198be13 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -47,7 +47,7 @@ public class Data { private List tags; private List collections; private int deleted; - private int remove; + private int hidden; public String getKey() { return key; @@ -289,10 +289,10 @@ public int getDeleted() { public void setDeleted(int deleted) { this.deleted = deleted; } - public int isRemoved() { - return remove; + public int getHidden() { + return hidden; } - public void setRemoved(int remove) { - this.remove = remove; + public void setHidden(int hidden) { + this.hidden = hidden; } } From ae48959f6a21b4b652f3fb70d7151af974428d9e Mon Sep 17 00:00:00 2001 From: Charishma0249 Date: Thu, 23 Jun 2022 19:38:47 -0400 Subject: [PATCH 6/6] [CITE-141] Code clean up --- .../java/org/springframework/social/zotero/api/ZoteroFields.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java index 7dd412d..3521000 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/ZoteroFields.java @@ -11,6 +11,5 @@ public interface ZoteroFields { public final String NOTE = "note"; public final String TAGS = "tags"; public final String PARENT_ITEM = "parentItem"; - public final String HIDDEN = "remove"; }