From bf17d9f018d850a4b0e7f3726bf2e9c408fa7f7e Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Fri, 29 Jun 2018 17:11:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-9314=20=E3=80=9010.0=E4=B8=80=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E6=A8=A1=E6=9D=BF=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BAexcel=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B9=9F=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=EF=BC=8C9.0?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=20=E5=90=8E=E9=9D=A2=E6=9C=89=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/itree/filetree/TemplateFileTree.java  | 87 ++++++++++---------
 1 file changed, 47 insertions(+), 40 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 aeb3756e6..aaf57a90a 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
@@ -20,36 +20,40 @@ import java.util.List;
  * 显示Env下的reportlets目录下面的所有cpt文件
  */
 public class TemplateFileTree extends EnvFileTree {
-
-
+    
+    
     public TemplateFileTree() {
+        
         super(ProjectConstants.REPORTLETS_NAME, null, null);
     }
-
+    
     /*
      * 选中reportPath
      */
     public void setSelectedTemplatePath(String templatePath) {
+        
         this.selectPath(templatePath);
     }
-
+    
     /**
      * 返回选中的Template的路径
      */
     public String getSelectedTemplatePath() {
+        
         FileNode fn = this.getSelectedFileNode();
         if (fn != null && !fn.isDirectory()) {
             String envPath = fn.getEnvPath();
-
+            
             if (envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) {
                 return envPath.substring(ProjectConstants.REPORTLETS_NAME.length());
             }
         }
-
+        
         return null;
     }
-
+    
     public String[] getSelectedTemplatePaths() {
+        
         TreePath[] selectedTreePaths = this.getSelectionPaths();
         if (ArrayUtils.isEmpty(selectedTreePaths)) {
             return ArrayUtils.EMPTY_STRING_ARRAY;
@@ -68,13 +72,13 @@ public class TemplateFileTree extends EnvFileTree {
                 }
             }
         }
-
-
+        
+        
         return selectedPathList.toArray(new String[0]);
     }
-
+    
     public TreePath getNextMatch(String prefix, int startingRow, Position.Bias bias) {
-
+        
         int max = getRowCount();
         if (prefix == null) {
             throw new IllegalArgumentException();
@@ -89,9 +93,9 @@ public class TemplateFileTree extends EnvFileTree {
         do {
             TreePath path = getPathForRow(row);
             String text = convertValueToText(
-                    path.getLastPathComponent(), isRowSelected(row),
-                    isExpanded(row), true, row, false);
-
+                path.getLastPathComponent(), isRowSelected(row),
+                isExpanded(row), true, row, false);
+            
             if (text.toUpperCase().startsWith(prefix)) {
                 return path;
             }
@@ -99,24 +103,23 @@ public class TemplateFileTree extends EnvFileTree {
         } while (row != startingRow);
         return null;
     }
-
+    
     public FileNode[] listFile(String path) throws Exception {
-        return FRContext.getFileNodes().list(
-                path,
-                new FileExtension[]{FileExtension.CPT, FileExtension.FRM, FileExtension.CPTX, FileExtension.FRMX});
+        
+        return FRContext.getFileNodes().list(path);
     }
-
+    
     /*
      * 改变Env后,根据构造函数时设置的RootPaths,重新加载
      */
     public void refreshEnv() {
-
+        
         DefaultTreeModel defaultTreeModel = (DefaultTreeModel) this.getModel();
         ExpandMutableTreeNode rootTreeNode = (ExpandMutableTreeNode) defaultTreeModel.getRoot();
         rootTreeNode.removeAllChildren();
-
+        
         FileNode[] fns;
-
+        
         // 如果rootPaths是null的话列出所有文件
         if (subPathes == null) {
             fns = listFileNodes(this.treeRootPath);
@@ -127,26 +130,28 @@ public class TemplateFileTree extends EnvFileTree {
                 fns[i] = new FileNode(StableUtils.pathJoin(this.treeRootPath, subPathes[i]), true);
             }
         }
-
+        
         ExpandMutableTreeNode[] subTreeNodes = fileNodeArray2TreeNodeArray(fns);
-
+        
         for (ExpandMutableTreeNode node : subTreeNodes) {
             rootTreeNode.add(node);
         }
-
+        
         defaultTreeModel.reload(rootTreeNode);
     }
-
+    
     protected ExpandMutableTreeNode[] loadChildTreeNodes(ExpandMutableTreeNode treeNode) {
+        
         FileNode[] fn_array = listFileNodes(treeNode);
-
+        
         return fileNodeArray2TreeNodeArray(fn_array);
     }
-
+    
     /*
      * 把FileNode[]转成ExpandMutableTreeNode[]
      */
     private ExpandMutableTreeNode[] fileNodeArray2TreeNodeArray(FileNode[] fileNodes) {
+        
         ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[fileNodes.length];
         for (int i = 0; i < res.length; i++) {
             FileNode fn = fileNodes[i];
@@ -155,12 +160,13 @@ public class TemplateFileTree extends EnvFileTree {
                 res[i].add(new ExpandMutableTreeNode());
             }
         }
-
+        
         return res;
     }
-
-
+    
+    
     private FileNode[] listFileNodes(String filePath) {
+        
         FileNode[] fileNodes = null;
         try {
             fileNodes = listFile(filePath);
@@ -178,31 +184,32 @@ public class TemplateFileTree extends EnvFileTree {
                     list.add(fileNode);
                 }
             }
-
+            
             fileNodes = list.toArray(new FileNode[list.size()]);
         }
-
+        
         Arrays.sort(fileNodes, new FileNodeComparator());
-
+        
         return fileNodes;
     }
-
+    
     /*
      * 求当前TreeNode下所有的FileNode.
      */
     private FileNode[] listFileNodes(ExpandMutableTreeNode currentTreeNode) {
+        
         if (currentTreeNode == null) {
             return new FileNode[0];
         }
-
+        
         Object object = currentTreeNode.getUserObject();
-
+        
         if (object instanceof FileNode) {
             return this.listFileNodes(((FileNode) object).getEnvPath());
         }
-
+        
         return new FileNode[0];
     }
-
-
+    
+    
 }
\ No newline at end of file