Merge pull request #1586 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit 'e23f0fbca87932f0be201365fb915df0996f4abe':
  REPORT-29722【组件复用插件】@harrison,社区的小红点，不装插件也有，需要处理 包括插入也要处理一下

designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@@ -138,9 +138,13 @@ public class MenuDef extends ShortCut {
      */
     public void addShortCut(ShortCut... shortcut) {
         for (ShortCut i : shortcut) {
-            this.shortcutList.add(i);
+            addShortCut(i);
         }
     }
+    
+    public void addShortCut(ShortCut shortCut) {
+        this.shortcutList.add(shortCut);
+    }
 
     public void removeShortCut(ShortCut shortCut) {
 

designer-base/src/main/java/com/fr/design/menu/SnapChatMenuDef.java

@@ -61,23 +61,20 @@ public class SnapChatMenuDef extends MenuDef implements SnapChat {
     }
     
     @Override
-    public void addShortCut(ShortCut... shortCuts) {
+    public void addShortCut(ShortCut shortCut) {
     
-        if (shortCuts == null) {
-            return;
-        }
-        for (ShortCut shortCut : shortCuts) {
-            if (shortCut instanceof SnapChatUpdateAction) {
-                SnapChatUpdateAction action = (SnapChatUpdateAction) shortCut;
-                if (!action.hasRead()) {
-                    String calcKey = calcKey();
-                    SnapChatConfig.getInstance().resetRead(calcKey);
-                }
-            }
-        }
-        super.addShortCut(shortCuts);
+        addSnapChatNotification(shortCut);
+        super.addShortCut(shortCut);
     }
     
+    @Override
+    public void insertShortCut(int index, ShortCut shortCut) {
+        
+        addSnapChatNotification(shortCut);
+        super.insertShortCut(index, shortCut);
+    }
+    
+    
     @Override
     public SnapChatKey key() {
         
@@ -90,6 +87,22 @@ public class SnapChatMenuDef extends MenuDef implements SnapChat {
         return new SnapChatMenuListener();
     }
     
+    /**
+     * 添加提醒
+     *
+     * @param shortCut 快捷方式
+     */
+    private void addSnapChatNotification(ShortCut shortCut) {
+        
+        if (shortCut instanceof SnapChatUpdateAction) {
+            SnapChatUpdateAction action = (SnapChatUpdateAction) shortCut;
+            if (!action.hasRead()) {
+                String calcKey = calcKey();
+                SnapChatConfig.getInstance().resetRead(calcKey);
+            }
+        }
+    }
+    
     private String calcKey() {
         
         return key().calc();

designer-base/src/test/java/com/fr/design/menu/SnapChatMenuDefTest.java

@@ -73,4 +73,34 @@ public class SnapChatMenuDefTest {
         menuDef.addShortCut(action);
         Assert.assertFalse(menuDef.hasRead());
     }
+    
+    @Test
+    public void testInsertShortCut() throws Exception {
+    
+        PowerMock.suppress(MemberMatcher.constructor(UpdateAction.class));
+        SnapChatConfig snapChatConfig = EasyMock.partialMockBuilder(SnapChatConfig.class)
+                .addMockedMethod("readXML")
+                .createMock();
+        Whitebox.setInternalState(snapChatConfig, "markReadMap", new HashMap());
+        snapChatConfig.readXML(EasyMock.anyObject(XMLableReader.class));
+        EasyMock.expectLastCall().anyTimes();
+        EasyMock.replay(snapChatConfig);
+    
+        PowerMock.mockStatic(SnapChatConfig.class);
+        EasyMock.expect(SnapChatConfig.getInstance()).andReturn(snapChatConfig).anyTimes();
+        PowerMock.replayAll();
+    
+        SnapChatMenuDef menuDef = new SnapChatMenuDef("test", SnapChatAllTypes.Menu.BBS);
+        ShortCut action = new SnapChatUpdateAction(SnapChatAllTypes.Menu.BBS) {
+            @Override
+            protected void actionPerformed0(ActionEvent e) {
+            
+            }
+        };
+    
+        Assert.assertTrue(menuDef.hasRead());
+    
+        menuDef.insertShortCut(0, action);
+        Assert.assertFalse(menuDef.hasRead());
+    }
 }