From 36b18654c5238252d93e61a64e3dfe44b1e9e3ae Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Fri, 23 Jun 2017 11:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E5=88=B0Report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/extra/PluginFromStorePane.java   |  2 +-
 .../com/fr/design/extra/PluginInstalledPane.java   |  4 ++--
 .../src/com/fr/design/extra/PluginUpdatePane.java  |  2 +-
 .../src/com/fr/design/extra/PluginUtils.java       | 14 +++++++++++++-
 .../extra/exe/callback/DownloadCallback.java       |  3 ++-
 .../exe/callback/InstallFromDiskCallback.java      |  3 ++-
 .../extra/exe/callback/InstallOnlineCallback.java  |  3 ++-
 .../extra/exe/callback/ModifyStatusCallback.java   |  3 ++-
 .../exe/callback/UninstallPluginCallback.java      |  3 ++-
 .../extra/exe/callback/UpdateFromDiskCallback.java |  3 ++-
 .../extra/exe/callback/UpdateOnlineCallback.java   |  3 ++-
 .../tradition/callback/UpdateOnlineCallback.java   |  3 ++-
 12 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java
index 4de4b0d18..f3e0de799 100644
--- a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java
+++ b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java
@@ -179,7 +179,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                         FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
                         JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
                     } else {
-                        JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                     }                }
             });
         } catch (Exception e1) {
diff --git a/designer_base/src/com/fr/design/extra/PluginInstalledPane.java b/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
index 61750503b..a3f4c697d 100644
--- a/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
+++ b/designer_base/src/com/fr/design/extra/PluginInstalledPane.java
@@ -69,7 +69,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                 if (result.isSuccess()) {
                                     JOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
@@ -80,7 +80,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                 if (result.isSuccess()) {
                                     JOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
diff --git a/designer_base/src/com/fr/design/extra/PluginUpdatePane.java b/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
index 21855e01f..32e9b7cba 100644
--- a/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
+++ b/designer_base/src/com/fr/design/extra/PluginUpdatePane.java
@@ -200,7 +200,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
                     FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
                     JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
                 } else {
-                    JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                 }
             }
         });
diff --git a/designer_base/src/com/fr/design/extra/PluginUtils.java b/designer_base/src/com/fr/design/extra/PluginUtils.java
index 20f19c144..affabe054 100644
--- a/designer_base/src/com/fr/design/extra/PluginUtils.java
+++ b/designer_base/src/com/fr/design/extra/PluginUtils.java
@@ -10,6 +10,7 @@ import com.fr.json.JSONObject;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 
+import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StableUtils;
@@ -29,6 +30,8 @@ import java.util.Map;
  * Created by ibm on 2017/5/25.
  */
 public class PluginUtils {
+    
+    private static final String ERROR_CODE_I18N_PREFIX = "FR-Plugin_Error_";
 
 
     public static PluginMarker createPluginMarker(String pluginInfo) {
@@ -157,5 +160,14 @@ public class PluginUtils {
             return StringUtils.EMPTY;
         }
     }
-
+    
+    public static String getMessageByErrorCode(PluginErrorCode errorCode) {
+        
+        return Inter.getLocText(getInterKeyByErrorCode(errorCode));
+    }
+    
+    private static String getInterKeyByErrorCode(PluginErrorCode errorCode) {
+        
+        return ERROR_CODE_I18N_PREFIX + errorCode.getDescription();
+    }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java
index 1c851b5d6..117def482 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/DownloadCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.design.extra.exe.extratask.ExtraPluginTask;
 import com.fr.general.Inter;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -30,7 +31,7 @@ public class DownloadCallback extends AbstractPluginTaskCallback {
             extraPluginTask.doExtraPluginTask();
         } else {
             jsCallback.execute("failed");
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
index 7a3f4be6c..a16631a5a 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.error.PluginErrorCode;
@@ -51,7 +52,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
index f13e55fa0..0800029b0 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.context.PluginMarker;
@@ -51,7 +52,7 @@ public class InstallOnlineCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().install(pluginMarker, new InstallOnlineCallback(pluginMarker, jsCallback));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
index 5545c06c4..d5b22c25f 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/ModifyStatusCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.Inter;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -24,7 +25,7 @@ public class ModifyStatusCallback implements PluginTaskCallback{
             String modifyMessage = isActive ? Inter.getLocText("FR-Designer-Plugin_Disabled") : Inter.getLocText("FR-Designer-Plugin_Actived");
             JOptionPane.showMessageDialog(null, modifyMessage);
         } else {
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
index 0a9664d5e..10d7f574e 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.context.PluginMarker;
@@ -43,7 +44,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
index 10d8cd82b..7cfc5a34e 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.error.PluginErrorCode;
@@ -51,7 +52,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
index 91bf4983c..818fcf2dd 100644
--- a/designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
+++ b/designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
@@ -1,5 +1,6 @@
 package com.fr.design.extra.exe.callback;
 
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.context.PluginMarker;
@@ -51,7 +52,7 @@ public class UpdateOnlineCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, jsCallback));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }
diff --git a/designer_base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java b/designer_base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
index ff52efaa3..ef594f89f 100644
--- a/designer_base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
+++ b/designer_base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
@@ -1,6 +1,7 @@
 package com.fr.design.extra.tradition.callback;
 
 import com.fr.design.extra.PluginStatusCheckCompletePane;
+import com.fr.design.extra.PluginUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.plugin.context.PluginMarker;
@@ -49,7 +50,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
             PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
         } else {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, result.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }