diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index 6a23e0d0df..4075b411a3 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -1,7 +1,6 @@ package com.fr.design.chart.series.SeriesCondition.impl; import com.fr.base.Parameter; -import com.fr.base.i18n.BidiUtils; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.web.ChartHyperPoplink; import com.fr.design.editor.ValueEditorPane; @@ -73,9 +72,9 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Form_Widget_Style_Title")), getBoldFontTextLabelHorizontalAlignment()), titleField}, - new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Basic_Designer_Width")), getBoldFontTextLabelHorizontalAlignment()), widthField}, - new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Chart_Height")), getBoldFontTextLabelHorizontalAlignment()), heightField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":", SwingConstants.RIGHT), widthField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField}, }; widthField.setText(String.valueOf(DEFAULT_V_VALUE)); @@ -91,14 +90,6 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { return pane; } - private int getBoldFontTextLabelHorizontalAlignment() { - return SwingConstants.TRAILING; - } - - private String getBoldFontTextLabelName(String i18ney) { - return BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18ney), ":"); - } - public void populateBean(ChartHyperPoplink chartHyperlink) { titleField.setText(chartHyperlink.getChartDigTitle()); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index 6dccd95aaf..3f1df49531 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -54,7 +54,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane