From 52380151396139c3d6694f8af47970ca8071dd3e Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 26 Dec 2019 11:50:04 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-24344=20Spider=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=8F=92=E4=BB=B6=E9=9C=80=E8=A6=81=E7=BA=A6=E6=9D=9F?= =?UTF-8?q?=E4=B8=8BBI=20=E7=9B=B8=E5=85=B3jar=E7=9A=84=20jar=20time=20?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=A0=A1=E9=AA=8C=E6=8E=A5=E5=8F=A3=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 | 3 ++- .../design/extra/exe/callback/InstallFromDiskCallback.java | 6 +++--- .../fr/design/extra/exe/callback/InstallOnlineCallback.java | 4 ++-- .../design/extra/exe/callback/UninstallPluginCallback.java | 4 ++-- .../design/extra/exe/callback/UpdateFromDiskCallback.java | 6 +++--- .../extra/tradition/callback/UpdateOnlineCallback.java | 4 ++-- 6 files changed, 14 insertions(+), 13 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 e01e03b06d..fa3cf6f8be 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,6 +12,7 @@ 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.manage.PluginManager; import com.fr.plugin.view.PluginView; @@ -195,7 +196,7 @@ public class PluginUtils { } public static String getMessageByErrorCode(PluginErrorCode errorCode) { - if(errorCode == PluginErrorCode.None){ + if(errorCode == PluginCoreErrorCode.None){ return ""; } 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 19bd89ef10..1640848b14 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.PluginErrorCode; +import com.fr.plugin.error.PluginCoreErrorCode; 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() == PluginErrorCode.NeedDealWithPluginDependency) { + } else if (result.errorCode() == PluginCoreErrorCode.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() == PluginErrorCode.HasLowerPluginWhenInstall){ + } else if(result.errorCode() == PluginCoreErrorCode.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 f597180e87..f03538d41f 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.PluginErrorCode; +import com.fr.plugin.error.PluginCoreErrorCode; 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() == PluginErrorCode.HasLowerPluginWhenInstall){ + } else if(result.errorCode() == PluginCoreErrorCode.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 b3773ef6f9..99d16a421d 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.PluginErrorCode; +import com.fr.plugin.error.PluginCoreErrorCode; 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() == PluginErrorCode.NeedUninstallDependingPluginFirst) { + }else if (result.errorCode() == PluginCoreErrorCode.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 7cced40f0b..a5d8c1dc48 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.PluginErrorCode; +import com.fr.plugin.error.PluginCoreErrorCode; 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() == PluginErrorCode.NeedDealWithPluginDependency) { + } else if (result.errorCode() == PluginCoreErrorCode.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() == PluginErrorCode.NoPluginToUpdate){ + } else if(result.errorCode() == PluginCoreErrorCode.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 97a2ae0063..1b2be8bd96 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.PluginErrorCode; +import com.fr.plugin.error.PluginCoreErrorCode; 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() == PluginErrorCode.OperationNotSupport) { + } else if (result.errorCode() == PluginCoreErrorCode.OperationNotSupport) { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence"),