From a879a085b4b3ec55de8259626526117f930aaf9a Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Tue, 13 Nov 2018 01:39:12 +0100
Subject: [PATCH] Fixed Warnings

---
 .../tools/ui/treeview/TreeViewAdapter.java    | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java
index 69e5862..ffe2a813 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/treeview/TreeViewAdapter.java
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * Created by tlh on 2016/10/1 :)
  */
+@SuppressWarnings("unused")
 public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final String KEY_IS_EXPAND = "IS_EXPAND";
     private final List<? extends TreeViewBinder> viewBinders;
@@ -42,7 +43,7 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
      * @param nodes 基准点
      */
     private void findDisplayNodes(List<TreeNode> nodes) {
-        for (TreeNode node : nodes) {
+        for (TreeNode<?> node : nodes) {
             displayNodes.add(node);
             if (!node.isLeaf() && node.isExpand())
                 findDisplayNodes(node.getChildList());
@@ -54,8 +55,9 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         return displayNodes.get(position).getContent().getLayoutId();
     }
 
+    @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(parent.getContext())
                 .inflate(viewType, parent, false);
         if (viewBinders.size() == 1)
@@ -68,8 +70,8 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position, List<Object> payloads) {
-        if (payloads != null && !payloads.isEmpty()) {
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty()) {
             Bundle b = (Bundle) payloads.get(0);
             for (String key : b.keySet()) {
                 switch (key) {
@@ -84,44 +86,42 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     @Override
-    public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
         holder.itemView.setPadding(displayNodes.get(position).getHeight() * padding, 3, 3, 3);
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TreeNode selectedNode = displayNodes.get(holder.getLayoutPosition());
-                // Prevent multi-click during the short interval.
-                try {
-                    long lastClickTime = (long) holder.itemView.getTag();
-                    if (System.currentTimeMillis() - lastClickTime < 500)
-                        return;
-                } catch (Exception e) {
-                    holder.itemView.setTag(System.currentTimeMillis());
-                }
+        holder.itemView.setOnClickListener(v -> {
+            TreeNode selectedNode = displayNodes.get(holder.getLayoutPosition());
+            // Prevent multi-click during the short interval.
+            try {
+                long lastClickTime = (long) holder.itemView.getTag();
+                if (System.currentTimeMillis() - lastClickTime < 500)
+                    return;
+            } catch (Exception e) {
                 holder.itemView.setTag(System.currentTimeMillis());
+            }
+            holder.itemView.setTag(System.currentTimeMillis());
 
-                if (onTreeNodeListener != null && onTreeNodeListener.onClick(selectedNode, holder))
-                    return;
-                if (selectedNode.isLeaf())
-                    return;
-                // This TreeNode was locked to click.
-                if (selectedNode.isLocked()) return;
-                boolean isExpand = selectedNode.isExpand();
-                int positionStart = displayNodes.indexOf(selectedNode) + 1;
-                if (!isExpand) {
-                    notifyItemRangeInserted(positionStart, addChildNodes(selectedNode, positionStart));
-                } else {
-                    notifyItemRangeRemoved(positionStart, removeChildNodes(selectedNode, true));
-                }
+            if (onTreeNodeListener != null && onTreeNodeListener.onClick(selectedNode, holder))
+                return;
+            if (selectedNode.isLeaf())
+                return;
+            // This TreeNode was locked to click.
+            if (selectedNode.isLocked()) return;
+            boolean isExpand = selectedNode.isExpand();
+            int positionStart = displayNodes.indexOf(selectedNode) + 1;
+            if (!isExpand) {
+                notifyItemRangeInserted(positionStart, addChildNodes(selectedNode, positionStart));
+            } else {
+                notifyItemRangeRemoved(positionStart, removeChildNodes(selectedNode, true));
             }
         });
         for (TreeViewBinder viewBinder : viewBinders) {
             if (viewBinder.getLayoutId() == displayNodes.get(position).getContent().getLayoutId())
+                //noinspection unchecked
                 viewBinder.bindView(holder, position, displayNodes.get(position));
         }
     }
 
-    private int addChildNodes(TreeNode pNode, int startIndex) {
+    private int addChildNodes(TreeNode<?> pNode, int startIndex) {
         List<TreeNode> childList = pNode.getChildList();
         int addChildCount = 0;
         for (TreeNode treeNode : childList) {
@@ -139,7 +139,7 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         return removeChildNodes(pNode, true);
     }
 
-    private int removeChildNodes(TreeNode pNode, boolean shouldToggle) {
+    private int removeChildNodes(TreeNode<?> pNode, boolean shouldToggle) {
         if (pNode.isLeaf())
             return 0;
         List<TreeNode> childList = pNode.getChildList();
@@ -287,7 +287,7 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         notifyDiff(temp);
     }
 
-    public void collapseBrotherNode(TreeNode pNode) {
+    public void collapseBrotherNode(TreeNode<LayoutItemType> pNode) {
         List<TreeNode> temp = backupDisplayNodes();
         if (pNode.isRoot()) {
             List<TreeNode> roots = new ArrayList<>();
@@ -301,7 +301,7 @@ public class TreeViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     removeChildNodes(root);
             }
         } else {
-            TreeNode parent = pNode.getParent();
+            TreeNode<?> parent = pNode.getParent();
             if (parent == null)
                 return;
             List<TreeNode> childList = parent.getChildList();