From 187dc6340bf0222fba4955f732a01cae6d74cd3a Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Tue, 26 Apr 2016 19:58:44 +0800
Subject: [PATCH] =?UTF-8?q?menuhandler=E7=9A=84equals=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BC=9A=E4=BD=BF=E5=B8=A6=E5=8F=82=E6=95=B0=E7=9A=84shortcut?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=9B=E8=A1=8C=E6=AF=94=E8=BE=83=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8AbstractProvider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/fun/MenuHandler.java    |  7 -----
 .../design/fun/impl/AbstractMenuHandler.java  | 27 ++++---------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/designer_base/src/com/fr/design/fun/MenuHandler.java b/designer_base/src/com/fr/design/fun/MenuHandler.java
index 53958f856..0ec7a00f2 100644
--- a/designer_base/src/com/fr/design/fun/MenuHandler.java
+++ b/designer_base/src/com/fr/design/fun/MenuHandler.java
@@ -66,11 +66,4 @@ public interface MenuHandler extends Level{
      * @return 菜单项内容
      */
     ShortCut shortcut(ToolBarMenuDockPlus plus);
-
-    /**
-     * 两个菜单项相等等情况
-     * @param obj 比较对象
-     * @return 相等则返回true，否则返回false
-     */
-    boolean equals(Object obj);
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java b/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java
index db911f501..c82cce71b 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java
@@ -3,39 +3,22 @@ package com.fr.design.fun.impl;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.ShortCut;
-import com.fr.general.ComparatorUtils;
+import com.fr.stable.fun.impl.AbstractProvider;
 
 /**
  * @author richie
  * @date 2015-05-13
  * @since 8.0
  */
-public abstract class AbstractMenuHandler implements MenuHandler {
+public abstract class AbstractMenuHandler extends AbstractProvider implements MenuHandler {
 
     public int currentAPILevel() {
         return CURRENT_LEVEL;
     }
 
-
-    public boolean equals(Object obj) {
-        return obj instanceof AbstractMenuHandler
-                && ComparatorUtils.equals(category(), ((AbstractMenuHandler) obj).category())
-                && shortCutEquals(this, (AbstractMenuHandler)obj);
-    }
-
-    private boolean shortCutEquals(AbstractMenuHandler target, AbstractMenuHandler self){
-        ShortCut targetShortCut = target.shortcut();
-        ShortCut selfShortCut = self.shortcut();
-
-        if (targetShortCut == null && selfShortCut == null){
-            return true;
-        }
-
-        if (targetShortCut != null && selfShortCut != null){
-            return ComparatorUtils.equals(targetShortCut.getClass(), selfShortCut.getClass());
-        }
-
-        return false;
+    @Override
+    public String mark4Provider() {
+        return this.getClass().getName();
     }
 
     /**