From 2a9dc8e3ec642466693fc541774330876987e550 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 29 Sep 2017 09:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89deleteSvg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/env/RemoteEnv.java   | 46 ++++---------------
 .../PlotSeries/MapGroupExtensionPane.java     |  4 +-
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 0737e75da5..bcbedfe92a 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -56,8 +56,7 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.web.ResourceConstants;
 
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -65,7 +64,7 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.awt.Component;
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -1014,8 +1013,14 @@ public class RemoteEnv extends AbstractEnv {
         }
         try {
             HashMap<String, String> para = new HashMap<String, String>();
-            para.put("op", "fr_remote_design");
-            para.put("cmd", "delete_file");
+            if (filePath.contains(ProjectConstants.ASSETS_NAME)) {
+                para.put("op", "svgrelate");
+                para.put("cmd", "delete_svg");
+            } else {
+                para.put("op", "fr_remote_design");
+                para.put("cmd", "delete_file");
+            }
+
             para.put("file_path", filePath);
 
             HttpClient client = createHttpMethod(para);
@@ -1578,37 +1583,6 @@ public class RemoteEnv extends AbstractEnv {
         return true;
     }
 
-
-    /**
-     * 删除svg文件
-     *
-     * @param filePath svg文件地址
-     * @return 删除成功返回true
-     */
-    public boolean deleteSvg(String filePath) {
-        if (filePath == null) {
-            return false;
-        }
-        try {
-            HashMap<String, String> para = new HashMap<String, String>();
-            para.put("op", "svgrelate");
-            para.put("cmd", "delete_svg");
-            para.put("file_path", filePath);
-
-            HttpClient client = createHttpMethod(para);
-            InputStream input = execute4InputStream(client);
-
-            if (input == null) {
-                return false;
-            }
-
-            return Boolean.valueOf(IOUtils.inputStream2String(input, EncodeConstants.ENCODING_UTF_8));
-        } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
-        }
-        return false;
-    }
-
     /**
      * 写报表运行环境所需的配置文件
      *
diff --git a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
index 1bcfc29778..7a4732807b 100644
--- a/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
+++ b/designer_chart/src/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
@@ -361,9 +361,9 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 						groupExtensionPane.setValueAtCurrentSelectIndex(newName);
 						fireStateChange();
 						saveMapInfo(newName);
-						FRContext.getCurrentEnv().deleteSvg(
+						FRContext.getCurrentEnv().deleteFile(
 								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeDefaultMapPath(),oldName+SvgProvider.EXTENSION}));
-						FRContext.getCurrentEnv().deleteSvg(
+						FRContext.getCurrentEnv().deleteFile(
 								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
 						refresh();
 					}catch (Exception exp){