From 85785c287e410480f3443632e3892352ee1b070a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Wed, 10 Nov 2021 13:50:57 +0100 Subject: [PATCH] Resolve FindBugs Collection Naming Confusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the FindBugs documentation: > CNC_COLLECTION_NAMING_CONFUSION: Collection variable is named with a different > type of collection in the name > > This class defines a field or local collection variable with a name that > contains a different type of collection in its name. An example would be a Set > called userList. This is confusing to the reader, and likely caused by a > previous refactor of type, without changing the name. This detector is > obviously only checking for English names. Signed-off-by: Tim Krüger --- .../filebrowser/webdav/DavUtils.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java index bb0ffb4f5..07067a9a3 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/DavUtils.java @@ -68,32 +68,32 @@ public class DavUtils { public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes"; static Property.Name[] getAllPropSet() { - List propSet = new ArrayList<>(); + List props = new ArrayList<>(); - propSet.add(DisplayName.NAME); - propSet.add(GetContentType.NAME); - propSet.add(GetContentLength.NAME); - propSet.add(GetContentType.NAME); - propSet.add(GetContentLength.NAME); - propSet.add(GetLastModified.NAME); - propSet.add(CreationDate.NAME); - propSet.add(GetETag.NAME); - propSet.add(ResourceType.NAME); + props.add(DisplayName.NAME); + props.add(GetContentType.NAME); + props.add(GetContentLength.NAME); + props.add(GetContentType.NAME); + props.add(GetContentLength.NAME); + props.add(GetLastModified.NAME); + props.add(CreationDate.NAME); + props.add(GetETag.NAME); + props.add(ResourceType.NAME); - propSet.add(NCPermission.NAME); - propSet.add(OCId.NAME); - propSet.add(OCSize.NAME); - propSet.add(OCFavorite.NAME); - propSet.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_OWNER_ID)); - propSet.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_OWNER_DISPLAY_NAME)); - propSet.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_UNREAD_COMMENTS)); + props.add(NCPermission.NAME); + props.add(OCId.NAME); + props.add(OCSize.NAME); + props.add(OCFavorite.NAME); + props.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_OWNER_ID)); + props.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_OWNER_DISPLAY_NAME)); + props.add(new Property.Name(OC_NAMESPACE, EXTENDED_PROPERTY_UNREAD_COMMENTS)); - propSet.add(NCEncrypted.NAME); - propSet.add(new Property.Name(NC_NAMESPACE, EXTENDED_PROPERTY_MOUNT_TYPE)); - propSet.add(NCPreview.NAME); - propSet.add(new Property.Name(NC_NAMESPACE, EXTENDED_PROPERTY_NOTE)); + props.add(NCEncrypted.NAME); + props.add(new Property.Name(NC_NAMESPACE, EXTENDED_PROPERTY_MOUNT_TYPE)); + props.add(NCPreview.NAME); + props.add(new Property.Name(NC_NAMESPACE, EXTENDED_PROPERTY_NOTE)); - return propSet.toArray(new Property.Name[0]); + return props.toArray(new Property.Name[0]); } public static void registerCustomFactories() {