From 1a7eebe0867cae4494096e810b49a20805bca163 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Fri, 3 Mar 2017 11:04:19 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1835=20sap=E6=8F=92=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=B0=83=E5=BA=A6=E6=B2=A1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 9355a3348..352fc1564 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -29,6 +29,7 @@ import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.plugin.proxy.PluginProxyCompatibleUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
@@ -131,6 +132,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
         toolbarDef.addShortCut(delFileAction);
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getArray(ShortCut.TEMPLATE_TREE);
+        extraShortCuts = PluginProxyCompatibleUtils.toOriObjectHashSet(extraShortCuts);
         for (ShortCut shortCut : extraShortCuts){
             toolbarDef.addShortCut(shortCut);
         }