From dda8a8182643c16c8ad52920e01e7195bfcce565 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Wed, 12 Jul 2017 11:00:53 +0800
Subject: [PATCH] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=201=E3=80=81=E5=B0=86ClassForName=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=94=BE=E5=88=B0StableUtils=E9=87=8C=E9=9D=A2=202?=
 =?UTF-8?q?=E3=80=81xmlreader=E5=92=8Cwriter=E6=8F=90=E4=BE=9B=E8=AF=BB?=
 =?UTF-8?q?=E5=86=99Class=E5=AF=B9=E8=B1=A1=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=81=E8=A3=85=E6=8F=92=E4=BB=B6=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/DesignerEnvManager.java | 3 +--
 designer_base/src/com/fr/design/menu/MenuManager.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java
index aa7467f4be..5658a318dc 100644
--- a/designer_base/src/com/fr/design/DesignerEnvManager.java
+++ b/designer_base/src/com/fr/design/DesignerEnvManager.java
@@ -14,7 +14,6 @@ import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;
 import com.fr.file.FILEFactory;
 import com.fr.general.*;
-import com.fr.general.xml.GeneralXMLTools;
 import com.fr.stable.*;
 import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
@@ -1803,7 +1802,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     
         writer.startTAG("Env");
-        GeneralXMLTools.writeClassNameAttr(env.getClass(), writer);
+        writer.classAttr(env.getClass());
         writer.attr("name", name);
 
         env.writeXML(writer);
diff --git a/designer_base/src/com/fr/design/menu/MenuManager.java b/designer_base/src/com/fr/design/menu/MenuManager.java
index 2db6c41a5e..18d6b0e022 100644
--- a/designer_base/src/com/fr/design/menu/MenuManager.java
+++ b/designer_base/src/com/fr/design/menu/MenuManager.java
@@ -4,7 +4,6 @@ import com.fr.design.DesignState;
 import com.fr.design.actions.MenuAction;
 import com.fr.file.XMLFileManager;
 import com.fr.general.FRLogger;
-import com.fr.general.xml.GeneralXMLTools;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLReadable;
@@ -140,7 +139,7 @@ public class MenuManager extends XMLFileManager {
                     return;
                 }
                 try {
-                    MenuAction action = (MenuAction) GeneralXMLTools.readXMLableClass(reader,name).newInstance();
+                    MenuAction action = (MenuAction) reader.getAttrAsClass().newInstance();
                     menu.addShortCut(action);
                 } catch (Exception exp) {
                     FRLogger.getLogger().error(exp.getMessage(), exp);