From fe470dd49138ef5002c78dd3f125fa17cad59353 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Tue, 14 May 2019 16:43:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-16997=20FileExtension=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8E=A5=E5=8F=A3=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/itree/filetree/TemplateFileTree.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java index ebbb78470..a76b353ab 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java @@ -1,6 +1,7 @@ package com.fr.design.gui.itree.filetree; import com.fr.base.FRContext; +import com.fr.base.FileExtensionProvider; import com.fr.base.extension.FileExtension; import com.fr.design.ExtraDesignClassManager; import com.fr.design.file.NodeAuthProcessor; @@ -16,7 +17,6 @@ import javax.swing.text.Position; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -129,15 +129,15 @@ public class TemplateFileTree extends EnvFileTree { public FileNode[] listFile(String path) { // 支持插件扩展, 先从env的filter拿, 再从插件拿 - Set supportTypes = createFileExtensionFilter(); + Set supportTypes = createFileExtensionFilter(); return FRContext.getFileNodes().list( path, - supportTypes.toArray(new FileExtension[supportTypes.size()]) + supportTypes.toArray(new FileExtensionProvider[supportTypes.size()]) ); } - private Set createFileExtensionFilter() { - Set supportTypes = new HashSet(); + private Set createFileExtensionFilter() { + Set supportTypes = new HashSet(); if (filter != null) { for (String temp : filter.getSupportedTypes()) { supportTypes.add(FileExtension.parse(temp)); @@ -228,17 +228,6 @@ public class TemplateFileTree extends EnvFileTree { if (fileNodes == null) { fileNodes = new FileNode[0]; } - // FileNodeFilter过滤 - if (filter != null) { - List list = new ArrayList(); - for (FileNode fileNode : fileNodes) { - if (filter.accept(fileNode)) { - list.add(fileNode); - } - } - fileNodes = list.toArray(new FileNode[list.size()]); - } - Arrays.sort(fileNodes, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes())); return fileNodes; } From f50ea66fa0691efa8f27f1130b098f42e5cbe4ce Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Tue, 14 May 2019 17:37:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=AF=E5=88=A0=E4=BA=86sort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/gui/itree/filetree/TemplateFileTree.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java index a76b353ab..a52e33440 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java @@ -17,6 +17,7 @@ import javax.swing.text.Position; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -228,6 +229,7 @@ public class TemplateFileTree extends EnvFileTree { if (fileNodes == null) { fileNodes = new FileNode[0]; } + Arrays.sort(fileNodes, new FileNodeComparator(FRContext.getFileNodes().getSupportedTypes())); return fileNodes; } From a369005330f469dbb72521d4e05bfce2e52c9379 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Tue, 14 May 2019 18:20:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BE=9D=E7=84=B6=E4=BD=BF=E7=94=A8FileExt?= =?UTF-8?q?ension?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/itree/filetree/TemplateFileTree.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java index a52e33440..51af636aa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java +++ b/designer-base/src/main/java/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.FileExtensionProvider; import com.fr.base.extension.FileExtension; import com.fr.design.ExtraDesignClassManager; import com.fr.design.file.NodeAuthProcessor; @@ -130,15 +129,15 @@ public class TemplateFileTree extends EnvFileTree { public FileNode[] listFile(String path) { // 支持插件扩展, 先从env的filter拿, 再从插件拿 - Set supportTypes = createFileExtensionFilter(); + Set supportTypes = createFileExtensionFilter(); return FRContext.getFileNodes().list( path, - supportTypes.toArray(new FileExtensionProvider[supportTypes.size()]) + supportTypes.toArray(new FileExtension[supportTypes.size()]) ); } - private Set createFileExtensionFilter() { - Set supportTypes = new HashSet(); + private Set createFileExtensionFilter() { + Set supportTypes = new HashSet(); if (filter != null) { for (String temp : filter.getSupportedTypes()) { supportTypes.add(FileExtension.parse(temp));