From ed2289f4203c4118433337031129f327563eda03 Mon Sep 17 00:00:00 2001 From: juhaoyu <2335173323@qq.com> Date: Wed, 14 Jun 2017 11:51:50 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=EF=BC=9AgetName=E6=9C=89=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=98=AFnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/actions/UpdateAction.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index 93a553f9c..fdb73db15 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -6,19 +6,19 @@ package com.fr.design.actions; import com.fr.base.NameStyle; import com.fr.base.ScreenResolution; import com.fr.base.Style; -import com.fr.design.constants.UIConstants; import com.fr.design.actions.core.ActionFactory; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.imenu.UICheckBoxMenuItem; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.menu.ShortCut; import com.fr.design.selection.SelectionListener; +import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; import java.awt.event.ComponentEvent; -import java.awt.event.ContainerEvent; import java.beans.PropertyChangeListener; import java.util.HashMap; import java.util.Iterator; @@ -293,8 +293,7 @@ public abstract class UpdateAction extends ShortCut implements Action { if (!(object instanceof UpdateAction)) { return false; } - - return ((UpdateAction) object).getName().equals(this.getName()); + return ComparatorUtils.equals(((UpdateAction) object).getName(), this.getName()); } @Override