From 88520e8249e76e8f04e2e205d3aad169e35f30b1 Mon Sep 17 00:00:00 2001
From: xiaoxia <xiaoxia@finereport.com>
Date: Mon, 31 Oct 2016 18:18:13 +0800
Subject: [PATCH] rt

---
 .../mainframe/FormWidgetDetailPane.java       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
index aee06781d2..e967bdb2eb 100644
--- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
@@ -252,28 +252,24 @@ public class FormWidgetDetailPane extends FormDockView{
         deleteButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                ShareLoader.getLoader().removeElementFromMap();
+                ShareLoader.getLoader().removeModulesFromMap();
                 refreshShareMoudule();
                 reuWidgetPanel.remove(deleteButton);
                 elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
                 refreshDownPanel(false);
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Removed_Successful"));
             }
         });
         refreshDownPanel(true);
+
     }
 
     private void installFromDiskZipFile(File chosenFile) {
-        try {
-
-            IOUtils.copy(chosenFile, new File(ShareLoader.MODULE_PATH));
-            refreshShareMoudule();
-            elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
-            refreshDownPanel(false);
-            JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_OK"));
-        } catch (IOException e) {
-            JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Error"));
-            e.printStackTrace();
-        }
+        ShareLoader.getLoader().installModuleFromDiskZipFile(chosenFile);
+        refreshShareMoudule();
+        elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
+        refreshDownPanel(false);
+        JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_OK"));
     }
 
     private void refreshShareMoudule() {