Merge pull request #22 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0

* commit 'b2bc24b9ff94d6dd7da52123d73a69992fccda6c':
  merge
  merge chart : ba-9.0 => pf-9.0

designer_base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -33,7 +33,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
-        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport.getCode()) {
+        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -33,7 +33,7 @@ public class InstallOnlineCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
-        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport.getCode()) {
+        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

designer_base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -33,7 +33,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
-        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport.getCode()) {
+        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

designer_base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@@ -33,7 +33,7 @@ public class UpdateOnlineCallback extends AbstractPluginTaskCallback {
         if (result.isSuccess()) {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
-        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport.getCode()) {
+        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

designer_base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

@@ -32,7 +32,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
         if (result.isSuccess()) {
             FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
-        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport.getCode()) {
+        } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")),

designer_chart/src/com/fr/design/extra/ChartTypeInterfaceCloseableHandler.java

@@ -1,31 +0,0 @@
-package com.fr.design.extra;
-
-import com.fr.chart.charttypes.ChartTypeManager;
-import com.fr.plugin.proxy.CloseableInvocationHandler;
-
-/**
- * Created by juhaoyu on 2016/12/27.
- */
-public class ChartTypeInterfaceCloseableHandler extends CloseableInvocationHandler {
-
-
-    private final String plotID;
-
-    public ChartTypeInterfaceCloseableHandler(String plotID) throws NoSuchMethodException {
-
-        super();
-        this.plotID = plotID;
-    }
-
-    @Override
-    protected boolean invokeIsClosed() {
-
-        //UI对应的chart如果关闭或者不存在，则UI关闭
-        return super.invokeIsClosed() || !containsChart();
-    }
-
-    private boolean containsChart() {
-
-        return ChartTypeManager.getInstance().containsPlot(plotID);
-    }
-}