Pull request #2491: 无JIRAR任务，解决冲突

Merge in DESIGN/design from ~BJORN/design:bugfix/10.0 to bugfix/10.0

* commit '31619a0028c5a94c2cd10db6fd080dc3253fc1fc':
  CHART-15566 代码质量
  CHART-15566 图表预定义样式面板
  REPORT-39489【预定义样式】服务器预定义样式入口，首次更新jar没有小红点
  代码修改
  REPORT-35149 预定义样式优化及与图表统一
  单元测试
  REPORT-35149 打包失败
  代码修改
  代码修改
  代码修改
  REPORT-35149 预定义样式优化及与图表统一

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -92,7 +92,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private AttrTooltipRichText richText;
 
-    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
+    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         this.parent = parent;
         this.showOnPane = showOnPane;
         this.richText = new AttrTooltipRichText();
@@ -101,7 +101,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
-        this.add(createLabelContentPane(),BorderLayout.CENTER);
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
     }
 
     public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
@@ -330,7 +330,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
     }
 
-    private JPanel createCommonStylePane() {
+    protected JPanel createCommonStylePane() {
         styleButton = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Automatic"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
@@ -474,8 +474,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
 
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p};
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p};
     }
 
     protected Component[][] getPaneComponents() {
@@ -500,7 +500,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         content.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-               checkCardPane();
+                checkCardPane();
             }
         });
     }
@@ -584,8 +584,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
 
     @Override
-    public void populateBean(AttrTooltipContent attrTooltipContent){
-        if(attrTooltipContent == null){
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent == null) {
             return;
         }
 
@@ -604,7 +604,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
 
         htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
-        if(!attrTooltipContent.isCommon()){
+        if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
 
@@ -801,9 +801,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
      * 图表对于其他的格式有要求也可以在这里继续添加。
+     *
      * @param attrTooltipContent
      */
-    private void updateFormatsWithPaneWidth (AttrTooltipContent attrTooltipContent) {
+    private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {
         int paneWidth = seriesNameFormatPane.getWidth();
         if (paneWidth == 0) {
             attrTooltipContent.getSeriesFormat().setEnable(false);