From d6a35a2b782870d03e881b059146073911fdb371 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Wed, 8 Aug 2018 22:12:50 +0800 Subject: [PATCH 1/3] modify on 0808 --- .../design/chart/series/PlotSeries/MapGroupExtensionPane.java | 2 +- .../fr/design/chart/series/PlotSeries/MapImageEditPane.java | 4 ++-- .../chart/series/SeriesCondition/LineMarkerTypePane.java | 4 ++-- .../chart/gui/other/ChartDesignerInteractivePane.java | 2 +- .../design/mainframe/chart/gui/style/ChartAxisLabelPane.java | 2 +- .../mainframe/chart/gui/style/series/MeterSeriesPane.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java index 4cbdcc3ea..8099ec052 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java @@ -211,7 +211,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createAreaItem(final String oldName) { - JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Filed"})); + JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Region")); editFileItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapCustomPane image = new MapCustomPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java index df5d60c53..c06aa1c15 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java @@ -630,13 +630,13 @@ public class MapImageEditPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image"); } } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java index 6cd23585a..53e9429b4 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java @@ -28,7 +28,7 @@ public class LineMarkerTypePane extends ConditionAttrSingleConditionPane Date: Fri, 10 Aug 2018 09:05:43 +0800 Subject: [PATCH 2/3] modify on 0809 --- .../design/chart/series/SeriesCondition/LabelBorderPane.java | 2 +- .../mainframe/chart/gui/style/series/MeterSeriesPane.java | 4 ++-- .../com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java | 2 +- .../com/fr/van/chart/bubble/component/VanChartBubblePane.java | 2 +- .../other/condition/item/VanChartBubbleSetConditionPane.java | 4 ++-- .../background/VanChartCustomIntervalBackgroundPane.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java index f7cd4a9b3..0a9179e1a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java @@ -15,7 +15,7 @@ public class LabelBorderPane extends LabelBorderAttrPane { protected AttrBorder attrBorder = new AttrBorder(); public LabelBorderPane(ConditionAttributesPane conditionAttributesPane) { - super(conditionAttributesPane, true, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Border", "Format"})); + super(conditionAttributesPane, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Format")); } public void populate(DataSeriesCondition condition) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 34c86a0dd..7d6854231 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -43,8 +43,8 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { protected JPanel getContentInPlotType() { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); - String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), - com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; + String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ge"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Hundred"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java index 01c72649d..cf0e4aeb1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java @@ -78,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createBubblePane() { bubblePane = new VanChartBubblePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"), bubblePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"), bubblePane); } protected void populateCondition(ConditionAttr defaultAttr){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java index a51f91047..c31a77d6f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java @@ -78,6 +78,6 @@ public class VanChartBubblePane extends BasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java index 9a05188d3..e53c9bf17 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java @@ -18,7 +18,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); } @Override @@ -37,7 +37,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi */ @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index 9f27487dd..4e1464063 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -61,7 +61,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane Date: Fri, 10 Aug 2018 09:21:20 +0800 Subject: [PATCH 3/3] modify on 0809 --- .../com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java | 2 +- .../com/fr/van/chart/bubble/component/VanChartBubblePane.java | 2 +- .../other/condition/item/VanChartBubbleSetConditionPane.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java index cf0e4aeb1..01c72649d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java @@ -78,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createBubblePane() { bubblePane = new VanChartBubblePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"), bubblePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"), bubblePane); } protected void populateCondition(ConditionAttr defaultAttr){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java index c31a77d6f..a51f91047 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java @@ -78,6 +78,6 @@ public class VanChartBubblePane extends BasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java index e53c9bf17..9a05188d3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java @@ -18,7 +18,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } @Override @@ -37,7 +37,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi */ @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } @Override