From ce1a0f57e6793a0e332a591fc52755d61ecf0f8b Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Fri, 3 Aug 2018 19:02:10 +0800 Subject: [PATCH 1/6] modify i18n parts on 0803 --- .../mainframe/chart/gui/ChangeConfigPane.java | 6 +++--- .../style/datalabel/ChartLabelFontPane.java | 2 +- .../gui/style/series/MeterSeriesPane.java | 4 ++-- .../chart/bubble/VanChartBubbleSeriesPane.java | 2 +- .../bubble/component/VanChartBubblePane.java | 2 +- .../VanChartCustomPlotSelectPane.java | 2 +- .../com/fr/van/chart/designer/PlotFactory.java | 2 +- .../designer/component/VanChartBeautyPane.java | 2 +- .../component/VanChartTrendLinePane.java | 2 +- .../background/VanChartBackgroundPane.java | 2 +- ...artBackgroundPaneWithOutImageAndShadow.java | 2 +- ...tBackgroundWithOutShadowWithRadiusPane.java | 2 +- .../border/VanChartBorderWithAlphaPane.java | 2 +- .../ChangedPercentFormatPaneWithCheckBox.java | 2 +- .../chart/designer/other/AutoRefreshPane.java | 2 +- .../other/VanChartInteractivePane.java | 6 +++--- .../item/VanChartBubbleSetConditionPane.java | 4 ++-- .../designer/style/VanChartPlotLegendPane.java | 10 +++++----- .../designer/style/VanChartTitlePane.java | 4 ++-- .../style/axis/VanChartBaseAxisPane.java | 18 +++++++++--------- .../gauge/VanChartGaugeDetailAxisPane.java | 2 +- .../axis/radar/RadarTableContentPane.java | 4 ++-- .../background/AlertLineListControlPane.java | 6 +++--- .../background/BackgroundListControlPane.java | 2 +- .../background/VanChartAlertValuePane.java | 12 ++++++------ .../background/VanChartAreaBackgroundPane.java | 8 ++++---- .../style/background/VanChartAxisAreaPane.java | 2 +- .../VanChartCustomIntervalBackgroundPane.java | 4 ++-- .../style/datasheet/VanChartDataSheetPane.java | 2 +- .../label/VanChartGaugeLabelDetailPane.java | 2 +- .../label/VanChartGaugePlotLabelPane.java | 4 ++-- .../label/VanChartPlotLabelDetailPane.java | 6 +++--- .../series/VanChartAbstractPlotSeriesPane.java | 4 ++-- .../VanChartStackedAndAxisListControlPane.java | 3 +-- .../VanChartPlotRefreshTooltipPane.java | 4 ++-- .../style/tooltip/VanChartPlotTooltipPane.java | 6 +++--- .../comp/SingleLayerDataDefinitionPane.java | 2 +- .../other/VanChartDrillMapInteractivePane.java | 2 +- .../style/VanChartFunnelSeriesPane.java | 2 +- .../style/axis/GanttAxisStylePane.java | 2 +- .../style/axis/GanttProcessAxisPane.java | 2 +- .../chart/gauge/VanChartGaugeSeriesPane.java | 2 +- .../style/VanChartHeatMapSeriesPane.java | 4 ++-- .../van/chart/map/VanChartMapSeriesPane.java | 8 ++++---- .../VanChartBorderWithAlphaConditionPane.java | 4 ++-- .../type/VanChartMapSourceChoosePane.java | 2 +- .../van/chart/map/line/VanChartCurvePane.java | 4 ++-- .../map/line/VanChartLineMapEffectPane.java | 2 +- .../fr/van/chart/pie/RadiusCardLayoutPane.java | 2 +- .../desinger/style/StructureNodeStylePane.java | 6 +++--- .../style/VanChartStructureSeriesPane.java | 4 ++-- .../style/VanChartWordCloudSeriesPane.java | 2 +- 52 files changed, 99 insertions(+), 100 deletions(-) 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 c4acd4099..9e7d1b48d 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 @@ -110,7 +110,7 @@ public class ChangeConfigPane extends BasicBeanPane { switchStyleGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hide")}); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Arrow_Style")), switchStyleGroup, null}, + 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("Background")),colorSelectBox4carousel, null} }; @@ -160,8 +160,8 @@ public class ChangeConfigPane extends BasicBeanPane { } private void initButtonGroup() { - configStyleButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Button_Style"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Carousel_Style")}); + configStyleButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Button_Style"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Carousel_Style")}); configStyleButton.setPreferredSize(new Dimension(WIDTH * 2, (int) configStyleButton.getPreferredSize().getHeight())); configStyleButton.addActionListener(new ActionListener() { @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java index 970e7889d..0bba886b5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java @@ -92,7 +92,7 @@ public class ChartLabelFontPane extends BasicScrollPane { private class ContentPane extends JPanel { private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); - private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Units")); + private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units")); public ContentPane() { this.initComponents(); 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 19602d5c2..859c8b556 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 @@ -78,7 +78,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("Unit") + ":", SwingUtilities.LEFT), unit}, + 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}, new Component[]{colorPickerPane, null}, @@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return components; } else { components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Unit") + ":", SwingUtilities.LEFT), unit}, + 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}, new Component[]{colorPickerPane, null}, diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java index 9ee1b77ac..01c72649d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java @@ -78,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createBubblePane() { bubblePane = new VanChartBubblePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"), bubblePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"), bubblePane); } protected void populateCondition(ConditionAttr defaultAttr){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java index f6de6f645..a51f91047 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java @@ -78,6 +78,6 @@ public class VanChartBubblePane extends BasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java index 850869f86..c037e182d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java @@ -35,7 +35,7 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane { private static final int CUSTOM_TYPE_NUM = 4; - public static final String MASSAGE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_At_Least_One_Chart"); + public static final String MASSAGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_Least_One_Chart"); private List customTypeList = new ArrayList(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java index db55cb49b..d5eb3e754 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java @@ -343,7 +343,7 @@ public class PlotFactory { JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value instanceof Integer) { String text = ComparatorUtils.equals(value, FormatField.FormatContents.NULL) - ? com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto") + ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto") : FormatField.getInstance().getName((Integer) value); label.setText(" " + text); } 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 75e6ce03b..a5ee0ce44 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 @@ -37,7 +37,7 @@ public class VanChartBeautyPane extends BasicBeanPane { protected String[] getNameArray(){ return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_TopDownShade") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade") }; } @Override 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 b18e35ae4..f5bc468dd 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("Plugin-ChartF_After_Period")), null}, + 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}, }; JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java index 7702d9f9d..c7484ced9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java @@ -101,7 +101,7 @@ public class VanChartBackgroundPane extends BasicPane { new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow}, }; } 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 1031e4aec..ab469c02a 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 @@ -49,7 +49,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro return new Component[][]{ new Component[]{typeComboBox, null}, new Component[]{centerPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java index 6caa79e48..212eb9959 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java @@ -25,7 +25,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius} }; } 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 8a9f5525b..69124e03d 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 @@ -31,7 +31,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ 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("Plugin-ChartF_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java index 4f4441a6f..75476632e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java @@ -16,7 +16,7 @@ public class ChangedPercentFormatPaneWithCheckBox extends VanChartFormatPaneWith @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Percent"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Percent"); } protected boolean isPercent() { 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 47987fa5a..4b5e3a813 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 @@ -68,7 +68,7 @@ public class AutoRefreshPane extends BasicBeanPane { autoRefreshTime = new UISpinner(0, Integer.MAX_VALUE, 1, 0); - autoTooltip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto_Tooltip")); + autoTooltip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Tooltip")); autoTooltip.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { 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 2d8c579ee..ca3d7c18f 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 @@ -178,7 +178,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Reversal")),axisRotation} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Axis"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis"), panel); } private void checkZoomEnabled() { @@ -241,8 +241,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createAnimationPane(){ isChartAnimation = 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 panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation_Effects"), isChartAnimation); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), panel); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Effects"), isChartAnimation); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation"), panel); } protected JPanel createAutoRefreshPane(VanChartPlot plot){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java index ae78715e7..9a05188d3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java @@ -18,7 +18,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } @Override @@ -37,7 +37,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi */ @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); } @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 2ab35fbc8..83d2c8602 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 @@ -118,8 +118,8 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), createDisplayStrategy()),null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -143,8 +143,8 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel),null}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -235,7 +235,7 @@ public class VanChartPlotLegendPane extends BasicPane { limitSizeTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion")); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Size"),limitSize); maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); 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 c516c08d2..7d09b1e5c 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 @@ -119,7 +119,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { new Component[]{createTitleContentPane(new double[]{p,p,p},column),null}, new Component[]{createTitlePositionPane(new double[]{p,p,p},column),null}, new Component[]{createTitleStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, new Component[]{createDisplayStrategy(),null} }; @@ -171,7 +171,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { maxProportion = new UISpinner(0,100,1,30); limitSize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")}); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Size"),limitSize); maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); 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 d7ca0a080..384db7031 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 @@ -165,7 +165,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { labelTextAttrPane = getChartTextAttrPane(); labelTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); - labelGapStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")}); + labelGapStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")}); labelGapValue = new UITextField(); Component[][] gapComponents = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), labelTextRotation}, @@ -182,7 +182,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{gapPanel,null}, }; - JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel"),showLabel); + JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"),showLabel); labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); labelPanel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0)); showLabel.addActionListener(new ActionListener() { @@ -228,7 +228,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { secondTick = new UIButtonGroup(strings, values); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLineStylePaneComponents(), row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLineStyle"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Line_Style"), panel); } protected LineComboBox createLineComboBox() { @@ -250,7 +250,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { reversed = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false}); Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel_Position")),position}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),position}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")),reversed}, } ; @@ -260,9 +260,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { private String[] getAxisPositionNameArray(boolean isXAxis){ if(isXAxis){ - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisVerticalZero")}; + 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("Plugin-ChartF_AxisVerticalZero")}; + 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")}; } } @@ -278,7 +278,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { maxProportion = new UISpinner(0,100,1,30); axisLimitSize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")}); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),axisLimitSize); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Size"),axisLimitSize); maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); @@ -314,7 +314,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel_Format"), SwingConstants.LEFT), valueFormatStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle}, new Component[]{null, centerPane}, }; JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); @@ -403,7 +403,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { */ @Override public String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Axis"); } /** 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 5693cc0c1..a5d1d5c48 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 @@ -83,7 +83,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { labelPanel.add(labelTextAttrPane); labelPanel.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); JPanel panel = new JPanel(new BorderLayout(0, 6)); - panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel"), showLabel), BorderLayout.NORTH); + panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"), showLabel), BorderLayout.NORTH); panel.add(labelPanel, BorderLayout.CENTER); showLabel.addActionListener(new ActionListener() { @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java index 5d06ea539..97ca27469 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java @@ -53,7 +53,7 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { double[] col = {p, f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Category") + ":", SwingConstants.RIGHT), categoryNameComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category") + ":", SwingConstants.RIGHT), categoryNameComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} }; @@ -121,7 +121,7 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { maxValueComboBox.setEnabled(hasUse); } public void addAutoItem(){ - Object autoItem = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"); + Object autoItem = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto"); minValueComboBox.addItem(autoItem); maxValueComboBox.addItem(autoItem); minValueComboBox.setSelectedItem(autoItem); 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 85327a52f..428d20a13 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 @@ -26,12 +26,12 @@ 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")}, - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"); } protected String getAddItemText() { @@ -53,7 +53,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { List yAxisList = rectanglePlot.getYAxisList(); String[] axisNames = DefaultAxisHelper.getAllAxisNames(rectanglePlot); - ChartNameObjectCreator[] creators = {new ChartNameObjectCreator(getAlertAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, getAlertPaneClass())}; + ChartNameObjectCreator[] creators = {new ChartNameObjectCreator(getAlertAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), VanChartAlertValue.class, getAlertPaneClass())}; refreshNameableCreator(creators); 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 9e03f153a..95e6a48a4 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 @@ -37,7 +37,7 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { @Override public String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Add_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Interval"); } protected ShortCut4JControlPane[] createShortcuts() { 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 bf366b1ed..4f5dff062 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 @@ -65,7 +65,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { alertLineStyle = new LineComboBox(VanChartConstants.ALERT_LINE_STYLE); alertLineColor = new ColorSelectBox(100); - alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom")}); alertText = new TinyFormulaPane(); //設置大小，防止文本過長導致界面“變形” alertText.setPreferredSize(new Dimension(TEXT_WD, HT)); @@ -82,12 +82,12 @@ public class VanChartAlertValuePane extends BasicBeanPane { //警戒线设置 JPanel top = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(top); - top.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertSet") + ":", null)); + top.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Set") + ":", null)); top.add(createTopPane()); //提示文字 JPanel bottom = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(bottom); - bottom.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertText") + ":", null)); + bottom.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Text") + ":", null)); bottom.add(createBottomPane()); } @@ -129,15 +129,15 @@ public class VanChartAlertValuePane extends BasicBeanPane { private void checkPositionPane() { boolean selectXAxis = VanChartAttrHelper.isXAxis(alertAxis.getSelectedItem().toString()); if(selectXAxis){ - alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom")}); } else { - alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLeft"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertRight")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Left"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Right")}); } doLayoutPane(); } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"); } public void populateBean(VanChartAlertValue chartAlertValue){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java index b8b539a3e..48473996f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java @@ -48,8 +48,8 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane { protected JPanel createAlertLinePane() { alertLine = getAlertLinePane(); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), alertLine); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), alertLine); alertLine.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); return panel; } 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 47ec84e1e..f6f5bc55e 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 @@ -57,10 +57,10 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"),formatPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java index 30c45bfdd..3cf057df5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java @@ -21,7 +21,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { } protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) { - style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); textFontPane = initTextFontPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java index a746a0c97..42e6909e9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java @@ -31,10 +31,10 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane { String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Label"); switch (gaugeStyle){ case POINTER: - cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel"); + cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Label"); break; case POINTER_SEMI: - cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel"); + cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Label"); break; default: cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Percent_Label"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java index 82afe8b10..32fb49f08 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java @@ -134,7 +134,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { panel.add(tractionLinePane, BorderLayout.SOUTH); initPositionListener(); } else if(PlotFactory.plotAutoAdjustLabelPosition(plot)){ - panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH); + panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH); } return panel; } @@ -157,7 +157,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { } protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) { - style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); textFontPane =initTextFontPane(); @@ -199,7 +199,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { protected JPanel createBackgroundColorPane() { backgroundColor = new ColorSelectBox(100); - return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundColor); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundColor); } protected String title4PopupWindow() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java index 3b3c1e1dd..b852de900 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java @@ -157,7 +157,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //边框（默认没有圆角） protected JPanel createBorderPane() { borderPane = createDiffBorderPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"), borderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane); } @@ -252,7 +252,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //不透明度 protected JPanel createAlphaPane() { transparent = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), transparent); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), transparent); } //堆积和坐标轴设置(自定义柱形图等用到) 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 2361965c0..70cdcc399 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 @@ -9,7 +9,6 @@ import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; -import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; import com.fr.plugin.chart.base.AttrSeriesStackAndAxis; import com.fr.stable.Nameable; @@ -36,7 +35,7 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl } protected String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Add"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add"); } protected ShortCut4JControlPane[] createShortcuts() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java index 48081a6d7..ade1d85bd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java @@ -73,8 +73,8 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa new Component[]{refreshTooltipContentPane,null}, new Component[]{initDurationPane(),null}, new Component[]{createLabelStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, }; return components; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java index ed0ff49d9..5fd761887 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java @@ -94,8 +94,8 @@ public class VanChartPlotTooltipPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{tooltipContentPane,null}, new Component[]{createLabelStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null}, new Component[]{createDisplayStrategy(plot),null}, }; return components; @@ -107,7 +107,7 @@ public class VanChartPlotTooltipPane extends BasicPane { } protected JPanel createLabelStylePane() { - style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); textFontPane = new ChartTextAttrPane() { protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java index 6c8401249..5ec0e1f4a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java @@ -19,7 +19,7 @@ public class SingleLayerDataDefinitionPane extends FurtherBasicBeanPane { 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("Plugin-ChartF_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent} }; JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col); 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 f8ac57dda..c3c3392da 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 @@ -72,7 +72,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { } private Component createHorizontalProportionPane() { - typeButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); + typeButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); horizontalProportion = new UISpinner(0, 100, 1, 30); JPanel proportionPane = new JPanel(new BorderLayout(5, 0)); 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 7a5b6ee7c..933378f3f 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 @@ -173,7 +173,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { } private void initRotate() { - rotate = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AntiClockWise"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ClockWise")}); + rotate = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AntiClockWise"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ClockWise")}); } private Component[] getInnerPaneBackgroundColor() { 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 1e7dd2279..c6f330fa4 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 @@ -56,7 +56,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { */ @Override protected JPanel getContentInPlotType() { - final UIButtonGroup group = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Point"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background_Area")}); + final UIButtonGroup group = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Point"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background_Area")}); group.setSelectedIndex(0); JPanel backgroundAreaPane = createAreaPane(); @@ -140,7 +140,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), panel); } 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 8cbaf8407..906f171e8 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 @@ -173,7 +173,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{getColorPane()}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"), borderWithAlphaPane)}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"), borderWithAlphaPane)}, }; return TableLayoutHelper.createTableLayoutPane(components, row, col); @@ -238,18 +238,18 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { private Component createAnimationPane() { lineMapEffectPane = new VanChartLineMapEffectPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), lineMapEffectPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation"), lineMapEffectPane); } //不透明度 private JPanel createPointAlphaPane() { pointAlphaPane = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), pointAlphaPane); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), pointAlphaPane); } private JPanel createPointEffectPane() { pointEffectPane = new VanChartEffectPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), pointEffectPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation"), pointEffectPane); } private JPanel createMarkerComPane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java index 0a830a41e..ce825261e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java @@ -21,7 +21,7 @@ public class VanChartBorderWithAlphaConditionPane extends AbstractNormalMultiLin @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"); } @Override @@ -37,7 +37,7 @@ public class VanChartBorderWithAlphaConditionPane extends AbstractNormalMultiLin */ @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"); } @Override 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 92488e2e3..b85e1854e 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 @@ -90,7 +90,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { //深蓝和高德地图下拉框层级 private static final ZoomLevel[] BLUE_ZOOM_LEVELS =(ZoomLevel[]) ArrayUtils.subarray(ZOOM_LEVELS, 0, 34); private static final ZoomLevel[] GAODE_ZOOM_LEVELS =ArrayUtils.addAll(new ZoomLevel[]{ZoomLevel.AUTO}, (ZoomLevel[])ArrayUtils.subarray(ZOOM_LEVELS, 7, 38)); - private static final String AUTO_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"); + private static final String AUTO_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"); private static final String CUSTOM_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"); private UILabel sourceTitleLabel; diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java index 7d0b4ebe6..18b74422b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java @@ -48,8 +48,8 @@ public class VanChartCurvePane extends BasicBeanPane{ return new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Width")), lineWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bedding")),bending}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), lineAlphaPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bedding")),bending}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), lineAlphaPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java index 1f480513f..ee6368917 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java @@ -60,7 +60,7 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane { private Component createAnimationSelectPane() { JPanel panel = new JPanel(new BorderLayout(5, 0)); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation_Type")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Type")); label1.setPreferredSize(new Dimension((int) TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); panel.add(label1, BorderLayout.WEST); panel.add(animationType, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java index 09d39068f..4932eddb4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java @@ -40,7 +40,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane { Map paneList = new HashMap(); - radiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")}); + radiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")}); radius = new UISpinner(MIN_RADIUS, MAX_RADIUS, 1, 100); radiusContent = new JPanel(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index 367f195f9..ab8616419 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -42,7 +42,7 @@ public class StructureNodeStylePane extends BasicBeanPane { double[] columnSize = {f, e}; double[] rowSize = {p, p, p, p, p}; - nodeRadiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + nodeRadiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); nodeRadius = new UISpinner(0,Double.MAX_VALUE,0.5,0); nodeBorderWidth = new UISpinner(0,Double.MAX_VALUE,0.5,0); @@ -57,9 +57,9 @@ public class StructureNodeStylePane extends BasicBeanPane { Component[][] components1 = new Component[][]{ new Component[]{null, null}, new Component[]{jPanel, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border_Width")), nodeBorderWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), nodeOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), nodeOpacity} }; JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize); 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 a0183eed7..becf0da32 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 @@ -57,7 +57,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane private JPanel createLinkPane() { linkColor = new ColorSelectBox(100); - linkWidthType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + linkWidthType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); linkWidth = new UISpinner(0,Double.MAX_VALUE,0.5,0); linkOpacity = new UINumberDragPane(0,100); @@ -84,7 +84,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, new Component[]{jPanel, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), linkOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), linkOpacity} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(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 9634c0e4c..9fa5b6499 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 @@ -35,7 +35,7 @@ import java.awt.event.ItemListener; * Created by Mitisky on 16/11/29. */ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane { - private static final String AUTO_FONT_SIZE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"); + private static final String AUTO_FONT_SIZE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto"); private static final String CUSTOM_FONT_SIZE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Size"); private static final double MAX_ROTATION = 90; private static final double LABEL_SIZE = 65; From ec3b3eea4c1648c018c14bfd5d88ab97fd88d4bc Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 6 Aug 2018 00:47:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E9=A2=84?= =?UTF-8?q?=E8=A7=88demo=E6=9C=89=E9=97=AE=E9=A2=98=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=92=8C=E9=A2=84=E8=A7=88demo=E5=88=86?= =?UTF-8?q?=E5=BC=80=EF=BC=8C=E9=A2=84=E8=A7=88demo=E4=B8=8D=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=AC=AC=E4=BA=8C=E6=AC=A1=E5=88=87=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/start/EnvSwitcher.java | 29 --------------- .../com/fr/start/module/DesignerStartup.java | 37 ++++++++++++------- .../module/DesignerWorkspaceProvider.java | 37 ++++++++++++++----- 3 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 designer-realize/src/main/java/com/fr/start/EnvSwitcher.java diff --git a/designer-realize/src/main/java/com/fr/start/EnvSwitcher.java b/designer-realize/src/main/java/com/fr/start/EnvSwitcher.java deleted file mode 100644 index 301c38f2d..000000000 --- a/designer-realize/src/main/java/com/fr/start/EnvSwitcher.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fr.start; - -import com.fr.design.DesignerEnvManager; -import com.fr.design.env.DesignerWorkspaceGenerator; -import com.fr.design.mainframe.TemplatePane; -import com.fr.workspace.WorkContext; -import com.fr.workspace.Workspace; - -/** - * Created by juhaoyu on 2018/1/31. - * 环境切换器 - */ -public class EnvSwitcher { - - public void switch2LastEnv() { - try { - - String current = DesignerEnvManager.getEnvManager().getCurEnvName(); - Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current)); - if (workspace == null) { - TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); - } else { - WorkContext.switchTo(workspace); - } - } catch (Throwable e) { - TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); - } - } -} diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index 4698b760d..c131573b8 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -1,7 +1,6 @@ package com.fr.start.module; -import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.DesignerContext; import com.fr.event.Event; import com.fr.event.Listener; @@ -28,30 +27,25 @@ public class DesignerStartup extends Activator { @Override @Metrics public void start() { + startSub(PreStartActivator.class); //启动基础部分 startSub(BasicActivator.class); final String[] args = getModule().upFindSingleton(StartupArgs.class).get(); final Designer designer = new Designer(args); - + startSub(DesignerWorkspaceProvider.class); registerEnvListener(); //启动env startSub(EnvBasedModule.class); - - if (args != null) { - for (String arg : args) { - if (ComparatorUtils.equals(arg, "demo")) { - DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); - ServerStarter.browserDemoURL(); - break; - } - } - } + //designer模块启动好后，查看demo + browserDemo(); ExecutorService service = Executors.newSingleThreadExecutor(); service.submit(new Runnable() { + @Override public void run() { + designer.show(args); DesignerContext.getDesignerFrame().getProgressDialog().dispose(); } @@ -60,11 +54,26 @@ public class DesignerStartup extends Activator { DesignerContext.getDesignerFrame().setVisible(true); //启动画面结束 SplashContext.getInstance().hide(); - + DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true); startSub(StartFinishActivator.class); + } - + + private void browserDemo() { + + final String[] args = getModule().upFindSingleton(StartupArgs.class).get(); + + if (args != null) { + for (String arg : args) { + if (ComparatorUtils.equals(arg, "demo")) { + ServerStarter.browserDemoURL(); + break; + } + } + } + } + /** * 切换环境时，重新启动所有相关模块 */ diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index bd8159c6d..8397a21c7 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -1,9 +1,12 @@ package com.fr.start.module; import com.fr.design.DesignerEnvManager; - +import com.fr.design.env.DesignerWorkspaceGenerator; +import com.fr.design.mainframe.TemplatePane; +import com.fr.general.ComparatorUtils; import com.fr.module.Activator; -import com.fr.start.EnvSwitcher; +import com.fr.workspace.WorkContext; +import com.fr.workspace.Workspace; /** * Created by juhaoyu on 2018/1/8. @@ -15,18 +18,34 @@ public class DesignerWorkspaceProvider extends Activator { public void start() { //检查环境 DesignerEnvManager.checkNameEnvMap(); - - EnvSwitcher switcher = new EnvSwitcher(); - //设置好环境即可，具体跟环境有关的模块会自动调用 - switcher.switch2LastEnv(); - getRoot().setSingleton(EnvSwitcher.class, switcher); + + final String[] args = getModule().upFindSingleton(StartupArgs.class).get(); + + if (args != null) { + for (String arg : args) { + if (ComparatorUtils.equals(arg, "demo")) { + DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); + break; + } + } + } else { + try { + String current = DesignerEnvManager.getEnvManager().getCurEnvName(); + Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current)); + if (workspace == null) { + TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); + } else { + WorkContext.switchTo(workspace); + } + } catch (Throwable e) { + TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); + } + } } @Override public void stop() { - //清空模块 - getRoot().removeSingleton(EnvSwitcher.class); } From 1ff55110dc3af9154fd7f5d3b94b4e46a26ed5ff Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 6 Aug 2018 01:01:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E9=A2=84?= =?UTF-8?q?=E8=A7=88demo=E6=9C=89=E9=97=AE=E9=A2=98=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=92=8C=E9=A2=84=E8=A7=88demo=E5=88=86?= =?UTF-8?q?=E5=BC=80=EF=BC=8C=E9=A2=84=E8=A7=88demo=E4=B8=8D=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=AC=AC=E4=BA=8C=E6=AC=A1=E5=88=87=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/start/module/DesignerStartup.java | 14 +++-------- .../module/DesignerWorkspaceProvider.java | 24 +++++++------------ .../java/com/fr/start/module/StartupArgs.java | 17 +++++++++++++ 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index c131573b8..aac6112ee 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -4,7 +4,6 @@ package com.fr.start.module; import com.fr.design.mainframe.DesignerContext; import com.fr.event.Event; import com.fr.event.Listener; -import com.fr.general.ComparatorUtils; import com.fr.module.Activator; import com.fr.record.analyzer.EnableMetrics; import com.fr.record.analyzer.Metrics; @@ -61,16 +60,9 @@ public class DesignerStartup extends Activator { } private void browserDemo() { - - final String[] args = getModule().upFindSingleton(StartupArgs.class).get(); - - if (args != null) { - for (String arg : args) { - if (ComparatorUtils.equals(arg, "demo")) { - ServerStarter.browserDemoURL(); - break; - } - } + + if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) { + ServerStarter.browserDemoURL(); } } diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index 8397a21c7..bfcb4fefe 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -13,21 +13,14 @@ import com.fr.workspace.Workspace; * 设计器启动时的环境相关模块activator */ public class DesignerWorkspaceProvider extends Activator { - + @Override public void start() { //检查环境 DesignerEnvManager.checkNameEnvMap(); - - final String[] args = getModule().upFindSingleton(StartupArgs.class).get(); - - if (args != null) { - for (String arg : args) { - if (ComparatorUtils.equals(arg, "demo")) { - DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); - break; - } - } + + if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) { + DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); } else { try { String current = DesignerEnvManager.getEnvManager().getCurEnvName(); @@ -42,11 +35,12 @@ public class DesignerWorkspaceProvider extends Activator { } } } - - + + @Override public void stop() { + } - - + + } diff --git a/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java b/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java index b957e8d65..678147f54 100644 --- a/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java +++ b/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java @@ -1,5 +1,7 @@ package com.fr.start.module; +import com.fr.general.ComparatorUtils; + /** * Created by juhaoyu on 2018/1/8. * 封装启动参数 @@ -17,5 +19,20 @@ public class StartupArgs { return args; } + + /** + * 是否是产品演示 + */ + public boolean isDemo() { + + if (args != null) { + for (String arg : args) { + if (ComparatorUtils.equals(arg, "demo")) { + return true; + } + } + } + return false; + } } From 684b47e4c1ec7989fb59c642ac36aaab5c798b6d Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 6 Aug 2018 11:00:04 +0800 Subject: [PATCH 4/6] REPORT-10385 --- .../com/fr/start/module/DesignerWorkspaceProvider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index bfcb4fefe..aae7bb2cd 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -2,12 +2,16 @@ package com.fr.start.module; import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceGenerator; +import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.mainframe.TemplatePane; import com.fr.general.ComparatorUtils; import com.fr.module.Activator; +import com.fr.stable.StableUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; +import java.io.File; + /** * Created by juhaoyu on 2018/1/8. * 设计器启动时的环境相关模块activator @@ -24,8 +28,10 @@ public class DesignerWorkspaceProvider extends Activator { } else { try { String current = DesignerEnvManager.getEnvManager().getCurEnvName(); - Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current)); - if (workspace == null) { + DesignerWorkspaceInfo workspaceInfo = DesignerEnvManager.getEnvManager().getWorkspaceInfo(current); + Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo); + boolean checkValid = workspace == null ? false : workspaceInfo.checkValid(); + if (!checkValid) { TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); } else { WorkContext.switchTo(workspace); From 23733ff80c299e477330f34cf2b03674e80b5c19 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Mon, 6 Aug 2018 11:02:03 +0800 Subject: [PATCH 5/6] REPORT-10385 --- .../java/com/fr/start/module/DesignerWorkspaceProvider.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index aae7bb2cd..211e67db3 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -4,13 +4,11 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceGenerator; import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.mainframe.TemplatePane; -import com.fr.general.ComparatorUtils; import com.fr.module.Activator; -import com.fr.stable.StableUtils; + import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; -import java.io.File; /** * Created by juhaoyu on 2018/1/8. From c592ad0f6c26603472be1c8244137417fb01431e Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 6 Aug 2018 11:39:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?REPORT-10328=20=E3=80=9010.0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E8=A1=A8=E5=8D=95=E4=BB=8E=E6=A8=AA=E5=90=91?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=88=87=E5=88=B0=E7=BB=9D=E5=AF=B9?= =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=8C=E7=BC=A9=E6=94=BE=E4=BC=9A=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/ui/designer/layout/FRFitLayoutDefinePane.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 2c6497669..3882bbb44 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -173,6 +173,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { if (value instanceof Integer) { state = (Integer) value; } + //todo 验证下 + layout.setLayoutType(WBodyLayoutType.parse(state)); + layout.setCompState(adaptComboBox.getSelectedIndex()); try { if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) { WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body"); @@ -201,9 +204,6 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { FineLoggerFactory.getLogger().error(e.getMessage()); } - //todo 验证下 - layout.setLayoutType(WBodyLayoutType.parse(state)); - layout.setCompState(adaptComboBox.getSelectedIndex()); int intervelValue = (int)componentIntervel.getValue(); if (xWFitLayout.canAddInterval(intervelValue)) {