From a3864c350d1e5c1b3321f68290382ffddb22abc5 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Tue, 11 Jul 2017 17:25:40 +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=20=E4=BF=AE=E6=94=B99.0=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=20=E6=89=80=E6=9C=89=E8=AF=BB=E5=86=99xml?=
 =?UTF-8?q?=E7=9A=84class=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=80=9A=E7=94=A8=E7=9A=84GeneralXMLTool?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=AF=E6=8F=92=E4=BB=B6=E7=9A=84Class=E5=B9=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95PluginID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java
index 2dd6bef373..aa7467f4be 100644
--- a/designer_base/src/com/fr/design/DesignerEnvManager.java
+++ b/designer_base/src/com/fr/design/DesignerEnvManager.java
@@ -3,7 +3,10 @@
  */
 package com.fr.design;
 
-import com.fr.base.*;
+import com.fr.base.BaseXMLUtils;
+import com.fr.base.Env;
+import com.fr.base.FRContext;
+import com.fr.base.Utils;
 import com.fr.dav.LocalEnv;
 import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
 import com.fr.design.constants.UIConstants;
@@ -11,6 +14,7 @@ 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;
@@ -18,7 +22,6 @@ import com.fr.stable.xml.*;
 
 import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
-
 import java.awt.*;
 import java.io.*;
 import java.util.*;
@@ -1798,8 +1801,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (env == null) {
             return;
         }
-
-        writer.startTAG("Env").attr("class", env.getClass().getName()).attr("name", name);
+    
+        writer.startTAG("Env");
+        GeneralXMLTools.writeClassNameAttr(env.getClass(), writer);
+        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 e2019449c0..2db6c41a5e 100644
--- a/designer_base/src/com/fr/design/menu/MenuManager.java
+++ b/designer_base/src/com/fr/design/menu/MenuManager.java
@@ -4,7 +4,7 @@ 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.GeneralUtils;
+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 +140,7 @@ public class MenuManager extends XMLFileManager {
                     return;
                 }
                 try {
-                    MenuAction action = (MenuAction) GeneralUtils.classForName(name).newInstance();
+                    MenuAction action = (MenuAction) GeneralXMLTools.readXMLableClass(reader,name).newInstance();
                     menu.addShortCut(action);
                 } catch (Exception exp) {
                     FRLogger.getLogger().error(exp.getMessage(), exp);