Merge pull request #3889 in DESIGN/design from final/10.0 to bugfix/10.0

* commit '8ca9e09f23028b1aecd2cc925583ff5898284c0a':
  CHART-18720  试管型仪表盘用横向状态初始标签面板有问题

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java

@@ -10,7 +10,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
-import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.type.FontAutoType;
@@ -50,7 +49,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     }
 
     public GaugeStyle getGaugeStyle() {
-        return ((VanChartGaugePlot)this.getPlot()).getGaugeStyle();
+        return ((VanChartGaugePlot) this.getPlot()).getGaugeStyle();
     }
 
     public void setGaugeStyle(GaugeStyle gaugeStyle) {
@@ -127,15 +126,13 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
         if (hasLabelAlignPane()) {
-
             return new Component[][]{
                     new Component[]{getDataLabelContentPane(), null},
-                    new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Vertical"), plot), null},
+                    new Component[]{createLabelPositionPane(getVerticalTitle(), plot), null},
-                    new Component[]{createLabelAlignPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Horizontal")), null},
+                    new Component[]{createLabelAlignPane(), null},
                     new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
             };
         } else {
-
             return new Component[][]{
                     new Component[]{getDataLabelContentPane(), null},
                     new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
@@ -143,50 +140,37 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         }
     }
 
-    private JPanel createLabelAlignPane(String title) {
+    private JPanel createLabelAlignPane() {
-        JPanel panel = new JPanel(new BorderLayout());
+        alignPane = new JPanel(new BorderLayout());
-
+        checkAlignPane();
-        alignPane = new JPanel();
+        return alignPane;
-        checkAlignPane(title);
-        panel.add(alignPane, BorderLayout.CENTER);
-
-        return panel;
     }
 
-    protected void checkAlignPane(String title) {
+    protected void checkAlignPane() {
-        if (alignPane == null && !hasLabelAlign(getPlot())) {
+        if (!hasLabelAlignPane()) {
             return;
         }
-        if (alignPane != null && !hasLabelAlign(getPlot())) {
+        if (!hasLabelAlign()) {
-            oldAlignValues = null;
             alignPane.removeAll();
             return;
         }
-        if (alignPane == null && hasLabelAlign(getPlot())) {
+
-            alignPane = new JPanel();
+        if (alignPane.getComponents().length > 0) {
+            return;
         }
         TwoTuple<String[], Integer[]> result = getAlignNamesAndValues();
-
         String[] names = result.getFirst();
         Integer[] values = result.getSecond();
-        if (ComparatorUtils.equals(values, oldAlignValues)) {
+        align = new UIButtonGroup<>(names, values);
-            return;
-        }
-
-        oldAlignValues = values;
-
-        align = new UIButtonGroup<Integer>(names, values);
 
         Component[][] comps = new Component[2][2];
 
         comps[0] = new Component[]{null, null};
-        comps[1] = new Component[]{new UILabel(title, SwingConstants.LEFT), align};
+        comps[1] = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Layout_Horizontal"), SwingConstants.LEFT), align};
 
         double[] row = new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED};
         double[] col = new double[]{TableLayout.FILL, TableLayout4VanChartHelper.EDIT_AREA_WIDTH};
 
-        alignPane.removeAll();
-        alignPane.setLayout(new BorderLayout());
         alignPane.add(getLabelPositionPane(comps, row, col), BorderLayout.CENTER);
 
         if (getParentPane() != null) {
@@ -214,12 +198,16 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     }
 
     protected void checkPane() {
-        String verticalTitle = hasLabelAlign(getPlot())
+        String verticalTitle = getVerticalTitle();
-                ? Toolkit.i18nText("Fine-Design_Chart_Layout_Vertical")
-                : Toolkit.i18nText("Fine-Design_Chart_Layout_Position");
 
         checkPositionPane(verticalTitle);
-        checkAlignPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Horizontal"));
+        checkAlignPane();
+    }
+
+    private String getVerticalTitle() {
+        return hasLabelAlign()
+                ? Toolkit.i18nText("Fine-Design_Chart_Layout_Vertical")
+                : Toolkit.i18nText("Fine-Design_Chart_Layout_Position");
     }
 
     protected void checkStyleUse() {
@@ -227,8 +215,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         textFontPane.setPreferredSize(new Dimension(0, TEXT_FONT_PANE_HEIGHT));
     }
 
-    protected boolean hasLabelAlign(Plot plot) {
+    protected boolean hasLabelAlign() {
-        return getGaugeStyle() == GaugeStyle.THERMOMETER && !((VanChartGaugePlot) plot).getGaugeDetailStyle().isHorizontalLayout();
+        return getGaugeStyle() == GaugeStyle.THERMOMETER && !((VanChartGaugePlot) getPlot()).getGaugeDetailStyle().isHorizontalLayout();
     }
 
     protected boolean hasLabelAlignPane() {
@@ -240,7 +228,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
 
         style.setSelectedIndex(1);
         textFontPane.populate(detail.getTextAttr());
-        if (hasLabelAlign(this.getPlot()) && align != null) {
+        if (hasLabelAlign() && align != null) {
             align.setSelectedItem(detail.getAlign());
         }