From 4741f1d0509d239b6654099e301a526623eaf573 Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Fri, 29 Jun 2018 17:36:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-8926=20=E3=80=9010.0=E4=B8=80=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9C=89=E9=97=AE=E9=A2=98=20=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0basic=E5=90=AF=E5=8A=A8=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C=E5=88=87=E7=8E=AF=E5=A2=83=E4=B9=8B=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/itree/filetree/TemplateFileTree.java   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java b/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
index aaf57a90a..bef992fd4 100644
--- a/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
+++ b/designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java
@@ -1,7 +1,6 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
-import com.fr.base.extension.FileExtension;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.file.filetree.FileNode;
 import com.fr.log.FineLoggerFactory;
@@ -104,10 +103,6 @@ public class TemplateFileTree extends EnvFileTree {
         return null;
     }
     
-    public FileNode[] listFile(String path) throws Exception {
-        
-        return FRContext.getFileNodes().list(path);
-    }
     
     /*
      * 改变Env后,根据构造函数时设置的RootPaths,重新加载
@@ -169,24 +164,13 @@ public class TemplateFileTree extends EnvFileTree {
         
         FileNode[] fileNodes = null;
         try {
-            fileNodes = listFile(filePath);
+            fileNodes = FRContext.getFileNodes().list(filePath, filter);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (fileNodes == null) {
             fileNodes = new FileNode[0];
         }
-        // 用FileNodeFilter过滤一下
-        if (filter != null) {
-            List<FileNode> list = new ArrayList<FileNode>();
-            for (FileNode fileNode : fileNodes) {
-                if (filter.accept(fileNode)) {
-                    list.add(fileNode);
-                }
-            }
-            
-            fileNodes = list.toArray(new FileNode[list.size()]);
-        }
         
         Arrays.sort(fileNodes, new FileNodeComparator());