diff --git a/designer_base/src/com/fr/design/style/FRFontPane.java b/designer_base/src/com/fr/design/style/FRFontPane.java index 84801945d5..42da861083 100644 --- a/designer_base/src/com/fr/design/style/FRFontPane.java +++ b/designer_base/src/com/fr/design/style/FRFontPane.java @@ -11,6 +11,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.Box; @@ -63,18 +64,21 @@ public class FRFontPane extends BasicPane { private FRFontPreviewArea preview; private EventListenerList eventChangeList = new EventListenerList(); - - public static Integer[] Font_Sizes = {new Integer(6), new Integer(8), new Integer(9), - new Integer(10), new Integer(11), new Integer(12), - new Integer(14), new Integer(16), new Integer(18), - new Integer(20), new Integer(22), new Integer(24), - new Integer(26), new Integer(28), new Integer(36), - new Integer(48), new Integer(72)}; - + + private static final int MAX_FONT_SIZE = 100; + public FRFontPane() { this.initComponents(); } - + + public static Vector getFontSizes() { + Vector FONT_SIZES = new Vector(); + for (int i = 1; i < MAX_FONT_SIZE; i++) { + FONT_SIZES.add(i); + } + return FONT_SIZES; + } + protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); diff --git a/designer_base/src/com/fr/design/style/FontSizeStylePane.java b/designer_base/src/com/fr/design/style/FontSizeStylePane.java index 5e83f5ecb1..ac179f3087 100644 --- a/designer_base/src/com/fr/design/style/FontSizeStylePane.java +++ b/designer_base/src/com/fr/design/style/FontSizeStylePane.java @@ -51,7 +51,7 @@ public class FontSizeStylePane extends JPanel { fontVSizPane.add(Box.createHorizontalStrut(6)); - JPanel sizePanel = FRFontPane.createTextFieldListPane("", sizeField = new UINumberField(), sizeList = new JList(FRFontPane.Font_Sizes)); + JPanel sizePanel = FRFontPane.createTextFieldListPane("", sizeField = new UINumberField(), sizeList = new JList(FRFontPane.getFontSizes())); sizeField.setMaxDecimalLength(1); sizeField.setEditable(false); diff --git a/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java index c38d2eb738..f0935fcfb1 100644 --- a/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java +++ b/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java @@ -119,12 +119,8 @@ public class ChartAlertValuePane extends BasicBeanPane { fontNameBox.addItem(names[i]); } - fontSizeBox = new UIComboBox(); + fontSizeBox = new UIComboBox(FRFontPane.getFontSizes()); fontSizeBox.setPreferredSize(new Dimension(80,20)); - Integer[] sizes = FRFontPane.Font_Sizes; - for(int i = 0; i < sizes.length; i++) { - fontSizeBox.addItem(sizes[i]); - } double t = TableLayout.FILL; double[] rowSize = {t, t, t, t, t}; diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java index 35cb979c9b..8afecdb3f2 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java @@ -47,7 +47,7 @@ public class DataLabelStylePane extends BasicPane { this.add(fontStyleBox = new UIComboBox(styles)); fontStyleBox.setPreferredSize(new Dimension(80, 20)); - this.add(sizeBox = new UIComboBox(FRFontPane.Font_Sizes)); + this.add(sizeBox = new UIComboBox(FRFontPane.getFontSizes())); sizeBox.setPreferredSize(new Dimension(80, 20)); if (isSurpportFontColor) { diff --git a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java index a797f84cd3..4e1a73c6de 100644 --- a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java @@ -43,7 +43,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { } protected UIScrollPane initRightBottomPane(){ - this.setFontSizeComboBox(new UIComboBox(FRFontPane.FONT_SIZES)); + this.setFontSizeComboBox(new UIComboBox(FRFontPane.getFontSizes())); this.setFontNameComboBox(new UIComboBox(Utils.getAvailableFontFamilyNames4Report())); JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0)); fontSizeTypePane.add(this.getFontSizeComboBox(), BorderLayout.CENTER); diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java index 26f407702d..8a3912bc4d 100644 --- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -416,7 +416,7 @@ public class LayoutBorderPane extends BasicPane { protected UIScrollPane initRightBottomPane(){ formulaPane = new TinyFormulaPane(); - fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES); + fontSizeComboBox = new UIComboBox(FRFontPane.getFontSizes()); fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); fontNameComboBox.setPreferredSize(new Dimension(160, 30)); JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));