From 0fb5c5c6c1e4f9708de466a290cb5fa6ab613991 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 14 Aug 2018 22:51:15 +0800 Subject: [PATCH 1/2] fine0814 --- .../design/javascript/JavaScriptImplPane.java | 2 +- .../java/com/fr/design/menu/KeySetUtils.java | 2 +- .../design/style/color/TransparentPane.java | 2 +- .../com/fr/design/chart/ChartControlPane.java | 4 +- .../com/fr/design/chart/ChartTypePane.java | 2 +- .../axis/ChartAlertValueInTopBottomPane.java | 4 +- .../design/chart/axis/ChartStyleAxisPane.java | 4 +- .../chart/axis/GanntChartStyleAxisPane.java | 2 +- .../chart/axis/XYChartStyleAxisPane.java | 4 +- .../gui/active/action/SetDataSheetAction.java | 2 +- .../design/chart/report/GisMapDataPane.java | 4 +- .../report/GisMapReportDataContentPane.java | 10 +-- .../report/GisMapTableDataContentPane.java | 20 +++--- .../design/chart/report/MapCubeDataPane.java | 2 +- .../design/chart/report/MapCubeLayerPane.java | 2 +- .../chart/report/MapCubeSetDataPane.java | 4 +- .../fr/design/chart/report/MapDataPane.java | 2 +- .../chart/report/MapMoreCubeLayerPane.java | 2 +- .../chart/report/MapMoreReportIndexPane.java | 2 +- .../chart/report/MapMoreTableIndexPane.java | 2 +- .../chart/report/MapReportDataSinglePane.java | 2 +- .../fr/design/chart/report/MapSinglePane.java | 2 +- .../chart/report/MapTableDataSinglePane.java | 2 +- .../series/PlotSeries/MapCustomPane.java | 4 +- .../PlotSeries/MapDefiAreaNamePane.java | 6 +- .../PlotSeries/MapGroupExtensionPane.java | 16 ++--- .../series/PlotSeries/MapImageEditPane.java | 2 +- .../ConditionTrendLinePane.java | 18 +++--- .../SeriesCondition/DataSeriesAttrPane.java | 2 +- .../DataSeriesConditionPane.java | 3 +- .../SeriesCondition/LabelAlphaPane.java | 6 +- .../LabelAxisPositionPane.java | 2 +- .../SeriesCondition/LabelBackgroundPane.java | 2 +- .../SeriesCondition/LabelColorPane.java | 2 +- .../SeriesCondition/TooltipContentsPane.java | 2 +- .../SeriesCondition/TrendLineControlPane.java | 2 +- .../series/SeriesCondition/TrendLinePane.java | 4 +- .../dlp/Bar2DDataLabelPane.java | 4 +- .../dlp/BubbleDataLabelPane.java | 4 +- .../dlp/GanttDataLabelPane.java | 2 +- .../SeriesCondition/dlp/MapDataLabelPane.java | 2 +- .../SeriesCondition/dlp/PieDataLabelPane.java | 6 +- .../impl/ChartHyperPoplinkPane.java | 4 +- .../impl/FormHyperlinkNorthPane.java | 6 +- .../com/fr/design/mainframe/MapEditPane.java | 4 +- .../mainframe/MiddleChartPropertyPane.java | 4 +- .../design/mainframe/chart/ChartEditPane.java | 2 +- .../mainframe/chart/ChartsConfigPane.java | 2 +- .../mainframe/chart/PaneTitleConstants.java | 12 ++-- .../mainframe/chart/gui/ChangeConfigPane.java | 4 +- .../chart/gui/ChartTypeButtonPane.java | 6 +- .../chart/gui/data/ChartDataFilterPane.java | 18 +++--- .../chart/gui/data/NormalChartDataPane.java | 2 +- .../chart/gui/data/ReportDataPane.java | 2 +- .../chart/gui/data/TableDataPane.java | 2 +- .../BubblePlotReportDataContentPane.java | 6 +- ...goryPlotMoreCateReportDataContentPane.java | 4 +- .../CategoryPlotReportDataContentPane.java | 10 +-- .../GanttPlotReportDataContentPane.java | 12 ++-- .../MeterPlotReportDataContentPane.java | 4 +- .../report/PiePlotReportDataContentPane.java | 2 +- .../StockPlotReportDataContentPane.java | 12 ++-- .../XYScatterPlotReportDataContentPane.java | 4 +- .../table/BubblePlotTableDataContentPane.java | 12 ++-- ...egoryPlotMoreCateTableDataContentPane.java | 2 +- .../CategoryPlotTableDataContentPane.java | 10 +-- .../table/GanttPlotTableDataContentPane.java | 14 ++-- .../table/MeterPlotTableDataContentPane.java | 6 +- .../table/SeriesNameUseFieldNamePane.java | 6 +- .../table/SeriesNameUseFieldValuePane.java | 10 +-- .../data/table/SeriesTypeUseComboxPane.java | 6 +- .../table/StockPlotTableDataContentPane.java | 2 +- .../XYScatterPlotTableDataContentPane.java | 14 ++-- .../gui/other/ChartConditionAttrPane.java | 6 +- .../chart/gui/other/ChartInteractivePane.java | 64 +++++++++---------- .../chart/gui/other/ChartSwitchPane.java | 2 +- .../chart/gui/style/ChartAxisLabelPane.java | 12 ++-- .../gui/style/ChartAxisLineStylePane.java | 2 +- .../gui/style/ChartAxisValueTypePane.java | 4 +- .../chart/gui/style/ChartBackgroundPane.java | 2 +- .../chart/gui/style/ChartBeautyPane.java | 2 +- .../style/ChartDataPointLabel4GisPane.java | 12 ++-- .../style/ChartDataPointLabel4MapPane.java | 12 ++-- .../gui/style/ChartDatapointLabelPane.java | 18 +++--- .../chart/gui/style/DateAxisValuePane.java | 2 +- .../analysisline/ChartAnalysisLinePane.java | 8 +-- .../gui/style/area/Plot3DAxisAreaPane.java | 2 +- .../gui/style/area/RadarAxisAreaPane.java | 6 +- .../gui/style/axis/ChartCategoryPane.java | 4 +- .../chart/gui/style/axis/ChartRadarPane.java | 2 +- .../axis/ChartSecondValueNoFormulaPane.java | 2 +- .../gui/style/axis/ChartSecondValuePane.java | 2 +- .../chart/gui/style/axis/ChartValuePane.java | 2 +- .../style/datalabel/ChartDataLabelPane.java | 4 +- .../style/datasheet/ChartDatasheetPane.java | 4 +- .../gui/style/legend/ChartLegendPane.java | 2 +- .../style/series/AbstractPlotSeriesPane.java | 2 +- .../gui/style/series/AreaSeriesPane.java | 6 +- .../gui/style/series/Bar2DSeriesPane.java | 4 +- .../gui/style/series/Bar3DSeriesPane.java | 4 +- .../gui/style/series/BubbleSeriesPane.java | 2 +- .../style/series/CombinedBar2DSeriesPane.java | 4 +- .../series/CombinedBubbleSeriesPane.java | 4 +- .../style/series/CombinedPie2DSeriesPane.java | 4 +- .../style/series/CustomDefaultSeriesPane.java | 30 ++++----- .../gui/style/series/CustomSeriesPane.java | 4 +- .../series/CustomTypeConditionSeriesPane.java | 60 ++++++++--------- .../gui/style/series/LineSeriesPane.java | 6 +- .../chart/gui/style/series/MapSeriesPane.java | 6 +- .../gui/style/series/MeterSeriesPane.java | 2 +- .../gui/style/series/Pie2DSeriesPane.java | 2 +- .../gui/style/series/RadarSeriesPane.java | 6 +- .../gui/style/series/UIColorPickerPane.java | 12 ++-- .../chart/gui/style/title/ChartTitlePane.java | 2 +- .../style/title/ChartTitlePaneNoFormula.java | 2 +- .../chart/gui/type/AbstractChartTypePane.java | 26 ++++---- .../chart/gui/type/AreaPlotPane.java | 8 +-- .../mainframe/chart/gui/type/BarPlotPane.java | 10 +-- .../chart/gui/type/BubblePlotPane.java | 4 +- .../chart/gui/type/ColumnPlotPane.java | 10 +-- .../chart/gui/type/CustomPlotPane.java | 4 +- .../chart/gui/type/DonutPlotPane.java | 6 +- .../chart/gui/type/FunnelPlotPane.java | 4 +- .../chart/gui/type/GanttPlotPane.java | 4 +- .../chart/gui/type/GisMapPlotPane.java | 10 +-- .../chart/gui/type/LinePlotPane.java | 4 +- .../mainframe/chart/gui/type/MapPlotPane.java | 10 +-- .../chart/gui/type/MeterPlotPane.java | 6 +- .../mainframe/chart/gui/type/PiePlotPane.java | 6 +- .../chart/gui/type/RadarPlotPane.java | 4 +- .../chart/gui/type/RangePlotPane.java | 4 +- .../chart/gui/type/StockPlotPane.java | 4 +- .../fr/extended/chart/ExtendedOtherPane.java | 6 +- .../van/chart/area/VanChartAreaPlotPane.java | 10 +-- .../fr/van/chart/bar/VanChartBarPlotPane.java | 10 +-- .../bubble/VanChartBubbleInteractivePane.java | 2 +- .../chart/bubble/VanChartBubblePlotPane.java | 8 +-- ...anChartBubblePlotTableDataContentPane.java | 14 ++-- .../chart/column/VanChartColumnPlotPane.java | 10 +-- .../column/VanChartColumnSeriesPane.java | 4 +- ...nChartCustomStackAndAxisConditionPane.java | 8 +-- .../chart/custom/VanChartCustomPlotPane.java | 12 ++-- .../component/CustomPlotLocationPane.java | 2 +- .../VanChartCustomAxisConditionPane.java | 4 +- .../component/VanChartHyperLinkPane.java | 16 ++--- .../VanChartCustomConditionAttrPane.java | 2 +- .../component/VanChartBeautyPane.java | 2 +- .../component/VanChartFloatPositionPane.java | 2 +- .../component/VanChartLineTypePane.java | 2 +- .../component/VanChartTrendLinePane.java | 8 +-- ...rtBackgroundPaneWithOutImageAndShadow.java | 2 +- .../component/border/VanChartBorderPane.java | 2 +- .../border/VanChartBorderWithAlphaPane.java | 2 +- .../border/VanChartBorderWithRadiusPane.java | 2 +- .../CategoryNameFormatPaneWithCheckBox.java | 2 +- .../format/PercentFormatPaneWithCheckBox.java | 2 +- .../VanChartFormatPaneWithCheckBox.java | 2 +- .../marker/VanChartCommonMarkerPane.java | 4 +- ...eDimensionalPlotReportDataContentPane.java | 4 +- .../chart/designer/other/AutoRefreshPane.java | 2 +- .../other/VanChartConditionAttrPane.java | 2 +- .../other/VanChartInteractivePane.java | 16 ++--- .../item/VanChartLabelConditionPane.java | 2 +- .../item/VanChartTooltipConditionPane.java | 2 +- .../item/VanChartTrendLineConditionPane.java | 4 +- .../style/VanChartPlotLegendPane.java | 10 +-- .../designer/style/VanChartTitlePane.java | 4 +- .../VanChartAxisScrollPaneWithTypeSelect.java | 2 +- .../style/axis/VanChartBaseAxisPane.java | 16 ++--- .../style/axis/VanChartTimeAxisPane.java | 6 +- .../style/axis/VanChartValueAxisPane.java | 4 +- .../component/VanChartAxisButtonPane.java | 2 +- .../component/VanChartMinMaxValuePane.java | 4 +- .../gauge/VanChartGaugeDetailAxisPane.java | 4 +- .../axis/radar/VanChartRadarXAxisPane.java | 4 +- .../axis/radar/VanChartRadarYAxisPane.java | 12 ++-- .../background/AlertLineListControlPane.java | 2 +- .../background/BackgroundListControlPane.java | 2 +- .../background/VanChartAlertValuePane.java | 8 +-- .../background/VanChartAxisAreaPane.java | 12 ++-- .../VanChartCustomIntervalBackgroundPane.java | 4 +- .../radar/VanChartRadarAlertValuePane.java | 2 +- .../radar/VanChartRadarAxisAreaPane.java | 4 +- .../label/VanChartPlotLabelDetailPane.java | 6 +- .../VanChartAbstractPlotSeriesPane.java | 4 +- .../style/series/VanChartEffectPane.java | 2 +- ...VanChartStackedAndAxisListControlPane.java | 4 +- .../designer/data/comp/DrillMapDataPane.java | 2 +- .../designer/data/comp/DrillMapLayerPane.java | 2 +- .../type/VanChartDrillMapPlotPane.java | 10 +-- .../FunnelPercentFormatPaneWithCheckBox.java | 2 +- .../style/VanChartFunnelSeriesPane.java | 2 +- .../designer/type/VanChartFunnelTypePane.java | 6 +- .../data/VanChartGanttDataAndLinkPane.java | 2 +- .../component/GanttReportDataContentPane.java | 8 +-- .../component/GanttReportDataProjectPane.java | 4 +- .../component/GanttTableDataContentPane.java | 10 +-- .../component/GanttTableDataProjectPane.java | 2 +- .../style/axis/GanttAxisStylePane.java | 2 +- .../style/axis/GanttProcessAxisPane.java | 2 +- .../series/VanChartGanttCommonMarkerPane.java | 2 +- .../style/series/VanChartGanttSeriesPane.java | 2 +- .../VanChartGanttTooltipContentPane.java | 8 +-- .../designer/type/VanChartGanttPlotPane.java | 6 +- .../chart/gauge/VanChartGaugePlotPane.java | 14 ++-- .../chart/gauge/VanChartGaugeSeriesPane.java | 4 +- .../style/VanChartHeatMapSeriesPane.java | 2 +- .../type/VanChartHeatMapTypePane.java | 6 +- ...rtLineCustomStackAndAxisConditionPane.java | 6 +- .../van/chart/line/VanChartLinePlotPane.java | 8 +-- .../van/chart/map/VanChartMapSeriesPane.java | 4 +- .../designer/VanMapAreaAndPointGroupPane.java | 4 +- .../VanMapAreaPointAndLineGroupPane.java | 6 +- .../report/LineMapLongLatAreaPane.java | 2 +- .../component/report/LongLatAreaPane.java | 4 +- .../table/LineMapLongLatAreaPane.java | 2 +- .../data/component/table/LongLatAreaPane.java | 4 +- .../VanAreaMapPlotReportDataContentPane.java | 4 +- .../VanPointMapPlotReportDataContentPane.java | 2 +- .../VanPointMapPlotTableDataContentPane.java | 2 +- .../designer/type/VanChartMapPlotPane.java | 8 +-- .../type/VanChartMapSourceChoosePane.java | 10 +-- .../multilayer/VanChartMultiPiePlotPane.java | 6 +- .../MultiPiePlotReportDataContentPane.java | 6 +- .../MultiPiePlotTableDataContentPane.java | 14 ++-- ...ltiPieLevelNameFormatPaneWithCheckBox.java | 2 +- ...tiPieSeriesNameFormatPaneWithCheckBox.java | 2 +- .../fr/van/chart/pie/VanChartPiePlotPane.java | 8 +-- .../chart/radar/VanChartRadarPlotPane.java | 8 +-- .../chart/radar/VanChartRadarSeriesPane.java | 2 +- .../component/GradualIntervalConfigPane.java | 4 +- .../component/LegendLabelFormatPane.java | 2 +- .../component/SectionIntervalConfigPane.java | 2 +- .../SectionIntervalConfigPaneWithOutNum.java | 2 +- .../scatter/VanChartScatterPlotPane.java | 6 +- .../VanChartScatterLineTypePane.java | 2 +- ...nChartScatterPlotTableDataContentPane.java | 14 ++-- ...StructureIndependentVanChartInterface.java | 2 +- .../StructurePlotReportDataContentPane.java | 8 +-- .../StructurePlotTableDataContentPane.java | 10 +-- .../VanChartStructureLabelContentPane.java | 4 +- .../style/VanChartStructureSeriesPane.java | 2 +- .../VanChartStructureTooltipContentPane.java | 4 +- .../type/VanChartStructureTypePane.java | 8 +-- .../treemap/VanChartTreeMapPlotPane.java | 6 +- ...WordCloudIndependentVanChartInterface.java | 2 +- .../WordCloudPlotReportDataContentPane.java | 6 +- .../WordCloudPlotTableDataContentPane.java | 8 +-- .../style/VanChartWordCloudSeriesPane.java | 2 +- .../VanChartWordCloudTooltipContentPane.java | 6 +- .../type/VanChartWordCloudTypePane.java | 6 +- .../design/designer/creator/XChartEditor.java | 2 +- .../design/mainframe/WidgetToolBarPane.java | 2 +- .../cell/settingpane/CellPresentPane.java | 2 +- 254 files changed, 726 insertions(+), 727 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index a6adff143f..aa4195f0be 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { itemNameTextField = new UITextField(); JPanel topPane = GUICoreUtils.createBorderLayoutPane( - GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH, + GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Name") + ":"), BorderLayout.NORTH, importedJsPane, BorderLayout.CENTER, parameterPane, BorderLayout.EAST ); diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index c9e32f58b4..b19ec95a17 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -776,7 +776,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index d80f374492..be6c2a96b3 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java @@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane { // richer:能否拖动 if (isSupportTransparent) { - UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Transparency")); + UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Transparent")); transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); transparentButton.addActionListener(new TransparentActionListener()); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java index eb1c266bdc..e0493cc70d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java @@ -30,13 +30,13 @@ public class ChartControlPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Chart"), Chart.class, ChartTypeUpdatePane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"), Chart.class, ChartTypeUpdatePane.class) }; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Manage_Chart_Type"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Manage_Chart_Type"); } public void populate(ChartCollection cc) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index 028591d550..b4efa05a4f 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -157,7 +157,7 @@ public class ChartTypePane extends ChartCommonWizardPane { Chart chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()]; if(chart.getPlot() != null){ if(chart.getPlot() instanceof MapPlot && !supportMap()){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Not_Supported")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Not_Supported")); throw new RegistEditionException(VT4FR.ChartMap); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java index 124a582e42..184545f5d6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java @@ -11,10 +11,10 @@ package com.fr.design.chart.axis; public class ChartAlertValueInTopBottomPane extends ChartAlertValuePane { protected String getLeftName() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Bottom"); } protected String getRightName() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Top"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Top"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java index 8b17587a4e..becfb8c826 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java @@ -25,8 +25,8 @@ import com.fr.design.dialog.BasicPane; * Time : 上午8:48 */ public abstract class ChartStyleAxisPane extends BasicPane implements ListSelectionListener { - protected static final String CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis"); - protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_F_Radar_Axis"); + protected static final String CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category"); + protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis"); protected static final String SECOND_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis"); private JList mainList; private CardLayout cardLayout; diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java index afc2942f82..5e061822c6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java @@ -19,7 +19,7 @@ public class GanntChartStyleAxisPane extends BinaryChartStyleAxisPane { protected AxisStyleObject getXAxisPane(Plot plot) { ChartCategoryPane categoryPane = new ChartCategoryPane(); categoryPane.getAxisValueTypePane().removeTextAxisPane(); - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"), categoryPane); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis"), categoryPane); } protected AxisStyleObject getYAxisPane(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java index 922eaf3a0c..ab970073de 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java @@ -17,10 +17,10 @@ public class XYChartStyleAxisPane extends BinaryChartStyleAxisPane { } protected AxisStyleObject getXAxisPane(Plot plot) { - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), new ChartValuePane()); } protected AxisStyleObject getYAxisPane(Plot plot) { - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis"), new ChartValuePane()); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java index 0dd5e0a789..cb35fea8fb 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java @@ -20,7 +20,7 @@ public class SetDataSheetAction extends ChartComponentAction { public SetDataSheetAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Chart_Set_Data_Sheet")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Data_Sheet")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java index 8212e65eda..ae46f709e6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java @@ -58,7 +58,7 @@ public class GisMapDataPane extends DataContentsPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Gis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Map"); } public void setSupportCellData(boolean surpportCellData) { @@ -109,7 +109,7 @@ public class GisMapDataPane extends DataContentsPane{ double[] columnSize = { p,f }; double[] rowSize = { p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"), jcb}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":"), jcb}, } ; JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java index ef043c8385..b35f40c552 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java @@ -51,8 +51,8 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-LngLat")}); - lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-LngFirst"), com.fr.design.i18n.Toolkit.i18nText("Chart-LatFirst")}); + addressType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")}); addressPane = new TinyFormulaPane(); addressNamePane = new TinyFormulaPane(); double p = TableLayout.PREFERRED; @@ -70,7 +70,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_LatLng")}); - lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Lng_First"),com.fr.design.i18n.Toolkit.i18nText("Chart-Lat_First")}); + addressType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")}); addressType.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -96,19 +96,19 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 0)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java index c0f488d09f..b8a18b1521 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java @@ -303,7 +303,7 @@ public class MapCubeLayerPane extends BasicBeanPane{ * 返回界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Drill_Level"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java index f8e543f43a..9383162bbe 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java @@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane{ private void initCom() { this.setLayout(new BorderLayout(0, 0)); - UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) { + UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map")}, new int[] {}) { public boolean isCellEditable(int row, int col) { return col != 0; } @@ -77,7 +77,7 @@ public class MapCubeSetDataPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Setting"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java index 25552c2cbf..4d9d12fa89 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java @@ -87,7 +87,7 @@ public class MapDataPane extends DataContentsPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ShowWay") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Show_Way") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java index 34f1a0b5cd..373d3e1726 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java @@ -87,7 +87,7 @@ public class MapMoreCubeLayerPane extends MultiTabPane{ * @return 返回标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Muiti_In"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Muiti_In"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java index b64511ff15..3318ccade0 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java @@ -59,7 +59,7 @@ public class MapMoreReportIndexPane extends BasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java index 66d47ddd90..2be0679dfb 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java @@ -82,7 +82,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane implements AbstrctMapAt northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Import_Map")); + UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Import_Map")); loadMap.setPreferredSize(new Dimension(160, 20)); northPane.add(loadMap); loadMap.addActionListener(selectPictureActionListener); if(isNeedDataSource){ - UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Table_Data") + ":", SwingConstants.RIGHT) ; + UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":", SwingConstants.RIGHT) ; tableDataNameBox = new DatabaseTableDataPane(label) { protected void userEvent() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index dba412613b..a8542b0fff 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -67,7 +67,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData") + ":", SwingConstants.RIGHT); + UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData") + ":", SwingConstants.RIGHT); // 数据集, 字段, 数据列表, 使用该数据进行自动命名 tableDataBox = new DatabaseTableDataPane(lable) { @@ -83,10 +83,10 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc columnBox.setPreferredSize(new Dimension(40, 20)); columnBox.addItemListener(columnChange); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Field")+":")); northPane.add(columnBox); - tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) { + tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) { public boolean isCellEditable(int row, int col) { return col != 0; } 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 df82492731..2148257a41 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 @@ -55,10 +55,10 @@ import java.util.ArrayList; */ public class MapGroupExtensionPane extends BasicPane implements UIObserver { private static final String[] TYPE_NAMES = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-World_Map"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-State_Map"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Province_Map"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Custom_Map")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_World_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_State_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Province_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map")}; private static final int WORD = 0; private static final int NATION = 1; private static final int STATE = 2; @@ -300,7 +300,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createLayerItem(final String oldName) { - JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields")); + JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields")); corrItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane(); @@ -332,11 +332,11 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createRenameItem() { - JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename")); + JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename")); renameItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject()); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"), groupExtensionPane.getSelectedObject()); if (StringUtils.isNotBlank(newName)) { String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject()); if(ComparatorUtils.equals(oldName, newName)){ @@ -407,7 +407,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { @Override protected void done() { - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Saved")); // 地图已经保存. + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Saved")); // 地图已经保存. } }; 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 c06aa1c156..54e6667392 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 @@ -523,7 +523,7 @@ public class MapImageEditPane extends BasicBeanPane { private int editViewRow = -1;// 所对应的view的index行 , 确定当前正在编辑的viewList的行, 然后改变值 - private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Pre_Defined") + "------"); + private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pre_Defined") + "------"); private JPanel listPane = new JPanel(); public EditNamePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java index 7b28ec4324..348455bad2 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java @@ -68,16 +68,16 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(buttonPane); - buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Exponent"))); - buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Linear"))); - buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Log"))); - buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Polynomial"))); - buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Power"))); + buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Exponent"))); + buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Linear"))); + buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Log"))); + buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Polynomial"))); + buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Power"))); JPanel maPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(maPane); - maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average"))); + maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Move_Average"))); maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle") + ":")); maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1))); maSpinner.setEnabled(false); @@ -99,10 +99,10 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置 extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Forecast"), null)); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":")); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Forward") + ":")); extendsPane.add(forwardLabel = new UITextField("0", 5)); extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":")); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Backward") + ":")); extendsPane.add(backwardLabel = new UITextField("0", 5)); extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); @@ -127,7 +127,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } ActionListener listener = new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java index 54ee8c54fc..920cc63c8d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java @@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display"); } public void populate(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index dd19bdfabd..e1274aa4b9 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -5,7 +5,6 @@ import com.fr.chart.base.AttrAlpha; import com.fr.chart.base.AttrBackground; import com.fr.chart.base.AttrContents; import com.fr.chart.base.DataSeriesCondition; -import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.data.condition.AbstractCondition; @@ -166,7 +165,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane(names, values); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java index 858fa605e9..6f02047b14 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java @@ -61,7 +61,7 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane Component[][] components; if (!this.needRenamePane) { components = new Component[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox}, }; } else { itemNameTextField = new UITextField(); components = new Component[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name_has_Colon")), itemNameTextField}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name_Has_Colon")), itemNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox}, }; } JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java index d1e39f755e..ddb54b5323 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java @@ -60,9 +60,9 @@ public class MapEditPane extends BasicBeanPane{ namedPane= new MapDefiAreaNamePane(false); areaPane.setImageSelectType(MapShapeValue.AREA); // pointPane.setImageSelectType(MapShapeValue.POINT); - tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImageArea"),areaPane); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Image_Area"),areaPane); // tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImagePoint"),pointPane); - tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"),namedPane); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields"),namedPane); editingPane = areaPane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java index 87c12b26c5..5ff3e02333 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java @@ -65,7 +65,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ chartEditPane.setContainer(container); chartEditPane.addTitleChangeListener(titleListener); String tabname = chartEditPane.getSelectedTabName(); - nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); resetChartEditPane(); } @@ -81,7 +81,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ @Override public void fireTitleChange(String addName) { - nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + '-' + addName); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table") + '-' + addName); } }; 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 a044c059b1..a301af6971 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 @@ -215,7 +215,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table"); } public void populate(ChartCollection collection) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java index aef8c20703..74f9952e0d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java @@ -12,7 +12,7 @@ import javax.swing.*; */ public abstract class ChartsConfigPane extends AbstractChartAttrPane { - public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"); + public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"); public abstract Class acceptType(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java index d600a1d85e..4db8ef8eef 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java @@ -9,17 +9,17 @@ public class PaneTitleConstants { public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special"); public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"); - public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend"); - public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Series"); - public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis"); + public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend"); + public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series"); + public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis"); public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"); - public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet"); + public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label"); public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line"); public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area"); - public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot"); + public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plot_Region"); - public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); + public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index c8517c05cd..cc8a7db137 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -111,7 +111,7 @@ public class ChangeConfigPane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second"))}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null} }; @@ -227,6 +227,6 @@ public class ChangeConfigPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes"); } } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index 98c1d842e7..cc049b4503 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -110,7 +110,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initConfigCreator() { - configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); + configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); } private void initAddButton() { @@ -183,7 +183,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private String getNewChartName() { int count = indexList.size() + 1; while (true) { - String name_test = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Module_Name") + count; + String name_test = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Module_Name") + count; boolean repeated = false; for (int i = 0, len = indexList.size(); i < len; i++) { ChartChangeButton nameable = indexList.get(i); @@ -261,7 +261,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } private void changeCollectionSelected(String name) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java index 116cc20516..9db2fe7b21 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java @@ -109,7 +109,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"); } /** @@ -228,7 +228,7 @@ public class ChartDataFilterPane extends ThirdTabPane { panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num")); - combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther")); combineOther.setSelected(true); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -244,7 +244,7 @@ public class ChartDataFilterPane extends ThirdTabPane { //默认不显示 preDataNumPane.setVisible(false); panel1.add(preDataNumPane, BorderLayout.CENTER); - notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowCate")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -258,7 +258,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present); panel2.add(presentPane, BorderLayout.SOUTH); double[] column = {f}; @@ -281,7 +281,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * 界面标题 "分类" */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Category"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category"); } /** @@ -403,7 +403,7 @@ public class ChartDataFilterPane extends ThirdTabPane { panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num")); - combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther")); combineOther.setSelected(true); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -419,7 +419,7 @@ public class ChartDataFilterPane extends ThirdTabPane { //默认不显示 preDataNumPane.setVisible(false); panel1.add(preDataNumPane, BorderLayout.CENTER); - notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowSeries")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -433,7 +433,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present); panel2.add(presentPane, BorderLayout.SOUTH); double[] column = {f}; @@ -457,7 +457,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index e38a2c1f35..1277ae4632 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -64,7 +64,7 @@ public class NormalChartDataPane extends DataContentsPane { this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6)); JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Resource")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java index d353c2784f..3403bf3413 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java @@ -36,7 +36,7 @@ public class ReportDataPane extends FurtherBasicBeanPane{ * @return 界面的标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Cell_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell_Data"); } /** 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 8191066e75..da79f2691b 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 @@ -36,7 +36,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ } private void initDataPane() { - UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData")) ; + UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData")) ; label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); tableDataPane = new DatabaseTableDataPane(label) { @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java index be18db2850..01c412d314 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java @@ -26,7 +26,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa public BubblePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); filterPane = new ChartDataFilterPane(new BubblePlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); @@ -36,8 +36,8 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa protected String[] columnNames() { return new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), - com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java index 405fe274dd..fd8e08d87f 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java @@ -54,7 +54,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor public CategoryPlotMoreCateReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); JPanel catePane = new JPanel(); catePane.setLayout(new BorderLayout(2, 2)); @@ -76,7 +76,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor this.add(catePane, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java index c71ac065ca..298ee49370 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java @@ -34,12 +34,12 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent public CategoryPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); categoryName.setPreferredSize(new Dimension(246,30)); categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7)); this.add(categoryName, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); } @@ -51,7 +51,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent this.setLayout(new BorderLayout(4, 0)); if(StringUtils.isNotEmpty(leftLabel)) { - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); label1.setPreferredSize(new Dimension(75, 20)); this.add(label1, BorderLayout.WEST); } @@ -91,8 +91,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent @Override protected String[] columnNames() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java index d4b4557592..618d51382f 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java @@ -21,14 +21,14 @@ import java.util.List; */ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPane { - private static final String STEP = com.fr.design.i18n.Toolkit.i18nText("ChartF-Step"); - private static final String START = com.fr.design.i18n.Toolkit.i18nText("ChartF-PlansToBegin"); - private static final String END = com.fr.design.i18n.Toolkit.i18nText("ChartF-EndOfTheProject"); + private static final String STEP = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step"); + private static final String START = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start"); + private static final String END = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End"); - private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualStart"); - private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualEnd"); + private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start"); + private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End"); private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleFormat_Percent"); - private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Chart_Project"); + private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project"); public GanttPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index 2a04eabc0b..c456b2a03c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java @@ -26,7 +26,7 @@ import java.awt.Component; public class MeterPlotReportDataContentPane extends AbstractReportDataContentPane { private static final String CATENAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"); - private static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value"); + private static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value"); private TinyFormulaPane singCatePane; private TinyFormulaPane singValuePane; @@ -59,7 +59,7 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.NORTH); filterPane = new ChartDataFilterPane(new MeterPlot(), parent); - JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); pane.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java index 732664fe1e..81346ddca6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java @@ -24,7 +24,7 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane public PiePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4"); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java index 226f482b19..833563c2f0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java @@ -38,12 +38,12 @@ import java.util.List; * @version 创建时间：2012-12-19 下午04:10:47 */ public class StockPlotReportDataContentPane extends AbstractReportDataContentPane { - private static final String AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_HorialTimeAxis"); - private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Volume"); - private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Open"); - private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_High"); - private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Low"); - private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Close"); + private static final String AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horial_Time_Axis"); + private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Volume"); + private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Open"); + private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_High"); + private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Low"); + private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Close"); private static final int PRE_WIDTH = 210; private static final int VOLUMN_INDEX = 0; private static final int OPEN_INDEX = 1; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java index 816aea72b2..5bd690b2f7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java @@ -32,8 +32,8 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten protected String[] columnNames() { return new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "x", - com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "y" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "x", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "y" }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java index 961ac66b3e..fdf872c64a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java @@ -45,7 +45,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane yCombox.setPreferredSize(new Dimension(100, 20)); bubbleSize.setPreferredSize(new Dimension(100, 20)); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -58,14 +58,14 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName}, new Component[]{new UILabel("x"), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), bubbleSize} }; JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1)); Component[][] components = new Component[][]{ new Component[]{north}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane), null}, }; @@ -91,7 +91,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); @@ -102,7 +102,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); @@ -118,7 +118,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane BubbleTableDefinition definition = (BubbleTableDefinition) top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java index a8c4aba765..ec3f57744b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java @@ -58,7 +58,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD JPanel categoryPane = new JPanel(new BorderLayout(4, 0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java index 4c2e70850a..e1a0bfde37 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java @@ -41,11 +41,11 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa categoryCombox = new UIComboBox(); JPanel categoryPane = new JPanel(new BorderLayout(4,0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")) ; + UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")) ; label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); categoryCombox.setPreferredSize(new Dimension(100,20)); - categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox,null,null,label1,null})); categoryPane.setPreferredSize(new Dimension(246,30)); categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); @@ -90,7 +90,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(categoryCombox, list); - categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); seriesTypeComboxPane.refreshBoxListWithSelectTableData(list); } @@ -100,7 +100,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa */ public void clearAllBoxList(){ clearBoxItems(categoryCombox); - categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); seriesTypeComboxPane.clearAllBoxList(); } @@ -136,7 +136,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa NormalTableDataDefinition data = (NormalTableDataDefinition)top; if(data == null || ComparatorUtils.equals(data.getCategoryName(), StringUtils.EMPTY)) { - categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } else if(data!= null && !this.boxItemsContainsObject(categoryCombox,data.getCategoryName())){ categoryCombox.setSelectedItem(null); }else { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java index 4db13903b0..eb5eada001 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java @@ -50,13 +50,13 @@ public class GanttPlotTableDataContentPane extends AbstractTableDataContentPane{ double[] rowSize = { p,p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Step_Name")),step}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_Start")),planStart}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_End")),planEnd}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_Start")),finalStart}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_End")),finalEnd}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent")),percent}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items")),project}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step_Name")),step}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start")),planStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End")),planEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start")),finalStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End")),finalEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent")),percent}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Items")),project}, } ; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java index 04349ccfcf..ad3a2fc4e4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java @@ -25,8 +25,8 @@ import java.util.List; * @version 创建时间：2012-12-21 下午04:51:50 */ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane { - private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Use_Name"); - private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value"); + private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"); + private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Value"); private UIComboBox nameBox; private UIComboBox valueBox; @@ -46,7 +46,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane Component[][] components = createComponents(); - JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); filterPane.setBorder(BorderFactory.createEmptyBorder(0,10,0,15)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java index 1da844507c..850ef70fe1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java @@ -40,8 +40,8 @@ import java.util.List; * @version 创建时间：2012-12-26 下午04:39:46 */ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane { - private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Summary")}; - private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name")}; + private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")}; + private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")}; private UICorrelationPane seriesDataPane; private List field = new ArrayList(); private JPanel centerPane; @@ -62,7 +62,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM)); JPanel northPane = new JPanel(new BorderLayout(4, 0)); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From")); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15)); @@ -56,7 +56,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane { this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); dataScreeningPane = new ChartDataFilterPane(this.initplot, parent); - JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane); + JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane); panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5)); this.add(panel, BorderLayout.SOUTH); @@ -94,7 +94,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane { * @return 界面标题 */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java index 1457ba7a4f..ee6d6228dd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java @@ -25,7 +25,7 @@ import java.util.List; */ public class StockPlotTableDataContentPane extends AbstractTableDataContentPane { - private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Chart-Horizontal_TimeAxis"); + private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_TimeAxis"); private static final int LABEL_WIDTH = 105; private UIComboBox axisBox; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java index a2eca6347d..86e57d1339 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java @@ -39,7 +39,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP yCombox = new UIComboBox(); dataScreeningPane = new ChartDataFilterPane(new XYScatterPlot(), parent); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); seriesName.setPreferredSize(new Dimension(100, 20)); xCombox.setPreferredSize(new Dimension(100, 20)); @@ -52,10 +52,10 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name") + ":"),seriesName}, - new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "x" + ":"), xCombox}, - new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "y" + ":"), yCombox}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "x" + ":"), xCombox}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "y" + ":"), yCombox}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Filter"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"))}, new Component[]{dataScreeningPane,null} }; @@ -80,7 +80,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP protected void refreshBoxListWithSelectTableData(List columnNameList) { refreshBoxItems(seriesName, columnNameList); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); refreshBoxItems(xCombox, columnNameList); refreshBoxItems(yCombox, columnNameList); } @@ -90,7 +90,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); } @@ -133,7 +133,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP ScatterTableDefinition definition = (ScatterTableDefinition)top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java index 23bb3a4cf9..4822fb66e0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java @@ -39,7 +39,7 @@ public class ChartConditionAttrPane extends BasicScrollPane { * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display"); } @Override @@ -49,9 +49,9 @@ public class ChartConditionAttrPane extends BasicScrollPane { List list = new ArrayList(); if(plot instanceof CustomPlot) { - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new CustomAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Attributes"), new CustomAttr(), showPane)); } else { - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new ConditionAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Attributes"), new ConditionAttr(), showPane)); } conditionPane.refreshMenuAndAddMenuAction(list); 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 0f5a1307d3..24128ec286 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 @@ -146,29 +146,29 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Tab"); } @Override protected JPanel createContentPane() { - isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Animation_JSShow")); - isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Drag")); + isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Show")); + isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Drag")); isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); - dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); - isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); - dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); - tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-White_Black"), com.fr.design.i18n.Toolkit.i18nText("Chart-Black_White")}); - tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name")); - tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Series_SingleData"), com.fr.design.i18n.Toolkit.i18nText("Chart-Series_AllData")}); - tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show")); - - isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title")); - isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address")); - isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name")); - - isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_AxisTooltip")); - isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom")); + dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); + isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); + tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Black_Font"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_White_Font")}); + tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name")); + tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Single_Data"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_All_Data")}); + tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show")); + + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name")); + + isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Axis_Tooltip")); + isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Zoom")); isAutoRefresh = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Enable_Auto_Refresh")); autoRefreshTime = new UISpinner(1, Integer.MAX_VALUE, 1); superLink = new UICorrelationComboBoxPane(); @@ -179,7 +179,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb checkAutoRefresh(); } }); - timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Interactive_timeSwitch")); + timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Time_Switch")); timeSwitchPane = new TimeSwitchPane(); initFormatListener(); return initPaneWithListener(); @@ -326,7 +326,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb double[] rowSize = new double[]{p, p}; if (plot.isShowAllDataPointLabel()) { - isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); + isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")); } if (plot.isSupportAddress4Gis()) { UIButton tmpButton = new UIButton(); //用来调整对齐 @@ -408,11 +408,11 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAutoRefresh, null}, new Component[]{GUICoreUtils.createFlowPane(new Component[]{ - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Interval")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds")) + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds")) }, 1)}, - new Component[]{new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + ""), null}, + 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); } @@ -568,9 +568,9 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb addressType = ((GisMapReportDefinition) definition).isAddress(); } if (addressType) { - this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Address")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Address")); } else { - this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_LatLng")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_LatLng")); } } } @@ -859,24 +859,24 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb List list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Web"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Dynamic_Parameters"), new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Form"), hyperlink, getUseMap(map, FormHyperlinkProvider.class))); return list; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java index ce6e30e103..6288b7ecf4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java @@ -84,7 +84,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{ * @param 返回标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java index c305609836..390ff1004c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java @@ -85,10 +85,10 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval")); custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval")); - showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelInterval"),com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelWrap")}); + showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Interval"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Wrap")}); customLabelSamleTime = new UITextField(); - String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Rotation")}; + String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Rotation")}; labelOrientationChoose = new UIComboBox(nameObjects); orientationBar = new NumberDragBar(-NUM90, NUM90); orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); @@ -161,7 +161,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show")), showWay, null}, new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, @@ -215,7 +215,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null} + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show")), showWay, null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } @@ -289,7 +289,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelSampleChoose, customLabelSamleTime}, new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null,orientationSpinner, orientationBar, null}, new Component[]{null,textAttrPane, null, null}, @@ -316,7 +316,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ * 界面标签 */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Tick_Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tick_Label"); } private int getLabelTextOrientationIndex(TextAttr textAttr) { 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 778be9a298..eaffb94983 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 @@ -34,7 +34,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")}; Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"), diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java index 4858473f46..c69cbdef36 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java @@ -49,7 +49,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("AxisValue"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Value"); } /** @@ -110,7 +110,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Text_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Axis"); } /** 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 42598a211c..ccd7f08981 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 @@ -75,7 +75,7 @@ public class ChartBackgroundPane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{typeComboBox, null} , new Component[]{centerPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Alpha_Int")), null}, + 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); 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 9e4fcecfec..ed7666cf84 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 @@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane{ public ChartBeautyPane() { String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格，注意兼容处理 }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java index 6aefe3f72a..6b22c287f5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java @@ -34,15 +34,15 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{ public ChartDataPointLabel4GisPane(ChartStylePane parent){ this.parent = parent; - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); - isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title")); - isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address")); + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address")); isAddress.setSelected(true); - isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name")); isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); divideComoBox = new UIComboBox(ChartConstants.DELIMITERS); textFontPane = new ChartTextAttrPane(); @@ -56,7 +56,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{ double[] rowSize = { p,p,p,p,p,p}; JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); Component[][] components = new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java index d5bdc1c954..129ed176aa 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java @@ -29,13 +29,13 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane { public ChartDataPointLabel4MapPane(ChartStylePane parent) { this.parent = parent; - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")); - isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value")); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); - isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); - valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); divideComoBox = new UIComboBox(ChartConstants.DELIMITERS); textFontPane = new ChartTextAttrPane(); @@ -58,7 +58,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane { components[4] = new Component[]{isValuePercent,valuePercentFormatButton} ; JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); components[5] = new Component[]{delimiterPane,null}; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java index bd39b15fca..8e198ea6c5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java @@ -80,7 +80,7 @@ public class ChartDatapointLabelPane extends BasicPane{ public ChartDatapointLabelPane(String[] locationNameArray, Integer[] locationValueArray, Plot plot, ChartStylePane parent) { this.parent = parent; - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); if(locationNameArray != null && locationNameArray.length > 0 && locationValueArray != null && locationValueArray.length > 0) { nameValueMap.clear(); @@ -96,18 +96,18 @@ public class ChartDatapointLabelPane extends BasicPane{ boolean isGuidline = plot.isSupportLeadLine(); if(plot.isSupportCategoryFilter()) { - isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name")); + isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name")); } isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); isValue.setSelected(true); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); if(plot.isSupportValuePercent()) { - isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); - valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); if (plot.isShowAllDataPointLabel()) { - isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); + isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")); } } @@ -117,7 +117,7 @@ public class ChartDatapointLabelPane extends BasicPane{ textFontPane = new ChartTextAttrPane(); if(isGuidline) { - isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine")); + isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline")); } if (plot.isShowAllDataPointLabel()) { @@ -140,7 +140,7 @@ public class ChartDatapointLabelPane extends BasicPane{ if(positionBox != null) { JPanel positionPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")), BorderLayout.WEST); + positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), BorderLayout.WEST); positionPane.add(positionBox, BorderLayout.CENTER); components[0] = new Component[]{positionPane, null}; if(isGuidline) { @@ -166,7 +166,7 @@ public class ChartDatapointLabelPane extends BasicPane{ JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); if (plot.isSupportDelimiter()) { - delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 22b350d7ae..c21ca0e045 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -238,7 +238,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis"); } private void checkBoxUse() { 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 1ea4368249..64987d571c 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 @@ -109,7 +109,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ private JPanel createAlertLinePane(String[] title, boolean first){ List list = new ArrayList(); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValuePane.class)); if(first){ xAlertPane = new UICorrelationComboBoxPane(list); }else{ @@ -164,9 +164,9 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ boolean useLeftRight = numberAxis.getPosition() == Constants.LEFT || numberAxis.getPosition() == Constants.RIGHT; List menuList = new ArrayList(); if(useLeftRight) { - menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValuePane.class)); } else { - menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class)); } editAlertPane.refreshMenuAndAddMenuAction(menuList); @@ -274,7 +274,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ lineInfo.setAttrLineColor(new AttrColor(Color.gray)); trendLine.setLineStyleInfo(lineInfo); conditionLine.setLine(trendLine); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class)); trendLinePane = new UICorrelationComboBoxPane(list); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java index df60e41d7b..020a10a209 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java @@ -18,7 +18,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane { private ColorSelectBox gridColorPane; public Plot3DAxisAreaPane() { - gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line")); + gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Grid_Line")); gridColorPane = new ColorSelectBox(100); double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java index 51c165743e..8011d18c0e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java @@ -24,7 +24,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { public RadarAxisAreaPane() { horizontalColorPane = new ColorSelectBox(100); - isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Grid")); gridColorPane = new ColorSelectBox(100); double p = TableLayout.PREFERRED; @@ -33,9 +33,9 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background") + ":"),horizontalColorPane}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")),null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Grid")),null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(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 f2244aeb18..289bef4eb0 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 @@ -52,7 +52,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ axisLineStylePane = new ChartAxisLineStylePane(); formatPane = new FormatPaneWithOutFont(); axisLabelPane = new ChartAxisLabelPane(); - axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("AxisReversed")); + axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Reversed")); this.setLayout(new BorderLayout()); this.add(isSupportLineStyle() ? getPaneWithLineStyle() : getPaneWithOutLineStyle(),BorderLayout.CENTER); } @@ -123,7 +123,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java index 9f8d43b0a1..6c6f3d2c0c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java @@ -27,7 +27,7 @@ public class ChartRadarPane extends ChartValuePane{ JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); valuePane.add(buttonPane); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_AutoCount"), com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_UnitCount")}; + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Auto_Count"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")}; Boolean[] values = new Boolean[]{Boolean.FALSE, Boolean.TRUE}; allMaxMin = new UIButtonGroup(names, values); buttonPane.add(allMaxMin); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java index 0ab62a66c3..ed3c798798 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java @@ -17,7 +17,7 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{ protected JPanel aliagnZero4Second() {// 添加 0值对齐 JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false)); return pane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java index a45210a86a..d68483e35b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java @@ -20,7 +20,7 @@ public class ChartSecondValuePane extends ChartValuePane { protected JPanel aliagnZero4Second() {// 添加 0值对齐 JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false)); return pane; } 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 740f1fc7d2..844f3f81f3 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 @@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane{ * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java index c544698701..4f08282ecb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java @@ -95,11 +95,11 @@ public class ChartDataLabelPane extends BasicScrollPane{ if(plot instanceof BarPlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof PiePlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Outside")}; }else if(plot instanceof RangePlot){ return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof BubblePlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Outside")}; }else{ return new String[0]; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java index faa2d25e16..f452e13076 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java @@ -46,13 +46,13 @@ public class ChartDatasheetPane extends BasicScrollPane{ double f = TableLayout.FILL; double[] columnSize = {LayoutConstants.CHART_ATTR_TOMARGIN,f}; double[] rowSize = { p, p, p, p}; - isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Show_Data_Sheet")); + isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Data_Sheet")); textAttrPane = new ChartTextAttrPane(); formatPane = new FormatPaneWithNormalType(); Component[][] components = new Component[][]{ new Component[]{null,textAttrPane}, new Component[]{new JSeparator(),null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data_Type")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Type")), null}, new Component[]{null,formatPane}, }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java index 6fb2789984..4c5a7b6e42 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java @@ -52,7 +52,7 @@ public class ChartLegendPane extends BasicScrollPane{ } private void initComponents(){ - isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Visible")); textAttrPane = new ChartTextAttrPane(); borderPane = new ChartBorderPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java index 3d720f3ffd..e9b118df87 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java @@ -91,7 +91,7 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ * 界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java index 5c195fd495..f06d0aa399 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java @@ -36,7 +36,7 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { stylePane = new ChartBeautyPane(); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); double p = TableLayout.PREFERRED; @@ -46,8 +46,8 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java index f6e000c666..6078c3917d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java @@ -48,8 +48,8 @@ public class Bar2DSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")), categoryGap} }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java index c05e511822..70a4f4b8cc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java @@ -43,8 +43,8 @@ public class Bar3DSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = {p, f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")), categoryGap} }; pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java index 8acb014fc7..c596c293f7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java @@ -70,7 +70,7 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{bubbleMean,null}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Bubble_Size")),zoomTime}, new Component[]{isMinus,null} } ; JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java index 4de4f6f48a..08baed4928 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java @@ -36,10 +36,10 @@ public class CombinedBar2DSeriesPane extends Bar2DSeriesPane{ double[] columnSize = {p, f}; double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"))}, new Component[]{fillColorPane, null}, new Component[]{stylePane, null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Bar_Size")),zoomTime} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Bar_Size")),zoomTime} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java index b738b02c2e..309f2b718d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java @@ -33,10 +33,10 @@ public class CombinedBubbleSeriesPane extends BubbleSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart")), null}, new Component[]{fillColorPane, null}, new Component[]{bubbleMean,null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Bubble_Size")),zoomTime}, new Component[]{isMinus,null} }; JPanel pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java index 5f27c3760a..30494d7597 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java @@ -35,10 +35,10 @@ public class CombinedPie2DSeriesPane extends Pie2DSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Pie")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie")),null}, new Component[]{fillColorPane, null}, new Component[]{stylePane,null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Pie_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Pie_Size")),zoomTime}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java index e73f4a079a..cea38295e0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java @@ -27,12 +27,12 @@ import java.util.List; */ public class CustomDefaultSeriesPane extends BasicPane{ - private static final String BAR = com.fr.design.i18n.Toolkit.i18nText("ChartF-Column"); - private static final String BAR_STACK = com.fr.design.i18n.Toolkit.i18nText("I-BarStyle_NormalStack"); - private static final String BAR3D = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3D_Chart"); - private static final String BAR3D_STACK = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3DStack_Chart"); - private static final String LINE = com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line"); - private static final String AREA_STACK = com.fr.design.i18n.Toolkit.i18nText("I-AreaStyle_Stack"); + private static final String BAR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Column_Chart"); + private static final String BAR_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_NormalStack_Chart"); + private static final String BAR3D = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Chart"); + private static final String BAR3D_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Stack_Chart"); + private static final String LINE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"); + private static final String AREA_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); private UIComboBoxPane boxPane; @@ -147,8 +147,8 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = {p, f}; double[] rowSize = { p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Gap")), seriesGap}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Gap")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Gap")), categoryGap} }; this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.NORTH); @@ -237,10 +237,10 @@ public class CustomDefaultSeriesPane extends BasicPane{ public CustomLineDefaultSeriesPane(){ this.setLayout(new BorderLayout()); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -248,9 +248,9 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; @@ -309,7 +309,7 @@ public class CustomDefaultSeriesPane extends BasicPane{ this.setLayout(new BorderLayout()); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); double p = TableLayout.PREFERRED; @@ -317,8 +317,8 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = { p,f }; double[] rowSize = { p,p }; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} }; this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java index a1d6687f6f..2c94b5e494 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java @@ -49,7 +49,7 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Use_Default"))}, new Component[]{defaultSeriesStyle}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Add_Series_Setting"), SwingConstants.LEFT)}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Series_Setting"), SwingConstants.LEFT)}, new Component[]{conditionPane} } ; @@ -69,7 +69,7 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { } List list = new ArrayList(); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); conditionPane.refreshMenuAndAddMenuAction(list); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java index 60c815be56..ee16c281f8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java @@ -63,7 +63,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ liteConditionPane = new ChartConditionPane(); JPanel conditionPane = new JPanel(); conditionPane.setLayout(new BoxLayout(conditionPane, BoxLayout.Y_AXIS)); - conditionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"), null)); + conditionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"), null)); conditionPane.add(liteConditionPane); this.setLayout(new BorderLayout()); @@ -137,12 +137,12 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private JPanel getCustomAttrPane() { JPanel stylePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - stylePane.add(barRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Column"))); - stylePane.add(barStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("I-BarStyle_NormalStack"))); - stylePane.add(bar3DRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3D_Chart"))); - stylePane.add(bar3DStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3DStack_Chart"))); - stylePane.add(lineRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Line"))); - stylePane.add(areaStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("I-AreaStyle_Stack"))); + stylePane.add(barRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Column_Chart"))); + stylePane.add(barStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_NormalStack_Chart"))); + stylePane.add(bar3DRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Chart"))); + stylePane.add(bar3DStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Stack_Chart"))); + stylePane.add(lineRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"))); + stylePane.add(areaStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"))); ButtonGroup rendererButtonGroup = new ButtonGroup(); rendererButtonGroup.add(barRadioButton); @@ -168,7 +168,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ cardLayout.show(cardPane, "Bar"); JPanel styleChoosePane = new JPanel(); - styleChoosePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Choose_Style"), null)); + styleChoosePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Choose_Style"), null)); styleChoosePane.setLayout(new BoxLayout(styleChoosePane, BoxLayout.Y_AXIS)); styleChoosePane.add(stylePane); styleChoosePane.add(mainPane); @@ -246,7 +246,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } private class CustomTypeBarSeriesPane extends BasicBeanPane{ @@ -257,8 +257,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UINumberDragPane categoryGap; public CustomTypeBarSeriesPane(){ - UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -276,8 +276,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] columnSize = {p, p}; double[] rowSize = { p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Gap")), seriesGap}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Gap")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Gap")), categoryGap} }; @@ -312,7 +312,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -320,8 +320,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeBar3DSeriesPane(){ - UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -354,7 +354,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -364,8 +364,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeAreaSeriesPane(){ - UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -374,7 +374,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ positionPane.add(nameLabel); positionPane.add(positionGroup); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); markerPane.setPreferredSize(new Dimension(150,20)); @@ -383,8 +383,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] rowSize = { p,p,p }; Component[][] components = new Component[][]{ new Component[]{positionPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} }; this.setLayout(new BorderLayout()); @@ -419,7 +419,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -432,8 +432,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ protected MarkerComboBox markerPane; public CustomTypeLineSeriesPane(){ - UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -442,14 +442,14 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ positionPane.add(nameLabel); positionPane.add(positionGroup); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); isCurve.setPreferredSize(new Dimension(150,20)); lineStyle.setPreferredSize(new Dimension(150,20)); markerPane.setPreferredSize(new Dimension(150,20)); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -457,9 +457,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{positionPane, null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; @@ -499,7 +499,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java index 3154522c5d..2fc587dada 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java @@ -46,10 +46,10 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -57,7 +57,7 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java index cef280dfa6..edf2f94246 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java @@ -52,7 +52,7 @@ public class MapSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isHeatMap = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Heat_Map")); + isHeatMap = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Map")); isHeatMap.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { checkHeatMapAreaTitles(); @@ -69,8 +69,8 @@ public class MapSeriesPane extends AbstractPlotSeriesPane{ double[] rowSize = { p, p, p, p, p}; Component[][] components = new Component[][]{ new Component[]{isHeatMap, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Configuration")), areaTitles}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF_ValueRange_MatchColor")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Configuration")), areaTitles}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Range_Color")),null}, new Component[]{colorPickPane,null}, } ; 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 4406b2b10c..f266e2a60e 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 @@ -77,7 +77,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { }; JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java index a004d96239..b16f12a2a5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java @@ -35,7 +35,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { protected void initCom() { stylePane = new ChartBeautyPane(); - isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); + isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Plot_Region")); String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Style")}; Integer[] valueArray = {0, 1}; secondPlotType = new UIButtonGroup(nameArray, valueArray); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java index e478a3f7b3..81fa1b93d7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java @@ -42,10 +42,10 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Fill")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); @@ -54,7 +54,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index af308adc87..7a1567bf9e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -83,7 +83,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { regionNumPane.updateBean().intValue()), getValueArray(regionNumPane.updateBean().intValue())); } }); - designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); + designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")}, new Integer[]{0, 1}); designTypeButtonGroup.setSelectedIndex(0); designTypeButtonGroup.addChangeListener(new ChangeListener() { @Override @@ -154,9 +154,9 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { protected Component[][] createComponents(){ return new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR_Chart-Data_Range_Configuration")), designTypeButtonGroup}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Range_Configuration")), designTypeButtonGroup}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), fillStyleCombox}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), regionNumPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), regionNumPane}, }; } @@ -172,7 +172,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { regionNumPane.updateBean().intValue()), getValueArray(regionNumPane.updateBean().intValue())); } }); - designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); + designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")}, new Integer[]{0, 1}); designTypeButtonGroup.setSelectedIndex(0); designTypeButtonGroup.addChangeListener(new ChangeListener() { @Override @@ -206,12 +206,12 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; double[] columnSize = {d, e}; double[] rowSize = {p}; - Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), regionNumPane}}; + Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), regionNumPane}}; stagePanel = TableLayout4VanChartHelper.createGapTableLayoutPane(tmpComp, rowSize, columnSize); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Tick_And_Color")), designTypeButtonGroup}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Tick_And_Color")), designTypeButtonGroup}, }; upControlPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java index 7796be1fb6..7205814443 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java @@ -51,7 +51,7 @@ public class ChartTitlePane extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java index 0ebc26685d..c383064097 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java @@ -51,7 +51,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java index 3c679cfd3a..a4e47914eb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java @@ -69,10 +69,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ protected String[] getNormalLayoutTipName() { return new String[] { - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_TopDownShade"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Transparent"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Plane3D"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_GradientHighlight") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_TopDownShade"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Transparent"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Plane3D"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_GradientHighlight") }; } @@ -108,7 +108,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ if(styleList != null && !styleList.isEmpty()) { Component[][] styleComp = new Component[][]{ new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"))}, new Component[]{layoutPane}, }; stylePane = TableLayoutHelper.createTableLayoutPane(styleComp,rowSize,columnSize); @@ -180,22 +180,22 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ String styleName = chart.getPlot().getPlotFillStyle().getFillStyleName(); switch (plotStyle){ - case ChartConstants.STYLE_SHADE: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"), styleName)){ + case ChartConstants.STYLE_SHADE: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Retro"), styleName)){ styleList.get(STYLE_SHADE).isPressing = true; lastStyleIndex = STYLE_SHADE; } break; - case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"), styleName)){ + case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Fresh"), styleName)){ styleList.get(STYLE_TRANSPARENT).isPressing = true; lastStyleIndex = STYLE_TRANSPARENT; } break; - case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"), styleName)){ styleList.get(STYLE_PLANE3D).isPressing = true; lastStyleIndex = STYLE_PLANE3D; } break; - case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"), styleName)){ styleList.get(STYLE_HIGHLIGHT).isPressing = true; lastStyleIndex = STYLE_HIGHLIGHT; } @@ -229,16 +229,16 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ Object preStyle = null; String name = ""; if(styleList.get(STYLE_SHADE).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Retro"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_TRANSPARENT).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Fresh"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_PLANE3D).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_HIGHLIGHT).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"); preStyle = manager.getPreStyle(name); } if(preStyle == null){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java index 3543661210..42667ee9d9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java @@ -33,10 +33,10 @@ public class AreaPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); - String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ stack + area, percent + stack + area, @@ -139,7 +139,7 @@ public class AreaPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java index fb20ec1be0..280fca724c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java @@ -31,16 +31,16 @@ public class BarPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); - String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ bar, stack + bar, percent + stack + bar, td + bar, - td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", + td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", td + stack + bar, td + percent + stack + bar }; @@ -65,7 +65,7 @@ public class BarPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java index 9c2f56d113..103dbd1940 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java @@ -25,7 +25,7 @@ public class BubblePlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart") }; } @@ -44,7 +44,7 @@ public class BubblePlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java index 4efcbe459b..5f290d5926 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java @@ -30,16 +30,16 @@ public class ColumnPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); - String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ column, stack + column, percent + stack + column, td + column, - td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", + td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", td + stack + column, td + percent + stack + column }; @@ -63,7 +63,7 @@ public class ColumnPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java index 8858cbc8cb..d6a46df458 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java @@ -26,7 +26,7 @@ public class CustomPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart") }; } @@ -45,7 +45,7 @@ public class CustomPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java index 486152bfb0..e8643c34ff 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java @@ -35,10 +35,10 @@ public class DonutPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String donut = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); + String donut = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart"); return new String[]{ donut, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + donut + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + donut }; } @@ -103,7 +103,7 @@ public class DonutPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java index dd8e86316a..8f31c8c555 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java @@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel") }; } @@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java index 75094492e0..537fa46289 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java @@ -24,7 +24,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart") }; } @@ -47,7 +47,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java index ad33375944..25d2fa48f2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java @@ -52,7 +52,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ if(styleList != null && !styleList.isEmpty()) { components = new Component[][]{ new Component[]{layoutPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Waring_Please_Input_The_Key"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Waring_Input_Key"))}, new Component[]{keyInput}, }; } @@ -72,7 +72,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map") + "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map") }; } @@ -90,8 +90,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeLayoutTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_BaiduMap"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_GoogleMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap") }; } @@ -172,7 +172,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); + return "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java index bcc8ff0faa..5afd3e2177 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java @@ -21,7 +21,7 @@ public class LinePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart") }; } @@ -83,7 +83,7 @@ public class LinePlotPane extends AbstractChartTypePane{ } public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java index fa667e1a26..661dba7590 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java @@ -50,10 +50,10 @@ public class MapPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Normal"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Bubble"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Pie"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Column") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Normal"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Bubble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Column") }; } @@ -72,7 +72,7 @@ public class MapPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java index d3638408bb..811053641a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java @@ -31,9 +31,9 @@ public class MeterPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { - String meter = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); + String meter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + meter, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter, meter + "1", meter + "2" }; @@ -77,7 +77,7 @@ public class MeterPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java index 2509e4ec9b..98ccb0e533 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java @@ -36,10 +36,10 @@ public class PiePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String pie = com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); + String pie = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); return new String[]{ pie, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + pie + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie }; } @@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); } private void createPieCondition(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java index a9f45abb66..631a4d9d46 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java @@ -24,7 +24,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart") }; } @@ -48,7 +48,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java index 29ea3be8c9..405f9aa4fc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java @@ -25,7 +25,7 @@ public class RangePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart") }; } @@ -49,7 +49,7 @@ public class RangePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java index ecc3514af2..567595703c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java @@ -24,7 +24,7 @@ public class StockPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart") }; } @@ -48,7 +48,7 @@ public class StockPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_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 099c008d21..e2e3e67c4b 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 @@ -97,7 +97,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds"))}, }; contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); @@ -105,9 +105,9 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { panel.add(refreshEnabled, BorderLayout.NORTH); panel.add(contentPane, BorderLayout.CENTER); - JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Design-Chart_Auto_Refresh"), panel); + JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Refresh"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Refresh"), gapPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Refresh"), gapPane); } private JPanel createHyperlinkPane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java index b035f86b48..2642daa288 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/18. */ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -27,14 +27,14 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ area, stack + area, percent + stack + area, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java index a6b74cbb71..4944869df8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/10/20. */ public class VanChartBarPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); private static final long serialVersionUID = 2879689884048643002L; @@ -27,14 +27,14 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ bar, stack + bar, percent + stack + bar, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -43,7 +43,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java index c0ec2ebe1d..7dad3847a0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java @@ -13,7 +13,7 @@ public class VanChartBubbleInteractivePane extends VanChartInteractivePaneWithOu protected String[] getNameArray() { Plot plot = chart.getPlot(); if(plot instanceof VanChartBubblePlot && ((VanChartBubblePlot) plot).isForceBubble()) { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}; } return super.getNameArray(); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java index 25788b992d..9f6c47ae7e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java @@ -20,7 +20,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/3/31. */ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble");; + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bubble");; private static final long serialVersionUID = -3481633368542654247L; @@ -38,8 +38,8 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewForceBubble") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble") }; } @@ -48,7 +48,7 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bubble"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java index c2b64cf1c5..3e2898f324 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java @@ -45,7 +45,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon xCombox.setPreferredSize(PREFERRED_SIZE); yCombox.setPreferredSize(PREFERRED_SIZE); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); initBubbleSize(); @@ -59,12 +59,12 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName}, new Component[]{new UILabel("x" ), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), bubbleSize}, }; JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); - JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane); + JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); @@ -95,7 +95,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); @@ -106,7 +106,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); @@ -122,7 +122,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon BubbleTableDefinition definition = (BubbleTableDefinition) top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } @@ -136,7 +136,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon } protected void populateBubbleSize(BubbleTableDefinition definition) { - if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"))){ + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"))){ combineCustomEditValue(bubbleSize, StringUtils.EMPTY); }else { combineCustomEditValue(bubbleSize, definition.getBubbleSize()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java index 8bc69a75af..ffd13a1ab8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/9/24. */ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); private static final long serialVersionUID = 5950923001789733745L; @@ -28,14 +28,14 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); - String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ column, stack + column, percent + stack + column, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index 3b11b4c608..a71babe8f9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -86,8 +86,8 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { panel1.add(columnWidth, BorderLayout.CENTER); Component[][] components2 = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")),seriesGap}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")),categoryGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap}, }; JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java index e03fc26071..efa071305d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java @@ -74,9 +74,9 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane{ yDirection = new UISpinner(0, 100, 1, 20); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position") + "(%): " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Direction"), SwingConstants.LEFT),xDirection}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position") + "(%): " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Direction"), SwingConstants.LEFT),xDirection}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Direction"), SwingConstants.RIGHT),yDirection}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius") + "(px): ",SwingConstants.LEFT),radius} diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java index 41e3da1c6d..7e4e8417b9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java @@ -19,8 +19,8 @@ public class VanChartCustomAxisConditionPane extends VanChartCustomStackAndAxisC protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")),XAxis}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")),YAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),YAxis}, }; return components; diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java index eb28690f12..1d15a16fcd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java @@ -236,24 +236,24 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { protected java.util.List refreshList(HashMap map) { java.util.List list = new ArrayList(); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Mail"), new EmailJavaScript(), VanChartEmailPane.class)); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Web"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Mail"), new EmailJavaScript(), VanChartEmailPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Dynamic_Parameters"), new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class))); list.add(new UIMenuNameableCreator("JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Form"), hyperlink, getUseMap(map, FormHyperlinkProvider.class))); return list; diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java index 7773b9f211..da696fcce7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java @@ -66,6 +66,6 @@ public class VanChartCustomConditionAttrPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java index 97d24338f5..44c0e1a551 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java @@ -36,7 +36,7 @@ public class VanChartBeautyPane extends BasicBeanPane { } protected String[] getNameArray(){ - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"), + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade") }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java index dcd0ba5eb5..4276be541e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java @@ -25,7 +25,7 @@ public class VanChartFloatPositionPane extends BasicBeanPane { this.setLayout(new BorderLayout()); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_XYFromTheUpLeft")), BorderLayout.CENTER); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_From_UpLeft")), BorderLayout.CENTER); this.add(createCustomFloatPositionPane(), BorderLayout.SOUTH); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java index bfc1a2cf4f..012677304a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java @@ -53,7 +53,7 @@ public class VanChartLineTypePane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")),lineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present")),lineStyle}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")),nullValueBreak}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java index f5bc468dda..ca28a6624c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java @@ -55,7 +55,7 @@ public class VanChartTrendLinePane extends BasicPane{ double[] c = {f, p, f, p}; Component[][] periodComps = new Component[][]{ new Component[]{prePeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")), afterPeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward")), null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_After_Period")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Forward")), null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_After_Period")), null}, }; JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c); @@ -66,8 +66,8 @@ public class VanChartTrendLinePane extends BasicPane{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name")), trendLineName}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), trendLineStyle}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), trendLineColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), trendLineType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), trendLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), trendLineType}, new Component[]{label, periodPane} }; @@ -75,7 +75,7 @@ public class VanChartTrendLinePane extends BasicPane{ this.add(panel, BorderLayout.CENTER); } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } public void populate(VanChartAttrTrendLine trendLine) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java index e6dfa45cfa..202df532e9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java @@ -37,7 +37,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Name"); } }); paneList.add(new ColorBackgroundQuickPane()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java index d42b967859..c90fef0a41 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java @@ -44,7 +44,7 @@ public class VanChartBorderPane extends BasicPane { return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java index a9edf4cd54..d185f735a1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java @@ -30,7 +30,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java index f38a167209..f23e0f01ec 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java @@ -29,7 +29,7 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane { return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius} } ; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java index 1d64d257c7..9547808d6f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java @@ -18,6 +18,6 @@ public class CategoryNameFormatPaneWithCheckBox extends VanChartFormatPaneWithCh @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java index 4355bf7f27..35f53e5068 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java @@ -18,7 +18,7 @@ public class PercentFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBo @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); } protected boolean isPercent() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index 7bb9f71d57..3c8591bd63 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -41,7 +41,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ this.setLayout(new BorderLayout()); isSelectedBox = new UICheckBox(getCheckBoxText()); - formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); this.add(isSelectedBox, BorderLayout.CENTER); this.add(formatButton, BorderLayout.EAST); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java index 16388f1dd9..16a40fdef9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java @@ -130,7 +130,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane protected Component[][] getUseComponent() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), markerFillColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius}, }; @@ -138,7 +138,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane protected Component[][] getUseComponentWithOutFillColor() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java index 3e48ed8261..da07def4e5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java @@ -16,11 +16,11 @@ public class OneDimensionalPlotReportDataContentPane extends MeterPlotReportData @Override protected String getCateNameString() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"); } @Override protected String getNValueString() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java index 4b5e3a8138..0c68d6f756 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java @@ -108,7 +108,7 @@ public class AutoRefreshPane extends BasicBeanPane { protected Component[][] initComponent(JPanel autoTooltipPane){ return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds"))}, new Component[]{autoTooltip,null, tooltipSet}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java index 0ddefeb1f5..1e4c5cea76 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java @@ -37,7 +37,7 @@ public class VanChartConditionAttrPane extends AbstractVanChartScrollPane */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 3b85485ad2..664b3d8cf6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -74,7 +74,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Tab"); } @Override @@ -121,11 +121,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { zoomType = new UIButtonGroup(getNameArray(), getValueArray()); zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); - JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget); + JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Widget"), zoomWidget); JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Boundary")), zoomResize}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_From")), from}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_To")), to}, }; @@ -143,12 +143,12 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { checkZoomPane(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Zoom"), panel); } protected JPanel getzoomTypePane(UIButtonGroup zoomType) { - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomType"), zoomType); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Direction"), zoomType); } protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) { @@ -194,8 +194,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected String[] getNameArray() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis") - ,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"),com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis") + ,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}; } protected String[] getValueArray() { @@ -213,7 +213,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { Component[][] components = createToolBarComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ToolBar"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ToolBar"), panel); } protected double[] getToolBarRowSize () { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java index e028c6e318..706a9cb75c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java @@ -39,7 +39,7 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"); } public void setDefault() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java index 4ec723f197..d4668d5c5f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java @@ -39,7 +39,7 @@ public class VanChartTooltipConditionPane extends AbstractNormalMultiLineConditi * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Point_Tooltip"); } public void setDefault() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java index 9464654077..328d7fcacb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java @@ -16,7 +16,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } @Override @@ -34,7 +34,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } @Override 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 d07d86ce6d..c1b43e946d 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 @@ -78,7 +78,7 @@ public class VanChartPlotLegendPane extends BasicPane { } protected void initComponents(){ - isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Visible")); legendPane = createLegendPane(); double p = TableLayout.PREFERRED; @@ -151,8 +151,8 @@ public class VanChartPlotLegendPane extends BasicPane { } protected JPanel createTitlePositionPane(double[] row, double[] col){ - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Bottom"), - com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Chart-Right_Top")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Bottom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Right_Top")}; Integer[] valueArray = {Constants.TOP, Constants.BOTTOM, Constants.LEFT, Constants.RIGHT, Constants.RIGHT_TOP}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_top.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_bottom.png"), @@ -169,7 +169,7 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),location}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),location}, new Component[]{null,customFloatPositionButton} }; @@ -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("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } private void initPositionListener(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 6cb4567c37..64d5fe357d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -81,7 +81,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { } private void initComponents() { - isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Title_Is_Visible")); + isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; @@ -159,7 +159,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } private JPanel createTitleStylePane(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java index beaf751e72..eda8ea007d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java @@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll protected void initLayout() { this.setLayout(new BorderLayout(0,6)); - JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type"),jcb); + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type"),jcb); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java index 2bf7ef516f..ca9419c427 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -134,7 +134,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),titleContent}, new Component[]{null,titleUseHtml}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position")),titleAlignPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),titleAlignPane}, new Component[]{titleTextAttrPane,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),titleTextRotation}, }; @@ -161,7 +161,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); @@ -169,7 +169,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { labelGapValue = new UITextField(); Component[][] gapComponents = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), labelTextRotation}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelGapStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelGapStyle}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col); labelGapValuePane= TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText(""),labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); @@ -238,8 +238,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),axisLineColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),mainTick}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),secondTick}, }; @@ -255,14 +255,14 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); } private String[] getAxisPositionNameArray(boolean isXAxis){ if(isXAxis){ return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; } else { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; } } @@ -327,7 +327,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); } protected FormatPane createFormatPane(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java index de77633651..3a43866a23 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java @@ -82,7 +82,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private JPanel createValueDefinition(){ timeMinMaxValuePane = new TimeMinMaxValuePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), timeMinMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), timeMinMaxValuePane); } @Override @@ -165,8 +165,8 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { secTickPane.add(secondUnitField); secTickPane.add(secondType); - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java index 7bc4da6da5..39ae32372f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java @@ -63,7 +63,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { protected JPanel createMinMaxValuePane(double[] row, double[] col){ JPanel panel = createCommenValuePane(row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), panel); } protected JPanel createCommenValuePane(double[] row, double[] col){ initMinMaxValuePane(); @@ -120,7 +120,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Axis"); } public void populateBean(VanChartAxis axis){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java index f6ac2a3d51..9460e6ac20 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java @@ -105,7 +105,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java index def5e149e7..e1367371e3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java @@ -60,8 +60,8 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane { @Override protected Component[][] getPanelComponents() { - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java index a5d1d5c485..e047830291 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java @@ -77,7 +77,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelPanel = new JPanel(new BorderLayout()); labelPanel.add(labelTextAttrPane); @@ -108,7 +108,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { minMaxValuePane = new VanChartMinMaxValuePane(); break; } - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), minMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), minMaxValuePane); } private JPanel createTickColorPane(double[] row, double[] col){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java index face171416..c69fc9b52e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java @@ -40,8 +40,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),axisLineColor}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java index 0727cd4d0e..f7567ed211 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java @@ -60,14 +60,14 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - valueStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing"), + valueStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")}); JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize); tableDataPane = new RadarTableDataPane(); centerPane = new JPanel(new CardLayout()); - centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing")); + centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")); centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")); JPanel contentPane = new JPanel(new BorderLayout()); @@ -80,7 +80,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { } }); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), contentPane); contentPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); return panel; } @@ -88,8 +88,8 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), axisLineStyle}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor}, }; } @@ -101,7 +101,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { if (centerPane != null && valueStyle != null) { CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (valueStyle.getSelectedIndex() == 0) { - cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")); } else { cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java index 7d55280505..833a9b66f5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java @@ -25,7 +25,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - return new ChartNameObjectCreator[]{new ChartNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")}, + return new ChartNameObjectCreator[]{new ChartNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java index 95e6a48a46..867b3c1498 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java @@ -26,7 +26,7 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")}, + return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index 58d122ff16..282ad45129 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -103,10 +103,10 @@ public class VanChartAlertValuePane extends BasicBeanPane { protected Component[][] getTopPaneComponents() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),alertAxis}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),alertLineColor}, }; } @@ -116,11 +116,11 @@ public class VanChartAlertValuePane extends BasicBeanPane { double[] columnSize = {p,p}; double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),alertTextPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")),fontName}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),fontColor}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java index 7826866d45..08c474c3ed 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java @@ -66,14 +66,14 @@ public class VanChartAxisAreaPane extends BasicBeanPane { verticalGridLine = new ColorSelectBox(100); Component[][] components = getGridLinePaneComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), panel); } protected Component[][] getGridLinePaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal")), horizontalGridLine}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")), verticalGridLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal")), horizontalGridLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")), verticalGridLine}, }; } @@ -108,7 +108,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } }); JPanel intervalPane = new JPanel(new BorderLayout(0, 6)); - JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back"), isDefaultIntervalBackground); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background"), isDefaultIntervalBackground); intervalPane.add(panel1, BorderLayout.NORTH); intervalPane.add(centerPane, BorderLayout.CENTER); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background"), intervalPane); @@ -123,8 +123,8 @@ public class VanChartAxisAreaPane extends BasicBeanPane { protected Component[][] getIntervalPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal")), horizontalColorBackground}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")), verticalColorBackground}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal")), horizontalColorBackground}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")), verticalColorBackground}, }; } 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 4e14640639..81aa8d276d 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 @@ -67,11 +67,11 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { label1.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); periodPane.add(label1, BorderLayout.WEST); periodPane.add(period, BorderLayout.CENTER); - periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second")), BorderLayout.EAST); + periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second")), BorderLayout.EAST); return periodPane; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java index 70cdcc399f..9c97236352 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java @@ -31,7 +31,7 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stack_And_Series"); } protected String getAddItemText() { @@ -96,6 +96,6 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl } public String getPaneTitle() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stack_And_Series"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java index 66607f8831..4f5ab5e21d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java @@ -112,6 +112,6 @@ public class DrillMapDataPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Data"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java index c08a67a656..6fd6ecabbc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java @@ -198,6 +198,6 @@ public class DrillMapLayerPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Drill_Level"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java index 1d0cf31770..9423434bd1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java @@ -18,7 +18,7 @@ import java.util.ArrayList; */ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Map"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map"); @Override protected String[] getTypeIconPath() { @@ -41,9 +41,9 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomDrillMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map") }; } @@ -74,7 +74,7 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Map"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java index a5b90d23bf..0ca6b0a71a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java @@ -15,6 +15,6 @@ public class FunnelPercentFormatPaneWithCheckBox extends PercentFormatPaneWithCh } protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java index e5067699cf..a6a8dcb9a9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java @@ -66,7 +66,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane { JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } public void populateBean(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java index 88a97ff28b..cfcb352f48 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/10/10. */ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewFunnel"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); @Override protected String[] getTypeIconPath() { @@ -25,7 +25,7 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel") }; } @@ -46,7 +46,7 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewFunnel"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java index 7b14f9dd72..08b50d6e11 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java @@ -34,7 +34,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane dataPane = new NormalChartDataPane(listener, parent){ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart"); } }; linkPane = new NormalChartDataPane(listener, parent){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java index 0b31d7a19c..01e8e70e71 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java @@ -42,15 +42,15 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{ private void initAllComponent() { seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); - startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")); + startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time")); - endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")); + endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time")); markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")); - progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")); + progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process")); - linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")); + linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_ID")); } private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java index 85227cd4a1..14691049a1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java @@ -25,7 +25,7 @@ public class GanttReportDataProjectPane extends AbstractReportDataContentPane im private List processPaneList = new ArrayList(); public GanttReportDataProjectPane() { - firstProcessPane = new TinyFormulaWithButtonPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"), "/com/fr/design/images/buttonicon/add.png") { + firstProcessPane = new TinyFormulaWithButtonPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"), "/com/fr/design/images/buttonicon/add.png") { @Override protected void buttonEvent(TinyFormulaWithButtonPane pane) { addProcessPane(); @@ -69,7 +69,7 @@ public class GanttReportDataProjectPane extends AbstractReportDataContentPane im private void addProcessPane() { int index = processPaneList.size(); - String content = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items") + (index + 1); + String content = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Items") + (index + 1); TinyFormulaWithButtonPane stepPane = createTinyFormulaWithButtonPane(content); stepPane.registerChangeListener(listener); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java index e651bd93a6..b8a2001147 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java @@ -24,7 +24,7 @@ import java.util.List; * Created by hufan on 2017/1/10. */ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ - private static final String NONE = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"); + private static final String NONE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"); private UIComboBox seriesComboBox; private UIComboBox startTimeComboBox; @@ -69,11 +69,11 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")), startTimeComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")), endTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time")), startTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time")), endTimeComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")), markerTimeComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")), processComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")), taskIDComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process")), processComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_ID")), taskIDComboBox} }; return TableLayoutHelper.createGapTableLayoutPane(components, row, col,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java index d49883b436..c1cb298276 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java @@ -40,7 +40,7 @@ public class GanttTableDataProjectPane extends AbstractTableDataContentPane impl projectName = new ComboBoxWithButtonPane(){ @Override protected String getTitleText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java index 1d7a359317..51e045edfb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java @@ -36,7 +36,7 @@ public class GanttAxisStylePane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{textAttrPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelectBox4button}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelectBox4button}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java index c3c3392da1..c642c3e130 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java @@ -93,7 +93,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Proportion"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-DataFunction_Percent"), jPanel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Percent"), jPanel); } private void checkoutPaneVisible() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java index 458e7543e5..e2c4799fe4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java @@ -28,7 +28,7 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane { return new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape")), getMarkerPane()}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelect} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java index a08afc5eb6..92a688a71f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java @@ -70,7 +70,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelect} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java index 874c5887f6..6bff1d5708 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java @@ -40,27 +40,27 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time"); } }; endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time"); } }; durationFormatPane = new VanChartFormatComBoxWithCheckBox(); progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process"); } }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java index cb792743d1..a9c8bbdabb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by hufan on 2017/1/9. */ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt"); @Override protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/gantt/images/gantt.png" @@ -22,7 +22,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart") }; } @@ -36,7 +36,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java index e4df563c67..f49752b1c9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/27. */ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); private static final long serialVersionUID = -4599483879031804911L; @@ -28,11 +28,11 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Pointer"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Pointer180"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Ring"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Slot"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Cuvette") + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer180"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Ring"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Slot"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Cuvette") }; } @@ -41,7 +41,7 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java index 783717f2ca..79509aee25 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java @@ -66,7 +66,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createGaugeLayoutPane() { - gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")}); + gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override @@ -74,7 +74,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { changeLabelPosition(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } private void changeLabelPosition() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java index 455cd5d755..f4c7bd4769 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java @@ -117,7 +117,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java index 8f717c2214..fd6cf6d19e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java @@ -16,7 +16,7 @@ import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane; * Created by Mitisky on 16/10/20. */ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); @Override protected String[] getTypeIconPath() { @@ -27,7 +27,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HeatMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_HeatMap") }; } @@ -48,7 +48,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java index 7c462d1358..17f6042d8a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java @@ -12,9 +12,9 @@ import java.awt.Component; public class VanChartLineCustomStackAndAxisConditionPane extends VanChartCustomStackAndAxisConditionPane { protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")),XAxis}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")),YAxis}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked")),isStacked}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),YAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked")),isStacked}, }; return components; diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java index 5de757af83..9dac6fbe35 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/5. */ public class VanChartLinePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -26,9 +26,9 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Line"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -37,7 +37,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java index 5e7a651fc4..df23244ccb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java @@ -51,8 +51,8 @@ import java.awt.event.ItemListener; * 地图-系列界面 */ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { - private static final String AREA_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Area"); - private static final String POINT_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point"); + private static final String AREA_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region"); + private static final String POINT_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Point"); private static final String LINE_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flow"); private static final String[] MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(), diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java index 95f6922391..35f3046d9e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java @@ -10,8 +10,8 @@ import javax.swing.JPanel; * 点地图和区域地图的各种配置 */ public class VanMapAreaAndPointGroupPane extends VanChartGroupPane { - private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"); - private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"); + private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"); public VanMapAreaAndPointGroupPane(JPanel areaPane, JPanel pointPane) { super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING}, new JPanel[]{areaPane, pointPane}); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java index bd9a502928..569d0850cb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java @@ -12,9 +12,9 @@ import javax.swing.border.Border; * 点地图和区域地图的各种配置 */ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane { - private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"); - private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"); - private static final String LINE_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineMap"); + private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"); + private static final String LINE_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LineMap"); public VanMapAreaPointAndLineGroupPane(final JPanel areaPane, final JPanel pointPane, final JPanel linePane){ super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING, LINE_MAP_STRING}, new JPanel[]{areaPane, pointPane, linePane}); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java index 59c22771f6..f8fc771828 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java @@ -16,7 +16,7 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { protected Component[][] getComponent () { return new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitude}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Latitude")), latitude}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaName} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java index 59d7af22ba..f03cda28ac 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java @@ -40,8 +40,8 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaName} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java index af52884a40..bb0f7a5bbe 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java @@ -21,7 +21,7 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { protected Component[][] getComponent () { return new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitudeCom}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Latitude")), latitudeCom}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaNameCom} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java index 7cbf2ca501..68e71f7e3e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java @@ -42,8 +42,8 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitudeCom}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitudeCom}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaNameCom} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java index 111dd57e94..3de16e047a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java @@ -58,8 +58,8 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte @Override protected String[] columnNames() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value") }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java index ae9cee5da9..3f82744eab 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java @@ -99,7 +99,7 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,12,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java index 7cebaea4a2..40ea3fe3a3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java @@ -124,7 +124,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,30,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java index a4cae47376..76a47afd84 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java @@ -36,10 +36,10 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineMap"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LineMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Map") }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java index 1758622a92..43fcb5df0d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -317,9 +317,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private void refreshZoomLevel(){ //gis图层不同，对应的缩放等级不同。 ZoomLevel[] levels; - if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Blue"))) { + if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) { levels = BLUE_ZOOM_LEVELS; - } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_GaoDe"))) { + } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) { levels = GAODE_ZOOM_LEVELS; } else { levels = ZOOM_LEVELS; @@ -402,7 +402,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { if(list != null && list.size() > 0) { resetWMSLayerPane(list); } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Invalid_WMS")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Invalid_WMS")); } } }.execute(); @@ -485,8 +485,8 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { final JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps,rowSize,columnSize); Component[][] longAndLatComps = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude} }; longAndLatPane =TableLayout4VanChartHelper.createGapTableLayoutPane(longAndLatComps,rowSize,column); longAndLatPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java index 59724280b7..fadef10db7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java @@ -14,7 +14,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Fangjie on 2016/6/15. */ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); @Override protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/multilayer/image/multiPie.png" @@ -24,7 +24,7 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPieChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Chart") }; } @@ -35,7 +35,7 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { @Deprecated public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java index 64ef68006d..12eba5581a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java @@ -92,9 +92,9 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent nameField.setPreferredSize(new Dimension(WD, HT)); Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level_Number")), levelNumEdit}, }; return TableLayoutHelper.createTableLayoutPane(components_north, rowSize_north, columnSize_north); @@ -137,7 +137,7 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent value = new TinyFormulaPane(); components_center[levelNum] = new Component[]{new JSeparator(), null}; - components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), value}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), value}; registerListener4Center(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java index 597089812c..fddef0ec55 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java @@ -71,7 +71,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa for (int i = 0; i < levelNum; i++){ levelNameList.add(new UIComboBox()); levelNameList.get(i).setPreferredSize(new Dimension(WD, HT)); - levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } } @@ -112,8 +112,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa calculateCombox.setPreferredSize(new Dimension(WD, HT)); components_center[levelNum] = new Component[]{getJSeparator(), null}; - components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), value}; - components_center[levelNum+2] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), value}; + components_center[levelNum+2] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox}; initCenterItemListener(); @@ -180,9 +180,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa nameField = new UITextField(); Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField}, new Component[]{getJSeparator(),null }, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level_Number")), levelNumEdit}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north); @@ -242,7 +242,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa columnNameList = list; for (int i = 0; i < levelNum; i++) { refreshBoxItems(levelNameList.get(i), list); - levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } refreshBoxItems(value, list); } @@ -326,7 +326,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa for (int i = 0; i < levelNameList.size(); i++){ if(!definition.hasLevelIndex(i) || ComparatorUtils.equals(levelColumnNameList.get(i), StringUtils.EMPTY)) { - levelNameList.get(i).setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } else if(definition.hasLevelIndex(i) && !this.boxItemsContainsObject(levelNameList.get(i),levelColumnNameList.get(i))){ levelNameList.get(i).setSelectedItem(null); }else { diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java index 0008114a09..f5d5c4ea47 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java @@ -16,6 +16,6 @@ public class MultiPieLevelNameFormatPaneWithCheckBox extends CategoryNameFormatP @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java index 0925836b47..59cd774973 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java @@ -18,6 +18,6 @@ public class MultiPieSeriesNameFormatPaneWithCheckBox extends SeriesNameFormatPa @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java index 94652696f0..610f6417e1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * 饼图(新特性) 属性表 选择类型 布局界面. */ public class VanChartPiePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); private static final long serialVersionUID = 6163246902689597259L; @@ -28,8 +28,8 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SameArcPie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SameArc_Pie"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DifferentArcPie") }; } @@ -39,7 +39,7 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java index 5f081a3bb5..3123cf6069 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/12/28. */ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar"); private static final long serialVersionUID = -4599483879031804911L; @@ -26,8 +26,8 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radar"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackColumnTypeRadar") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StackColumn_Radar") }; } @@ -36,7 +36,7 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java index c1ffd5f14e..6838969229 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java @@ -66,7 +66,7 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane { radarType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Circle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polygonal")}, new String[]{RadarType.CIRCLE.getType(), RadarType.POLYGON.getType()}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape"), radarType); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"), panel); } protected VanChartLineTypePane getLineTypePane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java index 7a34ac565c..b930c689d0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java @@ -74,7 +74,7 @@ public class GradualIntervalConfigPane extends JPanel{ return new Component[][]{ new Component[]{minMaxValuePane, null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), colorSelectBox}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), numberDragPane}, new Component[]{null, legendGradientBar}, }; } @@ -82,7 +82,7 @@ public class GradualIntervalConfigPane extends JPanel{ protected Component[][] getPaneComponentsWithOutTheme(){ return new Component[][]{ new Component[]{minMaxValuePane, null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), numberDragPane}, new Component[]{null, legendGradientBar}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java index 17ae768568..79038cdd79 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java @@ -74,7 +74,7 @@ public class LegendLabelFormatPane extends JPanel{ }); labelFormatStyle.setSelectedIndex(0); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java index 5aa474b45b..94bb9a4dae 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java @@ -29,7 +29,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula { return new Component[][]{ new Component[]{null,null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), getFillStyleCombox()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), getRegionNumPane()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java index d4a9055be7..eff5060620 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java @@ -48,7 +48,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF @Override protected Component[][] createComponents() { - numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")); + numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")); setRegionVisible(false); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java index 15879ff14c..e0de77fc86 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java @@ -17,7 +17,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/2/16. */ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter"); private static final long serialVersionUID = -3481633368542654247L; @@ -30,7 +30,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_XYScatter") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter") }; } @@ -39,7 +39,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java index 7bc731243f..b9dac828c6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java @@ -33,7 +33,7 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane { Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")), lineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present")), lineStyle}, }; return TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java index 584605745b..6bbec6b93b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java @@ -19,17 +19,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT protected void initBubbleSize() { bubbleSize = new UIComboBox(); bubbleSize.setPreferredSize(new Dimension(100, 20)); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override protected void refreshBoxListWithSelectTableData(java.util.List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override @@ -38,17 +38,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override protected void populateBubbleSize(BubbleTableDefinition definition) { - if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"))){ - bubbleSize.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"))){ + bubbleSize.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); }else { combineCustomEditValue(bubbleSize, definition.getBubbleSize()); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java index a7d84c3d69..3f3529e7ac 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java @@ -62,7 +62,7 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java index a49e410b67..dfb1a820ba 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java @@ -40,11 +40,11 @@ public class StructurePlotReportDataContentPane extends AbstractReportDataConten nodeValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeID}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Parent_ID")), parentID}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value")), nodeValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parentID}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java index d31319e225..bc1f7f73b1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java @@ -45,12 +45,12 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP calculateCombox = new CalculateComboBox(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeId}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Parent_ID")), parenrId}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value")), nodeValue}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parenrId}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java index 824c8d63d8..af4d721756 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java @@ -35,13 +35,13 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java index 1f53dd0712..b9e5427112 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -82,7 +82,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), linkColor}, new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), linkOpacity} }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java index dcfb74ad8a..63490eaffa 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java @@ -35,13 +35,13 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java index 6631db4d8d..39d024c3f1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java @@ -26,9 +26,9 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Vertical_Structure"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Structure"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radial_Structure") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Vertical_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radial_Structure") }; } @@ -44,7 +44,7 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewStructure"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Structure"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java index abe843eee6..b21f9dc79a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java @@ -12,7 +12,7 @@ import com.fr.van.chart.multilayer.VanChartMultiPiePlotPane; * Created by Fangjie on 2016/7/11. */ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_TreeMap"); protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/treemap/images/treeMap.png" }; @@ -21,7 +21,7 @@ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TreeMapChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TreeMap_Chart") }; } @@ -32,7 +32,7 @@ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_TreeMap"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java index a225ecea36..e6e89c0d93 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java @@ -87,7 +87,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"),com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}; } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java index 493c4ca0da..d95a9ddc19 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java @@ -36,9 +36,9 @@ public class WordCloudPlotReportDataContentPane extends AbstractReportDataConten wordValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), name}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name")), wordName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value")), wordValue} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Value")), wordValue} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java index 9d220de440..e7f5f2af08 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java @@ -43,10 +43,10 @@ public class WordCloudPlotTableDataContentPane extends AbstractTableDataContentP Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), name}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name")), wordName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value")), wordValue}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Value")), wordValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java index 0af05be11a..d5ab61b950 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java @@ -128,7 +128,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } private JPanel createCloudShapePane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java index f5213816dd..08845b2b7a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java @@ -25,19 +25,19 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Value"); } }; percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java index bf10c1b743..d2d505caf8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/11/29. */ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud"); @Override protected String[] getTypeIconPath() { return new String[]{ @@ -24,7 +24,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WordCloud") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud") }; } @@ -45,7 +45,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index e3d74766dd..1ef4267ce5 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -115,7 +115,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index df250a0ac7..f6cfc57fc1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -144,7 +144,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide // 这个条件说明是否加载了图表模块 if (wo != null && wo.length > 0) { - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Click_Me")); chartButton.addMouseListener(new MouseAdapter() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellPresentPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellPresentPane.java index a5dc3e0cf3..e1c68b51e9 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellPresentPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellPresentPane.java @@ -111,7 +111,7 @@ public class CellPresentPane extends AbstractCellAttrPane { * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"); } public void setSelectedByIds(int level, String... id) { From 514f78cc2fa9380588d5781c93733a5090723de9 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Wed, 15 Aug 2018 00:00:55 +0800 Subject: [PATCH 2/2] d0814 --- .../java/com/fr/design/javascript/JavaScriptImplPane.java | 2 +- .../src/main/java/com/fr/design/menu/KeySetUtils.java | 2 +- .../main/java/com/fr/design/style/color/TransparentPane.java | 2 +- .../java/com/fr/design/designer/creator/XChartEditor.java | 2 +- .../main/java/com/fr/design/mainframe/WidgetToolBarPane.java | 2 +- .../java/com/fr/design/actions/cell/NewPresentAction.java | 2 +- .../java/com/fr/design/condition/PresentHighlightPane.java | 4 ++-- .../fr/design/mainframe/cell/settingpane/CellPresentPane.java | 4 ++-- .../src/main/java/com/fr/design/present/PresentPane.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index aa4195f0be..db4ef89c06 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { itemNameTextField = new UITextField(); JPanel topPane = GUICoreUtils.createBorderLayoutPane( - GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Name") + ":"), BorderLayout.NORTH, + GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH, importedJsPane, BorderLayout.CENTER, parameterPane, BorderLayout.EAST ); diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 6217b0acb8..f220b46a0b 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -776,7 +776,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index be6c2a96b3..f9d9658c5e 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java @@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane { // richer:能否拖动 if (isSupportTransparent) { - UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Transparent")); + UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); transparentButton.addActionListener(new TransparentActionListener()); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index 1ef4267ce5..8045ed8ec7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -115,7 +115,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index f6cfc57fc1..66093d7d48 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -144,7 +144,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide // 这个条件说明是否加载了图表模块 if (wo != null && wo.length > 0) { - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Click_Me")); chartButton.addMouseListener(new MouseAdapter() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java index ad669ca0df..3ea8d984b2 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java @@ -26,7 +26,7 @@ public class NewPresentAction extends PresentCheckBoxAction { @Override public boolean executeActionReturnUndoRecordNeeded() { if (!ComparatorUtils.equals(this.itemName, "NOPRESENT")) { - CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"), this.itemName); + CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"), this.itemName); } else { TemplateCellElement ce = getSelectedCellElement(); // 只有原来ce设置了形态的情况下才有undo操作 diff --git a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java index 9c1ef42dff..6961b06c13 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java @@ -33,7 +33,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } public void setSelectedByName(String radioName) {