From b0a254ea64a14cd60e6d159fb3323ae878a2dbb8 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 15 Nov 2017 11:49:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-5659=20[9.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=97=A5=E6=9C=9F=E5=9E=8B=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/style/FormatPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 5ab39647f..8ca1d58c4 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -262,7 +262,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs if (i == -1) { this.textField.setSelectedItem(pattern); } else { - this.textField.setSelectedIndex(i); + this.textField.setSelectedItem(pattern); } } From c159dde5486978b0996d3f0ccfacfbfdf615ca88 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 15 Nov 2017 11:51:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-5659=20[9.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=97=A5=E6=9C=9F=E5=9E=8B=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/style/FormatPane.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 8ca1d58c4..7b60bc99b 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -258,12 +258,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs private void setPatternComboBoxAndList(int formatStyle, String pattern) { this.typeComboBox.setSelectedItem(formatStyle); - int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle), pattern); - if (i == -1) { - this.textField.setSelectedItem(pattern); - } else { - this.textField.setSelectedItem(pattern); - } + this.textField.setSelectedItem(pattern); } private boolean isTimeType(String pattern) {