From b3e6da93c845720cea5e4ca197972428a0e6093b Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 15 Nov 2019 16:46:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-20330=20sonar=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BF=AE=E5=A4=8D=20sonar=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diff/SingleCategoryDataSetFieldsPane.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java index 07936dfcb..166ef700f 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java @@ -23,12 +23,29 @@ import java.awt.Dimension; * @version 10.0 * Created by Bjorn on 2019-10-24 */ -public class SingleCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { +public class SingleCategoryDataSetFieldsPane + extends AbstractDataSetFieldsWithSeriesValuePane { private UIComboBox categoryPane; private CategorySeriesFilterPane filterPane; - + + private static final int HGAP = 0; + private static final int VGAP = 6; + private static final int TOP = 4; + private static final int LEFT = 24; + private static final int BOTTOM = 0; + private static final int RIGHT = 15; + + + public SingleCategoryDataSetFieldsPane() { + } + + public SingleCategoryDataSetFieldsPane(UIComboBox categoryPane, CategorySeriesFilterPane filterPane) { + this.categoryPane = categoryPane; + this.filterPane = filterPane; + } + @Override protected void initComponents() { categoryPane = new UIComboBoxWithNone(); @@ -37,13 +54,13 @@ public class SingleCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSe UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")); label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); - JPanel northPane = new JPanel(new BorderLayout(0, 6)); + JPanel northPane = new JPanel(new BorderLayout(HGAP, VGAP)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryPane, null, null, label, null}), BorderLayout.NORTH); northPane.add(new JSeparator(), BorderLayout.CENTER); northPane.add(createCenterPane(), BorderLayout.SOUTH); - northPane.setBorder(BorderFactory.createEmptyBorder(4, 24, 0, 15)); + northPane.setBorder(BorderFactory.createEmptyBorder(TOP, LEFT, BOTTOM, RIGHT)); - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout(HGAP, VGAP)); this.add(northPane, BorderLayout.NORTH); this.add(filterPane, BorderLayout.CENTER); } From 8f5675a2679aede9cb909b8024cd65a19ba81052 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 15 Nov 2019 17:23:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-20330=20sonar=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B8=B8=E9=87=8F=E6=94=BE=E6=9C=80?= =?UTF-8?q?=E4=B8=8A=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fields/diff/SingleCategoryDataSetFieldsPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java index 166ef700f..663daecdf 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/SingleCategoryDataSetFieldsPane.java @@ -25,10 +25,6 @@ import java.awt.Dimension; */ public class SingleCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValuePane { - - private UIComboBox categoryPane; - - private CategorySeriesFilterPane filterPane; private static final int HGAP = 0; private static final int VGAP = 6; @@ -37,6 +33,10 @@ public class SingleCategoryDataSetFieldsPane private static final int BOTTOM = 0; private static final int RIGHT = 15; + private UIComboBox categoryPane; + + private CategorySeriesFilterPane filterPane; + public SingleCategoryDataSetFieldsPane() { }