From 7ba537a4648590733c17a22d1bf7fdaed52203ad Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Wed, 21 Jun 2017 14:42:12 +0800 Subject: [PATCH 1/4] special level --- .../src/com/fr/design/fun/ExportToolBarProvider.java | 3 ++- .../com/fr/design/chart/fun/IndependentChartUIProvider.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java b/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java index 7b2fd2088..4e53e96dd 100644 --- a/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java +++ b/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java @@ -1,5 +1,6 @@ package com.fr.design.fun; +import com.fr.plugin.injectable.SpecialLevel; import com.fr.stable.fun.mark.Mutable; import javax.swing.*; @@ -9,7 +10,7 @@ import javax.swing.*; */ public interface ExportToolBarProvider extends Mutable{ - String XML_TAG = "ExportToolBarProvider"; + String XML_TAG = SpecialLevel.ExportToolBarProvider.getTagName(); int CURRENT_LEVEL = 1; diff --git a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java index 1b90382d6..8525de23f 100644 --- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java +++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java @@ -10,6 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; +import com.fr.plugin.injectable.SpecialLevel; import com.fr.stable.fun.Level; /** @@ -19,8 +20,8 @@ import com.fr.stable.fun.Level; * 自定义图表类型设设计界面接口 */ public interface IndependentChartUIProvider extends Level { - - String XML_TAG = "IndependentChartUIProvider"; + + String XML_TAG = SpecialLevel.IndependentChartUIProvider.getTagName(); int CURRENT_API_LEVEL = 3; 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 2/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=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 Date: Fri, 23 Jun 2017 12:59:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E6=94=AF=E6=8C=81=20=E7=BB=9F=E4=B8=80=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E5=B7=A5=E5=85=B7=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/ExtraDesignClassManager.java | 2 +- designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/ExtraDesignClassManager.java b/designer_base/src/com/fr/design/ExtraDesignClassManager.java index ee86d8adf..42ef9fec7 100644 --- a/designer_base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer_base/src/com/fr/design/ExtraDesignClassManager.java @@ -16,7 +16,7 @@ import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; import com.fr.general.IOUtils; import com.fr.plugin.AbstractExtraClassManager; -import com.fr.plugin.injectable.CompatibleInjectionContainer; +import com.fr.plugin.solution.container.CompatibleInjectionContainer; import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.injectable.PluginSingleInjection; import com.fr.stable.bridge.StableFactory; diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index b23954ab4..3d46cfe99 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -32,7 +32,7 @@ import com.fr.plugin.observer.PluginEventListener; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.stable.bridge.StableFactory; -import com.fr.stable.collections.map.CloseableContainedMap; +import com.fr.plugin.solution.container.CloseableContainedMap; import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider; import javax.swing.*; From 02de99bafa20e83871f76c7de46b8aa4b9af88aa Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Fri, 23 Jun 2017 13:09:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E6=94=AF=E6=8C=81=20=E7=BB=9F=E4=B8=80=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E5=B7=A5=E5=85=B7=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/ExtraDesignClassManager.java | 2 +- designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/ExtraDesignClassManager.java b/designer_base/src/com/fr/design/ExtraDesignClassManager.java index 42ef9fec7..54fbcf2f1 100644 --- a/designer_base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer_base/src/com/fr/design/ExtraDesignClassManager.java @@ -16,7 +16,7 @@ import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; import com.fr.general.IOUtils; import com.fr.plugin.AbstractExtraClassManager; -import com.fr.plugin.solution.container.CompatibleInjectionContainer; +import com.fr.plugin.solution.closeable.CompatibleInjectionContainer; import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.injectable.PluginSingleInjection; import com.fr.stable.bridge.StableFactory; diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 3d46cfe99..ad5466ef6 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -32,7 +32,7 @@ import com.fr.plugin.observer.PluginEventListener; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.stable.bridge.StableFactory; -import com.fr.plugin.solution.container.CloseableContainedMap; +import com.fr.plugin.solution.closeable.CloseableContainedMap; import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider; import javax.swing.*;