From 653f4a42760fb2ee8b5bc49ba6f502249e67f399 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 24 Aug 2018 17:48:35 +0800 Subject: [PATCH 01/11] =?UTF-8?q?REPORT-10821=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7=E6=9C=892=E4=B8=AA?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/write/submit/DBManipulationPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 057e875a9..2e36ea5d8 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -108,7 +108,7 @@ public class DBManipulationPane extends BasicBeanPane { private static final String[] DML_CONFIG_TYPES = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Delete_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Insert_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Update_Submit")}; /** From 03aefbf682563382b0a3a68047de4ff526904a23 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 27 Aug 2018 14:16:32 +0800 Subject: [PATCH 02/11] REPORT-10881 --- .../actions/community/TechSolutionAction.java | 2 +- .../images/bbs/{solotion.png => solution.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename designer-base/src/main/resources/com/fr/design/images/bbs/{solotion.png => solution.png} (100%) diff --git a/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java index fce0dbda8..a09921609 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java @@ -21,7 +21,7 @@ public class TechSolutionAction extends UpdateAction{ this.setMenuKeySet(TSO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images//bbs/solotion.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/solution.png")); } diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/solotion.png b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/bbs/solotion.png rename to designer-base/src/main/resources/com/fr/design/images/bbs/solution.png From 76c2166ef58c5d6deff8d192feccaab47fc25dbb Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 27 Aug 2018 17:15:41 +0800 Subject: [PATCH 03/11] =?UTF-8?q?CHART-2802=20=E5=A4=A7=E5=B1=8F=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=20=E6=8E=A5=E5=8F=A3=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/ChartTypeInterfaceManager.java | 8 ++++ .../chart/gui/data/TableDataPane.java | 14 +++--- .../AbstractExtendedChartReportDataPane.java | 19 ++++---- .../AbstractExtendedChartTableDataPane.java | 28 +++++++----- .../chart/AbstractExtendedStylePane.java | 28 ++++++++++-- .../fr/extended/chart/ExtendedOtherPane.java | 44 ++++++++++++------- .../data/link/GanttLinkTableDataPane.java | 4 +- 7 files changed, 97 insertions(+), 48 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index 06e74b39c..5d54adff7 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -278,6 +278,14 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr } return name; } + + public String getTitle4PopupWindow(String plotID) { + IndependentChartUIProvider provider = getChartTypeInterface(plotID); + if (provider != null) { + return provider.getPlotTypeTitle4PopupWindow(); + } + return StringUtils.EMPTY; + } /** * 获取指定图表的标题 diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java index da79f2691..5248fb08b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java @@ -1,8 +1,8 @@ package com.fr.design.mainframe.chart.gui.data; import com.fr.base.TableData; +import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; -import com.fr.chart.chartattr.Plot; import com.fr.chart.chartdata.TableDataDefinition; import com.fr.chart.chartdata.TopDefinition; import com.fr.data.impl.NameTableData; @@ -14,9 +14,9 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; - -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import java.awt.BorderLayout; +import java.awt.Dimension; public class TableDataPane extends FurtherBasicBeanPane{ private static final long serialVersionUID = 4740461028440155147L; @@ -72,8 +72,8 @@ public class TableDataPane extends FurtherBasicBeanPane{ } } - protected AbstractTableDataContentPane getContentPane(Plot plot) { - return ChartTypeInterfaceManager.getInstance().getTableDataSourcePane(plot, parent); + protected AbstractTableDataContentPane getContentPane(Chart chart) { + return ChartTypeInterfaceManager.getInstance().getTableDataSourcePane(chart.getPlot(), parent); } /** @@ -106,7 +106,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ * @param collection 图表属性的集合 */ public void refreshContentPane(ChartCollection collection) { - refreshContentPane(getContentPane(collection.getSelectedChart().getPlot())); + refreshContentPane(getContentPane(collection.getSelectedChart())); } protected void refreshContentPane(AbstractTableDataContentPane contentPane) { diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java index c633fa755..9e4a84f03 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java @@ -58,17 +58,20 @@ public abstract class AbstractExtendedChartReportDataPane extends this.listener = listener; } + protected void setChart(Chart chart) { + if (chart instanceof AbstractChart) { + this.chart = (T) chart; + } + } + + protected T getChart() { + return this.chart; + } + + protected AttributeChangeListener getListener() { + return this.listener; + } + @Override protected JPanel createContentPane() { @@ -95,8 +109,11 @@ public abstract class AbstractExtendedStylePane extends if (collection != null) { Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart){ - this.chart = (T)chart; + if (chart != null) { + setChart(chart); + } + + if (this.chart != null) { paneList.get(tabPane.getSelectedIndex()).populateBean(this.chart); } @@ -109,8 +126,11 @@ public abstract class AbstractExtendedStylePane extends if (collection != null) { Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart){ - this.chart = (T)chart; + if (chart != null) { + setChart(chart); + } + + if (this.chart != null) { paneList.get(tabPane.getSelectedIndex()).updateBean(this.chart); } diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java index e2e3e67c4..a92e100e5 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java @@ -9,7 +9,6 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.PaneTitleConstants; - import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -28,29 +27,42 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private UISpinner autoRefreshTime; private JPanel contentPane; + protected AbstractChart getAbstractChart(Chart chart) { + if (chart != null && chart instanceof AbstractChart) { + return (AbstractChart) chart; + } + return null; + } + @Override public void populate(ChartCollection collection) { - if (collection != null) { - Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart) { - hyperLinkPane.populateBean((AbstractChart) chart); - autoRefreshTime.setValue(((AbstractChart) chart).getAutoRefreshTime()); - refreshEnabled.setSelectedIndex(((AbstractChart) chart).isRefreshEnabled() ? 0 : 1); - checkRefreshEnable(); - } + if (collection == null || collection.getSelectedChart() == null) { + return; + } + + AbstractChart chart = getAbstractChart(collection.getSelectedChart()); + + if (chart != null) { + hyperLinkPane.populateBean(chart); + autoRefreshTime.setValue(chart.getAutoRefreshTime()); + refreshEnabled.setSelectedIndex(chart.isRefreshEnabled() ? 0 : 1); + checkRefreshEnable(); } } @Override public void update(ChartCollection collection) { - if (collection != null) { - Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart) { - hyperLinkPane.updateBean((AbstractChart) chart); - ((AbstractChart) chart).setAutoRefreshTime(autoRefreshTime.getValue()); - ((AbstractChart) chart).setRefreshEnabled(refreshEnabled.getSelectedIndex() == 0); - } + if (collection == null || collection.getSelectedChart() == null) { + return; + } + + AbstractChart chart = getAbstractChart(collection.getSelectedChart()); + + if (chart != null) { + hyperLinkPane.updateBean(chart); + chart.setAutoRefreshTime(autoRefreshTime.getValue()); + chart.setRefreshEnabled(refreshEnabled.getSelectedIndex() == 0); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java index 992d13d54..56e238131 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.gantt.designer.data.link; -import com.fr.chart.chartattr.Plot; +import com.fr.chart.chartattr.Chart; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.TableDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; @@ -14,7 +14,7 @@ public class GanttLinkTableDataPane extends TableDataPane { } @Override - protected AbstractTableDataContentPane getContentPane(Plot plot) { + protected AbstractTableDataContentPane getContentPane(Chart chart) { return new GanttLinkTableDataContentPane(); } } From 197d80ac34c2358220635570595634a13b1b8b68 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 28 Aug 2018 00:34:19 +0800 Subject: [PATCH 04/11] right or wrong? --- .../fr/design/extra/exe/callback/InstallFromDiskCallback.java | 2 +- .../fr/design/extra/exe/callback/UninstallPluginCallback.java | 2 +- .../fr/design/extra/exe/callback/UpdateFromDiskCallback.java | 2 +- .../design/extra/tradition/callback/UpdateOnlineCallback.java | 2 +- .../com/fr/design/mainframe/cell/settingpane/CellStylePane.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 27873385a..1e170c844 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 @@ -42,7 +42,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, 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 f50377699..a6f781b94 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 @@ -30,7 +30,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, 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 de753f9ce..cd0ccab84 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 @@ -42,7 +42,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, 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 193ad0c00..468e92316 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 @@ -36,7 +36,7 @@ public class UpdateOnlineCallback implements ProgressCallback { } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) { int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java index db369c1ef..1487908e7 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java @@ -121,7 +121,7 @@ public class CellStylePane extends AbstractCellAttrPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style"); } public void setSelectedByIds(int level, String... id) { From 6c002a62f6afbb1343cd1a5b1809d1b66ec72df4 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Tue, 28 Aug 2018 09:57:35 +0800 Subject: [PATCH 05/11] REPORT-10886 --- .../com/fr/design/data/datapane/TableDataCreatorProducer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 0107bd0b7..533139b37 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -69,7 +69,7 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createServerTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, ClassTableDataPane.class); From 63c78fb7e70b1d862fcda26da575c8654ba0fa14 Mon Sep 17 00:00:00 2001 From: zheng Date: Tue, 28 Aug 2018 14:11:57 +0800 Subject: [PATCH 06/11] =?UTF-8?q?CHART-2802=20=E5=9B=BE=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=8F=AF=E4=BB=A5=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF&&=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=9D=A2=E6=9D=BF=E5=8F=AF=E4=BB=A5=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/chart/ChartEditPane.java | 9 ++++++--- .../fr/design/mainframe/chart/ChartHyperEditPane.java | 4 +++- .../com/fr/design/mainframe/chart/ChartsEditPane.java | 6 ++++-- .../java/com/fr/extended/chart/ExtendedTypePane.java | 9 +++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java index a301af697..5fce5c366 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java @@ -21,7 +21,6 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; - import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -154,7 +153,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 this.isDefaultPane = true; }else{ ChartDataPane chartDataPane = createChartDataPane(plotID); - paneList.add(chartDataPane); + if (chartDataPane != null) { + paneList.add(chartDataPane); + } AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener); for(int i = 0; i < otherPaneList.length; i++){ otherPaneList[i].addAttributeChangeListener(listener); @@ -169,7 +170,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 protected ChartDataPane createChartDataPane(String plotID) { ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); - chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData()); + if (chartDataPane != null) { + chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData()); + } return chartDataPane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java index 936304b4e..bae6e20bc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java @@ -42,7 +42,9 @@ public class ChartHyperEditPane extends ChartEditPane { @Override protected ChartDataPane createChartDataPane(String plotID) { ChartDataPane dataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); - dataPane.setSupportCellData(false); + if (dataPane != null) { + dataPane.setSupportCellData(false); + } return dataPane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java index 3f35c585d..b9f5a2fbd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import java.awt.*; +import java.awt.BorderLayout; import java.util.ArrayList; /** @@ -43,7 +43,9 @@ public class ChartsEditPane extends ChartEditPane { dataPane4SupportCell = createChartDataPane(plotID); chartsConfigPane = ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID); - paneList.add(dataPane4SupportCell); + if (dataPane4SupportCell != null) { + paneList.add(dataPane4SupportCell); + } paneList.add(chartsConfigPane); createTabsPane(); diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java index a1375938d..9e5ddd7b4 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java @@ -27,6 +27,12 @@ public class ExtendedTypePane extends AbstractChartType protected void setType(T chart, int index) { } + protected void populate(T chart) { + } + + protected void update(T chart) { + } + @Override public void populateBean(Chart chart) { if (getTypeIconPath().length > 0) { @@ -36,10 +42,13 @@ public class ExtendedTypePane extends AbstractChartType typeDemo.get(getTypeIndex((T) chart)).isPressing = true; checkDemosBackground(); } + populate((T) chart); } @Override public void updateBean(Chart chart) { + update((T) chart); + if (getTypeIconPath().length > 0) { for (int index = 0, len = typeDemo.size(); index < len; index++) { if (typeDemo.get(index).isPressing) { From edbc6fb09f7427652de31d7232b4f0dba6e9ce1f Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 28 Aug 2018 17:06:03 +0800 Subject: [PATCH 07/11] CHART-2876 Debug on i18n --- .../chart/gui/other/ChartInteractivePane.java | 14 +++++++------- .../chart/gui/style/ChartAxisLineStylePane.java | 2 +- .../chart/gui/style/ChartBackgroundPane.java | 2 +- .../chart/gui/style/ChartBeautyPane.java | 2 +- .../chart/gui/style/ChartBorderPane.java | 2 +- .../chart/gui/style/ChartFillStylePane.java | 2 +- .../analysisline/ChartAnalysisLinePane.java | 8 ++++---- .../gui/style/area/DefaultAxisAreaPane.java | 4 ++-- .../chart/gui/style/axis/ChartCategoryPane.java | 16 ++++++++-------- .../chart/gui/style/axis/ChartValuePane.java | 16 ++++++++-------- .../gui/style/series/Donut2DSeriesPane.java | 6 +++--- .../designer/style/VanChartPlotLegendPane.java | 2 +- .../java/com/fr/design/expand/ParentPane.java | 2 +- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java index 24128ec28..8af8ad92d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java @@ -316,7 +316,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{tooltipShowTypeLabel, tooltipShowType}, new Component[]{tooltipStyleLabel, tooltipStyle} }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } private void relayoutDataPointToolTipPane(Plot plot) { @@ -338,7 +338,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{isAddressTittle, tmpButton}, new Component[]{isDatapointValue, dataPointValueFormat}, }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } else if (plot.isSupportValuePercent()) { Component[][] components; if (plot.isSupportTooltipSeriesType()) { @@ -357,13 +357,13 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb getTooltipStyleComponent() }; } - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } else { Component[][] components = new Component[][]{ new Component[]{isDatapointValue, dataPointValueFormat}, getTooltipStyleComponent() }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } } @@ -396,7 +396,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAxisShowToolTip}, }; - axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Axis", "Chart-Interactive"}, components, rowSize, columnSize); + axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Interactive"}, components, rowSize, columnSize); } private void initAutoRefreshPane() { @@ -414,7 +414,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb }, 1)}, new Component[]{new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Support_Img_And_Cell") + ""), null}, }; - autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize); + autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Check"}, components, rowSize, columnSize); } private void initSuperlinkPane() { @@ -426,7 +426,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{superLink, null}, }; - superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Hyperlink"}, components, rowSize, columnSize); + superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Report_Hyperlink"}, components, rowSize, columnSize); } private void relayoutWithPlot(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index eaffb9498..76f45c26d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -61,7 +61,7 @@ public class ChartAxisLineStylePane extends BasicPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),null}, new Component[]{null,secondTickPosition} } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Style"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Style"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java index ccd7f0898..a2c8f6d4d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java @@ -78,7 +78,7 @@ public class ChartBackgroundPane extends BasicPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha_Degree")), null}, new Component[]{null, transparent} }; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Background"}, components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Background"}, components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); this.add(new JSeparator(), BorderLayout.SOUTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java index ed7666cf8..8a8c479d0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java @@ -30,7 +30,7 @@ public class ChartBeautyPane extends BasicBeanPane{ Component[][] components = new Component[][]{ new Component[]{styleBox}, } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InterfaceStyle"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Style"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java index 8c9cbb0b9..6de66828b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java @@ -38,7 +38,7 @@ public class ChartBorderPane extends BasicPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Border"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER) ; this.add(new JSeparator(), BorderLayout.SOUTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java index 5b1dca34c..39bc49a90 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java @@ -116,7 +116,7 @@ public class ChartFillStylePane extends BasicBeanPane{ new Component[]{styleSelectBox}, new Component[]{customPane} } ; - return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ColorMatch"},components,rowSize,columnSize); + return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Color_Match"},components,rowSize,columnSize); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java index 64987d571..e9eafa4de 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java @@ -68,15 +68,15 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ double f = TableLayout.FILL; double[] row = {p}; double[] col = {f}; - trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col); + trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col); } //最多有两条坐标轴是值类型的 if(plot.getAlertLinePaneTitle().length == 2){ String[] title = plot.getAlertLinePaneTitle(); - firstAlertPane = this.createAlertLinePane(new String[]{title[0], "ChartF-Alert-Line"}, true); - secondAlertPane = this.createAlertLinePane(new String[]{title[1], "ChartF-Alert-Line"}, false); + firstAlertPane = this.createAlertLinePane(new String[]{title[0], "Fine-Design_Chart_Alert_Line"}, true); + secondAlertPane = this.createAlertLinePane(new String[]{title[1], "Fine-Design_Chart_Alert_Line"}, false); }else if(plot.getyAxis() instanceof ValueAxis){ - firstAlertPane = this.createAlertLinePane(new String[]{"ChartF-Alert-Line"}, true); + firstAlertPane = this.createAlertLinePane(new String[]{"Fine-Design_Chart_Alert_Line"}, true); } Component[][] component = null;; if(trendLine != null){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java index 00471c19f..f84686626 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java @@ -59,7 +59,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom") + ":"),verticalColorPane}, }; - backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_Interval_Back"}, components, rowSize, columnSize); + backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Interval_Background"}, components, rowSize, columnSize); } //初始化网格线 @@ -82,7 +82,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { new Component[]{container,null} }; - gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Grid_Line"}, components, rowSize, columnSize); + gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Grid_Line"}, components, rowSize, columnSize); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java index 289bef4eb..c0842ab15 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java @@ -61,7 +61,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutLineStyle(){ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p}; @@ -73,7 +73,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -84,7 +84,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithLineStyle(){ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p, p, p}; @@ -98,7 +98,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -217,7 +217,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutAxisRevertAndLineStyle(){ double f = TableLayout.FILL; double p = TableLayout.PREFERRED; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p}; @@ -227,7 +227,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{getAxisTitlePane()}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -239,7 +239,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutAxisRevert(){ double f = TableLayout.FILL; double p = TableLayout.PREFERRED; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p}; @@ -251,7 +251,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLineStylePane}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java index 844f3f81f..32e656479 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java @@ -109,10 +109,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -135,10 +135,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -327,10 +327,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{axisLineStylePane}, new Component[]{zeroPane}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -352,10 +352,10 @@ public class ChartValuePane extends ChartAxisUsePane{ Component[][] components = new Component[][]{ new Component[]{getAxisTitlePane()}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java index 514c5398b..001829b4a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java @@ -54,11 +54,11 @@ public class Donut2DSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InnerRadis"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Inner_Radius"}, new Component[][]{new Component[]{innerRadiusPercent}}, singleRow, singleCol)}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Series"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Series"}, new Component[][]{new Component[]{seriesGap}}, singleRow, singleCol)}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Category"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Category"}, new Component[][]{new Component[]{categoryGap}}, singleRow, singleCol)}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java index c1b43e946..fbe2d903e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java @@ -178,7 +178,7 @@ public class VanChartPlotLegendPane extends BasicPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); } private void initPositionListener(){ diff --git a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java index e37690218..a1010f44b 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java @@ -122,7 +122,7 @@ public class ParentPane extends BasicPane { parentCardPane.add("Fine-Design_Report_None", noneParentText); defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); defaultParentText.setRectDirection(Constants.RIGHT); - parentCardPane.add("Default", defaultParentText); + parentCardPane.add("1Default", defaultParentText); parentCardPane.add("Custom", GUICoreUtils.createFlowPane(new JComponent[] { customParentColumnRowPane, imageButton4ColumnRowPane }, FlowLayout.CENTER)); From 7afb74076d4c927875e2c7e4eed9593721a8a823 Mon Sep 17 00:00:00 2001 From: Harrison Date: Tue, 28 Aug 2018 17:36:53 +0800 Subject: [PATCH 08/11] =?UTF-8?q?REPORT-10923=E3=80=9010.0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E5=8D=95=E5=85=83=E6=A0=BC=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E4=B8=8B=E5=90=84=E9=80=89=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98=20REPORT-10924?= =?UTF-8?q?=E3=80=9010.0=E5=86=92=E7=83=9F=E3=80=91=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E5=85=83=E7=B4=A0=E3=80=8B=E9=AB=98=E7=BA=A7=E3=80=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86=E7=AD=9B=E9=80=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20REPORT-10920=E3=80=9010.0=E5=86=92=E7=83=9F=E3=80=91?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E6=B7=BB=E5=8A=A0Tab=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E4=BE=A7=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/icombobox/FunctionComboBox.java | 11 ++--- .../utils/gui/FunctionClassMappingUtils.java | 43 +++++++++++++++++++ .../cellquick/CellDSColumnEditor.java | 2 +- 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java index a5da615b0..74db09f92 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java @@ -3,13 +3,13 @@ */ package com.fr.design.gui.icombobox; -import java.awt.Component; +import com.fr.data.core.DataCoreUtils; +import com.fr.data.util.function.DataFunction; +import com.fr.design.utils.gui.FunctionClassMappingUtils; import javax.swing.DefaultComboBoxModel; import javax.swing.JList; - -import com.fr.data.core.DataCoreUtils; -import com.fr.data.util.function.DataFunction; +import java.awt.Component; /** * DataFunction combobox. @@ -60,7 +60,8 @@ public class FunctionComboBox extends UIComboBox { if (value instanceof DataFunction) { DataFunction function = (DataFunction) value; - this.setText(" " + DataCoreUtils.getFunctionDisplayName(function)); + String functionBriefName = DataCoreUtils.getFunctionBriefName(function); + this.setText(com.fr.design.i18n.Toolkit.i18nText(FunctionClassMappingUtils.getLocaleKey(functionBriefName))); } return this; diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java new file mode 100644 index 000000000..374f953b9 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java @@ -0,0 +1,43 @@ +package com.fr.design.utils.gui; + +import com.fr.stable.StringUtils; + +/** + * @author： Harrison + * @date： 2018/08/28 + * @description: 为 Function 类的名字做匹配, 从而方便国际化的类 + **/ +public enum FunctionClassMappingUtils { + DataFunction_Sum("Sum", "Fine-Design_DataFunction_Sum"), + DataFunction_Average("Average","Fine-Design_DataFunction_Average"), + DataFunction_Max("Max","Fine-Design_DataFunction_Max"), + DataFunction_Min("Min","Fine-Design_DataFunction_Min"), + DataFunction_Count("Count","Fine-Design_DataFunction_Count"), + DataFunction_None("None","Fine-Design_DataFunction_None"); + + private final String functionClassName; + private final String localeKey; + + FunctionClassMappingUtils(String functionClassName, String localeKey) { + this.functionClassName = functionClassName; + this.localeKey = localeKey; + } + + public String getFunctionClassName() { + return functionClassName; + } + + public String getLocaleKey() { + return localeKey; + } + + public static String getLocaleKey(String functionClassName) { + for (FunctionClassMappingUtils value : FunctionClassMappingUtils.values()) { + if (StringUtils.equals(value.getFunctionClassName(), functionClassName)) { + return value.getLocaleKey(); + } + } + return functionClassName; + } + +} diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 8825f517a..98e89738e 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -856,7 +856,7 @@ public class CellDSColumnEditor extends CellQuickEditor { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Top_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Bottom_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Odd"), - com.fr.design.i18n.Toolkit.i18nText("Even"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Even"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify") }); rsComboBox.addActionListener(actionListener); From 047acda40768dd72215b74573f469d09203e5e61 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 28 Aug 2018 19:08:08 +0800 Subject: [PATCH 09/11] change unused modify --- .../src/main/java/com/fr/design/expand/ParentPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java index a1010f44b..e37690218 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java @@ -122,7 +122,7 @@ public class ParentPane extends BasicPane { parentCardPane.add("Fine-Design_Report_None", noneParentText); defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); defaultParentText.setRectDirection(Constants.RIGHT); - parentCardPane.add("1Default", defaultParentText); + parentCardPane.add("Default", defaultParentText); parentCardPane.add("Custom", GUICoreUtils.createFlowPane(new JComponent[] { customParentColumnRowPane, imageButton4ColumnRowPane }, FlowLayout.CENTER)); From 4e6d4a2855ea9d4d6d036289998944e211f7a3a1 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Wed, 29 Aug 2018 16:03:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?REPORT-10833=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=AE=BE=E8=AE=A1=E7=95=8C=E9=9D=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/poly/PolyComponentsBar.java | 170 ++++++++++++++++++ .../java/com/fr/poly/PolyComponetsBar.java | 142 --------------- .../main/java/com/fr/poly/PolyDesigner.java | 50 ++++-- 3 files changed, 209 insertions(+), 153 deletions(-) create mode 100644 designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java delete mode 100644 designer-realize/src/main/java/com/fr/poly/PolyComponetsBar.java diff --git a/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java new file mode 100644 index 000000000..3130a4b86 --- /dev/null +++ b/designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java @@ -0,0 +1,170 @@ +package com.fr.poly; + +import com.fr.base.BaseUtils; +import com.fr.base.chart.BaseChart; +import com.fr.base.chart.BaseChartGetter; +import com.fr.base.chart.BaseChartNameID; +import com.fr.base.vcs.DesignerMode; +import com.fr.design.ChartTypeInterfaceManager; +import com.fr.design.constants.UIConstants; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.itooltip.MultiLineToolTip; +import com.fr.design.i18n.Toolkit; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.dnd.SerializableTransferable; +import com.fr.log.FineLoggerFactory; +import com.fr.report.poly.PolyECBlock; +import com.sun.java.swing.plaf.windows.WindowsLookAndFeel; + +import javax.swing.BorderFactory; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JToolBar; +import javax.swing.JToolTip; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DragGestureEvent; +import java.awt.dnd.DragGestureListener; +import java.awt.dnd.DragSource; +import java.awt.dnd.DragSourceDragEvent; +import java.awt.dnd.DragSourceDropEvent; +import java.awt.dnd.DragSourceEvent; +import java.awt.dnd.DragSourceListener; +import java.io.Serializable; + +/** + * 拖动聚合块的那个竖的动作条 + * + * @editor zhou + * @since 2012-3-23下午3:42:10 + */ +public class PolyComponentsBar extends JToolBar { + private SerIcon[] serIcons; + private static final int MAX_BAR_NUM = 15; + + public PolyComponentsBar() { + setOrientation(SwingConstants.VERTICAL); + setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); + setFloatable(false); + setBackground(UIConstants.TOOLBARUI_BACKGROUND); + setLayout(FRGUIPaneFactory.create1ColumnGridLayout()); + BaseChartNameID[] typeName = BaseChartGetter.getStaticAllChartBaseNames(); + int typeLen = typeName.length < MAX_BAR_NUM ? typeName.length : MAX_BAR_NUM; + serIcons = new SerIcon[typeLen + 1]; + serIcons[0] = new SerIcon( + PolyECBlock.class, + Toolkit.i18nText("Fine-Design_Report_Poly_Report_Block"), + "com/fr/design/images/poly/toolbar/Poly-Report_Block.png" + ); + this.add(serIcons[0]); + for (int i = 0; i < typeLen; i++) { + BaseChart[] rowChart = BaseChartGetter.getStaticChartTypes(typeName[i].getPlotID()); + String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(typeName[i].getPlotID()); + serIcons[i + 1] = new SerIcon(rowChart[0], Toolkit.i18nText(typeName[i].getName()), iconPath); + this.add(serIcons[i + 1]); + } + + } + + /** + * 设置是否可用状态 + */ + public void checkEnable() { + for (SerIcon serIcon : serIcons) { + serIcon.setEnabled(!DesignerMode.isAuthorityEditing()); + } + } + + private class SerIcon extends UIButton implements DragGestureListener, DragSourceListener { + private DragSource dragSource; + private Serializable serializable; + + /** + * @param serializable s + * @param text 按钮名 + * @param iconPath 图标路径 + */ + public SerIcon(Serializable serializable, String text, String iconPath) { + super(BaseUtils.readIcon(iconPath)); + this.serializable = serializable; + this.setToolTipText(text); + this.set4ToolbarButton(); + dragSource = new DragSource(); + dragSource.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, this); + } + + @Override + public Dimension getPreferredSize() { + return new Dimension(getIcon().getIconWidth(), getIcon().getIconHeight()); + } + + @Override + public JToolTip createToolTip() { + MultiLineToolTip tip = new MultiLineToolTip(); + tip.setComponent(this); + tip.setOpaque(false); + return tip; + } + + @Override + public void dragGestureRecognized(DragGestureEvent dge) { + Transferable t = new SerializableTransferable(serializable); + dragSource.startDrag(dge, DragSource.DefaultCopyDrop, t, this); + getModel().setArmed(false); + getModel().setRollover(false); + repaint(); + } + + @Override + public void dragEnter(DragSourceDragEvent dsde) { + + } + + @Override + public void dragOver(DragSourceDragEvent dsde) { + + } + + @Override + public void dropActionChanged(DragSourceDragEvent dsde) { + + } + + @Override + public void dragExit(DragSourceEvent dse) { + + } + + @Override + public void dragDropEnd(DragSourceDropEvent dsde) { + + } + } + + /** + * 测试下 + * + * @param args 参数 + */ + public static void main(String... args) { + try { + UIManager.setLookAndFeel(new WindowsLookAndFeel()); + } catch (UnsupportedLookAndFeelException e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + JFrame f = new JFrame(); + JPanel p = (JPanel) f.getContentPane(); + p.setLayout(FRGUIPaneFactory.createBorderLayout()); + PolyComponentsBar pbp = new PolyComponentsBar(); + p.add(pbp, BorderLayout.CENTER); + + f.setSize(400, 300); + f.setVisible(true); + + } +} diff --git a/designer-realize/src/main/java/com/fr/poly/PolyComponetsBar.java b/designer-realize/src/main/java/com/fr/poly/PolyComponetsBar.java deleted file mode 100644 index d6e3b5999..000000000 --- a/designer-realize/src/main/java/com/fr/poly/PolyComponetsBar.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.fr.poly; - -import com.fr.base.BaseUtils; -import com.fr.base.FRContext; -import com.fr.base.chart.BaseChart; -import com.fr.base.chart.BaseChartGetter; -import com.fr.base.chart.BaseChartNameID; -import com.fr.base.vcs.DesignerMode; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.itooltip.MultiLineToolTip; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.mainframe.dnd.SerializableTransferable; - -import com.fr.report.poly.PolyECBlock; -import com.sun.java.swing.plaf.windows.WindowsLookAndFeel; - -import javax.swing.*; -import java.awt.*; -import java.awt.datatransfer.Transferable; -import java.awt.dnd.*; -import java.io.Serializable; -/** - * 拖动聚合块的那个竖的动作条 - * @editor zhou - * @since 2012-3-23下午3:42:10 - */ -public class PolyComponetsBar extends JToolBar { - private static Color FOLDER_PANE_BACKGROUND = new Color(214, 223, 247); - private BaseChartNameID[] typeName = BaseChartGetter.getStaticAllChartBaseNames(); - private SerIcon[] serIcons; - private static final int MAX_BAR_NUM = 15; - - public PolyComponetsBar() { - setOrientation(SwingConstants.VERTICAL); - setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); - setFloatable(false); - setBackground(UIConstants.TOOLBARUI_BACKGROUND); - setLayout(FRGUIPaneFactory.create1ColumnGridLayout()); - int typeLen = typeName.length < MAX_BAR_NUM ? typeName.length : MAX_BAR_NUM; - serIcons = new SerIcon[typeLen + 1]; - serIcons[0] = new SerIcon(PolyECBlock.class, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Poly_Report_Block"), "Fine-Design_Report_Poly_Report_Block"); - this.add(serIcons[0]); - for (int i = 0; i < typeLen; i++) { - BaseChart[] rowChart = BaseChartGetter.getStaticChartTypes(typeName[i].getPlotID()); - serIcons[i + 1] = new SerIcon(rowChart[0], com.fr.design.i18n.Toolkit.i18nText(typeName[i].getName()), typeName[i].getName()); - this.add(serIcons[i + 1]); - } - - } - - /** - * 设置是否可用状态 - */ - public void checkEnable() { - for (SerIcon serIcon : serIcons) { - serIcon.setEnabled(!DesignerMode.isAuthorityEditing()); - } - } - - private class SerIcon extends UIButton implements DragGestureListener, DragSourceListener { - private DragSource dragSource; - private Serializable serializable; - - public SerIcon(Serializable serializable, String text, String iconName) { - super(BaseUtils.readIcon("com/fr/design/images/poly/toolbar/" + iconName + ".png")); - this.serializable = serializable; - this.setToolTipText(text); - this.set4ToolbarButton(); - dragSource = new DragSource(); - dragSource.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, this); - } - - @Override - public Dimension getPreferredSize() { - return new Dimension(getIcon().getIconWidth(), getIcon().getIconHeight()); - } - - @Override - public JToolTip createToolTip() { - MultiLineToolTip tip = new MultiLineToolTip(); - tip.setComponent(this); - tip.setOpaque(false); - return tip; - } - - @Override - public void dragGestureRecognized(DragGestureEvent dge) { - Transferable t = new SerializableTransferable(serializable); - dragSource.startDrag(dge, DragSource.DefaultCopyDrop, t, this); - getModel().setArmed(false); - getModel().setRollover(false); - repaint(); - } - - @Override - public void dragEnter(DragSourceDragEvent dsde) { - - } - - @Override - public void dragOver(DragSourceDragEvent dsde) { - - } - - @Override - public void dropActionChanged(DragSourceDragEvent dsde) { - - } - - @Override - public void dragExit(DragSourceEvent dse) { - - } - - @Override - public void dragDropEnd(DragSourceDropEvent dsde) { - - } - } - - /** - * 测试下 - * @param args 参数 - */ - public static void main(String... args) { - try { - UIManager.setLookAndFeel(new WindowsLookAndFeel()); - } catch (UnsupportedLookAndFeelException e) { - FRContext.getLogger().error(e.getMessage(), e); - } - JFrame f = new JFrame(); - JPanel p = (JPanel) f.getContentPane(); - p.setLayout(FRGUIPaneFactory.createBorderLayout()); - PolyComponetsBar pbp = new PolyComponetsBar(); - p.add(pbp, BorderLayout.CENTER); - - f.setSize(400, 300); - f.setVisible(true); - - } -} diff --git a/designer-realize/src/main/java/com/fr/poly/PolyDesigner.java b/designer-realize/src/main/java/com/fr/poly/PolyDesigner.java index 2307765e3..a0d2db47e 100644 --- a/designer-realize/src/main/java/com/fr/poly/PolyDesigner.java +++ b/designer-realize/src/main/java/com/fr/poly/PolyDesigner.java @@ -3,7 +3,6 @@ */ package com.fr.poly; -import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; @@ -19,7 +18,18 @@ import com.fr.design.designer.EditingState; import com.fr.design.designer.TargetComponent; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.mainframe.*; +import com.fr.design.mainframe.AuthorityEditPane; +import com.fr.design.mainframe.CellElementPropertyPane; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.mainframe.EastRegionContainerPane; +import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.mainframe.ElementCasePaneAuthorityEditPane; +import com.fr.design.mainframe.FormScrollBar; +import com.fr.design.mainframe.JSliderPane; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.mainframe.NoSupportAuthorityEdit; +import com.fr.design.mainframe.ReportComponent; +import com.fr.design.mainframe.ReportComponentComposite; import com.fr.design.mainframe.cell.QuickEditorRegion; import com.fr.design.menu.MenuDef; import com.fr.design.menu.ShortCut; @@ -35,7 +45,11 @@ import com.fr.design.utils.gui.LayoutUtils; import com.fr.general.ComparatorUtils; import com.fr.grid.selection.Selection; import com.fr.poly.actions.DeleteBlockAction; -import com.fr.poly.creator.*; +import com.fr.poly.creator.BlockCreator; +import com.fr.poly.creator.BlockEditor; +import com.fr.poly.creator.ECBlockCreator; +import com.fr.poly.creator.ECBlockEditor; +import com.fr.poly.creator.PolyElementCasePane; import com.fr.poly.hanlder.DataEditingListener; import com.fr.poly.hanlder.PolyDesignerDropTarget; import com.fr.poly.model.AddedData; @@ -51,9 +65,23 @@ import com.fr.stable.unit.OLDPIX; import com.fr.stable.unit.UNIT; import com.fr.stable.unit.UnitRectangle; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JScrollBar; +import javax.swing.KeyStroke; +import java.awt.AWTEvent; +import java.awt.Adjustable; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; import java.util.ArrayList; import java.util.List; @@ -92,7 +120,7 @@ public class PolyDesigner extends ReportComponent Date: Wed, 29 Aug 2018 16:16:55 +0800 Subject: [PATCH 11/11] =?UTF-8?q?REPORT-10965=20[10.0=E5=86=92=E7=83=9F]?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6js=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/rtextarea/RecordableTextAction.java | 11 ++-- .../util/RTextAreaActionI18nMappingUtil.java | 60 +++++++++++++++++++ 2 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/gui/syntax/util/RTextAreaActionI18nMappingUtil.java diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RecordableTextAction.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RecordableTextAction.java index 7487f9fa8..9fc0bf93e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RecordableTextAction.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RecordableTextAction.java @@ -11,13 +11,14 @@ package com.fr.design.gui.syntax.ui.rtextarea; -import java.awt.event.ActionEvent; -import java.util.ResourceBundle; +import com.fr.design.gui.syntax.util.RTextAreaActionI18nMappingUtil; + import javax.swing.Icon; import javax.swing.KeyStroke; import javax.swing.text.DefaultEditorKit; import javax.swing.text.JTextComponent; import javax.swing.text.TextAction; +import java.awt.event.ActionEvent; /** @@ -258,9 +259,9 @@ public abstract class RecordableTextAction extends TextAction { * property. */ public void setProperties(String keyRoot) { - setName(com.fr.design.i18n.Toolkit.i18nText(keyRoot + ".Name")); - setMnemonic(com.fr.design.i18n.Toolkit.i18nText(keyRoot + ".Mnemonic").charAt(0)); - setShortDescription(com.fr.design.i18n.Toolkit.i18nText(keyRoot + ".Desc")); + setName(com.fr.design.i18n.Toolkit.i18nText(RTextAreaActionI18nMappingUtil.getActionName(keyRoot))); + setMnemonic(com.fr.design.i18n.Toolkit.i18nText(RTextAreaActionI18nMappingUtil.getActionMnemonic(keyRoot)).charAt(0)); + setShortDescription(com.fr.design.i18n.Toolkit.i18nText(RTextAreaActionI18nMappingUtil.getActionDesc(keyRoot))); } diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/util/RTextAreaActionI18nMappingUtil.java b/designer-base/src/main/java/com/fr/design/gui/syntax/util/RTextAreaActionI18nMappingUtil.java new file mode 100644 index 000000000..bdaa13046 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/util/RTextAreaActionI18nMappingUtil.java @@ -0,0 +1,60 @@ +package com.fr.design.gui.syntax.util; + +import com.fr.stable.StringUtils; + +/** + * @author： Harrison + * @date： 2018/08/29 + * @description: 为 RTextArea 类中的 Action.xxx 准备的国际化匹配文件 + **/ +public enum RTextAreaActionI18nMappingUtil { + + Action_CollapseAllFolds("Action.CollapseAllFolds","Fine-Design_Basic_Action_CollapseAllFolds_Name","Fine-Design_Basic_Action_CollapseAllFolds_Mnemonic","Fine-Design_Basic_Action_CollapseAllFolds_Desc"), + Action_CollapseCommentFolds("Action.CollapseCommentFolds","Fine-Design_Basic_Action_CollapseCommentFolds_Name","Fine-Design_Basic_Action_CollapseCommentFolds_Mnemonic","Fine-Design_Basic_Action_CollapseCommentFolds_Desc"), + Action_Copy("Action.Copy","Fine-Design_Basic_Action_Copy_Name","Fine-Design_Basic_Action_Copy_Mnemonic","Fine-Design_Basic_Action_Copy_Desc"), + Action_Cut("Action.Cut","Fine-Design_Basic_Action_Cut_Name","Fine-Design_Basic_Action_Cut_Mnemonic","Fine-Design_Basic_Action_Cut_Desc"), + Action_Delete("Action.Delete","Fine-Design_Basic_Action_Delete_Name","Fine-Design_Basic_Action_Delete_Mnemonic","Fine-Design_Basic_Action_Delete_Desc"), + Action_ExpandAllFolds("Action.ExpandAllFolds","Fine-Design_Basic_Action_ExpandAllFolds_Name","Fine-Design_Basic_Action_ExpandAllFolds_Mnemonic","Fine-Design_Basic_Action_ExpandAllFolds_Desc"), + Action_Paste("Action.Paste","Fine-Design_Basic_Action_Paste_Name","Fine-Design_Basic_Action_Paste_Mnemonic","Fine-Design_Basic_Action_Paste_Desc"), + Action_Redo("Action.Redo","Fine-Design_Basic_Action_Redo_Name","Fine-Design_Basic_Action_Redo_Mnemonic","Fine-Design_Basic_Action_Redo_Desc"), + Action_SelectAll("Action.SelectAll","Fine-Design_Basic_Action_SelectAll_Name","Fine-Design_Basic_Action_SelectAll_Mnemonic","Fine-Design_Basic_Action_SelectAll_Desc"), + Action_ToggleCurrentFold("Action.ToggleCurrentFold","Fine-Design_Basic_Action_ToggleCurrentFold_Name","Fine-Design_Basic_Action_ToggleCurrentFold_Mnemonic","Fine-Design_Basic_Action_ToggleCurrentFold_Desc"), + Action_Undo("Action.Undo","Fine-Design_Basic_Action_Undo_Name","Fine-Design_Basic_Action_Undo_Mnemonic","Fine-Design_Basic_Action_Undo_Desc"); + + private String actionRawKey; + private String actionName; + private String actionMnemonic; + private String actionDesc; + + RTextAreaActionI18nMappingUtil(String actionRawKey, String actionName, String actionMnemonic, String actionDesc) { + this.actionRawKey = actionRawKey; + this.actionName = actionName; + this.actionMnemonic = actionMnemonic; + this.actionDesc = actionDesc; + } + + public static String getActionName(String actionKey) { + for (RTextAreaActionI18nMappingUtil mapping: RTextAreaActionI18nMappingUtil.values()) { + if (StringUtils.equals(mapping.actionRawKey, actionKey)) { + return mapping.actionName; + } + } + return actionKey; + } + public static String getActionMnemonic(String actionKey) { + for (RTextAreaActionI18nMappingUtil mapping: RTextAreaActionI18nMappingUtil.values()) { + if (StringUtils.equals(mapping.actionRawKey, actionKey)) { + return mapping.actionMnemonic; + } + } + return actionKey; + } + public static String getActionDesc(String actionKey) { + for (RTextAreaActionI18nMappingUtil mapping: RTextAreaActionI18nMappingUtil.values()) { + if (StringUtils.equals(mapping.actionRawKey, actionKey)) { + return mapping.actionDesc; + } + } + return actionKey; + } +}