diff --git a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java index f19c962f8..2d4554afd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java +++ b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java @@ -7,6 +7,7 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.MenuKeySet; import com.fr.design.selection.QuickEditor; import com.fr.log.FineLoggerFactory; +import com.fr.stable.StringUtils; import javax.swing.Action; import javax.swing.KeyStroke; @@ -14,7 +15,6 @@ import java.awt.event.KeyEvent; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -242,8 +242,11 @@ public class ActionFactory { KeyStroke keyStroke = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY); if (keyStroke != null) { buttonToolTipTextBuf.append(" ("); - buttonToolTipTextBuf.append(KeyEvent.getKeyModifiersText(keyStroke.getModifiers())); - buttonToolTipTextBuf.append('+'); + String modifiersText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers()); + if (!StringUtils.isEmpty(modifiersText)) { + buttonToolTipTextBuf.append(modifiersText); + buttonToolTipTextBuf.append('+'); + } buttonToolTipTextBuf.append(KeyEvent.getKeyText(keyStroke.getKeyCode())); buttonToolTipTextBuf.append(')'); }