From bce740a3929954afbf1217ba2f3d4fe9ab03023b Mon Sep 17 00:00:00 2001
From: Lanlan <Lanlan@fanruan.com>
Date: Mon, 4 Jan 2021 16:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=A8HashMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/itree/filetree/EnvFileTree.java       | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java
index 461cc1d011..f3771a0f90 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java
@@ -13,9 +13,8 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.HashMap;
+import java.util.Map;
 import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -201,33 +200,14 @@ public class EnvFileTree extends RefreshableJTree {
 
         // 用FileNodeFilter过滤一下
         if (filter != null) {
-            Set<FileNode> tSet = new TreeSet<FileNode>(new Comparator<FileNode>() {
-                private boolean isNull(FileNode node) {
-                    return node == null || node.getName() == null;
-                }
-
-                @Override
-                public int compare(FileNode o1, FileNode o2) {
-                    if (isNull(o1) && !isNull(o2)) {
-                        return 1;
-                    }
-                    if (!isNull(o1) && isNull(o2)) {
-                        return -1;
-                    }
-                    if (isNull(o1) && isNull(o2)) {
-                        return 0;
-                    }
-                    return o1.getName().compareTo(o2.getName());
-                }
-            });
-            for (int i = 0; i < resFns.length; i++) {
+            Map<String, FileNode> fileNodes = new HashMap<>();
+            for (FileNode fileNode : resFns) {
                 // war包部署下会生成两份classes目录，需要去重一下
-                if (filter.accept(resFns[i])) {
-                    tSet.add(resFns[i]);
+                if (filter.accept(fileNode)) {
+                    fileNodes.put(fileNode.getName(), fileNode);
                 }
             }
-
-            resFns = tSet.toArray(new FileNode[tSet.size()]);
+            resFns = fileNodes.values().toArray(new FileNode[fileNodes.size()]);
         }
 
         Arrays.sort(resFns, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes()));