From 3b9319844757070fff5128dd79b115658501ed69 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Mon, 4 Jun 2018 17:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/gui/itree/filetree/TemplateFileTree.java   | 4 ++--
 .../remote/action/RemoteDesignAuthorityManagerAction.java    | 5 +++--
 .../com/fr/design/remote/ui/AuthorityListControlPane.java    | 4 +++-
 3 files changed, 8 insertions(+), 5 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 fec5d1e2f..981833491 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,13 +1,13 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.Env;
-import com.fr.base.FRContext;
 import com.fr.base.env.EnvContext;
 import com.fr.base.env.proxy.EnvProxy;
 import com.fr.base.env.resource.EnvConfigUtils;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.env.operator.file.TplFileOperator;
 import com.fr.file.filetree.FileNode;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
@@ -168,7 +168,7 @@ public class TemplateFileTree extends EnvFileTree {
         try {
             fileNodes = listFile(filePath);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (fileNodes == null) {
             fileNodes = new FileNode[0];
diff --git a/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java
index e9550ee80..8d222701f 100644
--- a/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java
+++ b/designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java
@@ -10,6 +10,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.remote.ui.AuthorityManagerPane;
 import com.fr.env.operator.authority.AuthorityOperator;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;
 
 import java.awt.event.ActionEvent;
@@ -41,7 +42,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
                     managerPane.populate(authorities);
                 }
             } catch (Exception exception) {
-                FRContext.getLogger().error(exception.getMessage());
+                FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
             }
         }
 
@@ -54,7 +55,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
                     try {
                         success = EnvProxy.get(AuthorityOperator.class).updateAuthorities(authorities);
                     } catch (Exception e) {
-                        FRContext.getLogger().error(e.getMessage());
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     }
                     FRContext.getLogger().info("update remote design authority: " + success);
                 }
diff --git a/designer-base/src/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/com/fr/design/remote/ui/AuthorityListControlPane.java
index ad0255032..03e6d4457 100644
--- a/designer-base/src/com/fr/design/remote/ui/AuthorityListControlPane.java
+++ b/designer-base/src/com/fr/design/remote/ui/AuthorityListControlPane.java
@@ -21,6 +21,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.env.RemoteDesignMember;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;
 import com.fr.stable.ArrayUtils;
 
@@ -324,7 +325,7 @@ public class AuthorityListControlPane extends BasicPane {
                 if (p[i] != null) {
                     try {
                         p[i].checkValid();
-                    } catch (Exception e) {
+                    } catch (Exception ignore) {
                         return i;
                     }
                 }
@@ -339,6 +340,7 @@ public class AuthorityListControlPane extends BasicPane {
             try {
                 checkValid();
             } catch (Exception exp) {
+                FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                 JOptionPane.showMessageDialog(AuthorityListControlPane.this, exp.getMessage());
                 authorityList.setSelectedIndex(idx);
                 return true;