From e580d48e62967b86fb0fab0719b3be1d839817a6 Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 12 May 2020 09:05:07 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-27207=20=E8=A1=A8=E5=8D=95=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=EF=BC=8C=E5=85=A5=E5=BA=93=E8=AE=BE=E7=BD=AE=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/editor/editor/WidgetNameEditor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java index 80c545e92..bb5353f13 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java @@ -4,6 +4,7 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.gui.icombobox.FilterComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.stable.StringUtils; import com.fr.stable.js.WidgetName; import javax.swing.JList; @@ -19,6 +20,8 @@ import java.awt.Component; * @since 2012-3-29下午6:04:37 */ public class WidgetNameEditor extends Editor { + static final WidgetName EMPTY_WIDGET_NAME = new WidgetName(StringUtils.EMPTY); + private FilterComboBox comb; @@ -79,7 +82,8 @@ public class WidgetNameEditor extends Editor { @Override public WidgetName getValue() { - return (WidgetName) comb.getSelectedItem(); + WidgetName widgetName = (WidgetName) comb.getSelectedItem(); + return widgetName == null ? EMPTY_WIDGET_NAME : widgetName; } @Override