From 7e27862445069dff105816b187bbd8ce52ca0e29 Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 8 Jan 2020 17:37:46 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-26147=20@harrison=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E7=9A=84release=E7=9A=84jar=E5=92=8C=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=80=A7=E8=83=BD=E6=8F=92=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=8F=92=E4=BB=B6=E9=9C=80=E8=A6=81=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=A6=81=E7=94=A8=20=E6=94=B9=20apilevel=20=E6=BB=A1?= =?UTF-8?q?=E8=B6=B3=E4=B8=8D=E4=BA=86=E5=85=A8=E9=83=A8=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=9C=80=E6=B1=82=E3=80=82=20=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=90=8D=E5=AD=97=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E7=84=B6=E6=97=A7=E7=89=88=E6=9C=AC=E7=9A=84=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B2=A1=E6=B3=95=E6=AD=A3=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/extra/PluginUtils.java | 8 ++++---- .../extra/exe/callback/InstallFromDiskCallback.java | 6 +++--- .../design/extra/exe/callback/InstallOnlineCallback.java | 4 ++-- .../extra/exe/callback/UninstallPluginCallback.java | 4 ++-- .../design/extra/exe/callback/UpdateFromDiskCallback.java | 6 +++--- .../extra/tradition/callback/UpdateOnlineCallback.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java index fa3cf6f8b..d1997684f 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java @@ -12,8 +12,8 @@ import com.fr.plugin.basic.version.Version; import com.fr.plugin.basic.version.VersionIntervalFactory; import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; import com.fr.plugin.error.PluginErrorCode; +import com.fr.plugin.error.PluginBaseErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.view.PluginView; import com.fr.stable.EncodeConstants; @@ -195,15 +195,15 @@ public class PluginUtils { } } - public static String getMessageByErrorCode(PluginErrorCode errorCode) { - if(errorCode == PluginCoreErrorCode.None){ + public static String getMessageByErrorCode(PluginBaseErrorCode errorCode) { + if(errorCode == PluginErrorCode.None){ return ""; } return com.fr.design.i18n.Toolkit.i18nCompatibleServerText(getInterKeyByErrorCode(errorCode)); } - private static String getInterKeyByErrorCode(PluginErrorCode errorCode) { + private static String getInterKeyByErrorCode(PluginBaseErrorCode errorCode) { return errorCode.getDescription(); } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java index 1640848b1..19bd89ef1 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java @@ -7,7 +7,7 @@ import com.fr.design.extra.PluginUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; +import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.control.PluginTask; import com.fr.plugin.manage.control.PluginTaskResult; @@ -43,7 +43,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { jsCallback.execute("success"); FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo); FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo); - } else if (result.errorCode() == PluginCoreErrorCode.NeedDealWithPluginDependency) { + } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"), @@ -63,7 +63,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { PluginOperateUtils.installPluginOnline(marker, jsCallback); } PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback)); - } else if(result.errorCode() == PluginCoreErrorCode.HasLowerPluginWhenInstall){ + } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"), diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java index f03538d41..f597180e8 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java @@ -6,7 +6,7 @@ import com.fr.design.extra.PluginOperateUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; +import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.control.AbstractDealPreTaskCallback; import com.fr.plugin.manage.control.PluginTask; import com.fr.plugin.manage.control.PluginTaskResult; @@ -40,7 +40,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { jsCallback.execute("success"); FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo); FineJOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success") + switchedInfo); - } else if(result.errorCode() == PluginCoreErrorCode.HasLowerPluginWhenInstall){ + } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"), diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java index 99d16a421..b3773ef6f 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java @@ -6,7 +6,7 @@ import com.fr.design.extra.PluginUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; +import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.control.PluginTaskResult; @@ -29,7 +29,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { jsCallback.execute("success"); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success")); FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success")); - }else if (result.errorCode() == PluginCoreErrorCode.NeedUninstallDependingPluginFirst) { + }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"), diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java index a5d8c1dc4..7cced40f0 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java @@ -7,7 +7,7 @@ import com.fr.design.extra.PluginUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; +import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.control.PluginTask; import com.fr.plugin.manage.control.PluginTaskResult; @@ -41,7 +41,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { jsCallback.execute("success"); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); - } else if (result.errorCode() == PluginCoreErrorCode.NeedDealWithPluginDependency) { + } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"), @@ -61,7 +61,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { PluginOperateUtils.updatePluginOnline(marker, jsCallback); } PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback)); - } else if(result.errorCode() == PluginCoreErrorCode.NoPluginToUpdate){ + } else if(result.errorCode() == PluginErrorCode.NoPluginToUpdate){ int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"), diff --git a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java index 1b2be8bd9..97a2ae006 100644 --- a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java @@ -6,7 +6,7 @@ import com.fr.design.extra.PluginUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; -import com.fr.plugin.error.PluginCoreErrorCode; +import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.manage.control.PluginTaskResult; import com.fr.plugin.manage.control.ProgressCallback; @@ -34,7 +34,7 @@ public class UpdateOnlineCallback implements ProgressCallback { if (result.isSuccess()) { FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success")); FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful")); - } else if (result.errorCode() == PluginCoreErrorCode.OperationNotSupport) { + } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence"),