Pull request #2562: REPORT-38778 1.新用户的小红点、弹窗提示； 2.去掉菜单项 3.新用户预装组件

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit '1108edcbf34d66f548a9f392a81293b996a4534b':
  REPORT-38778 去掉社区和模板商城的小红点，修正使用工厂类引起的bug，修改预装组件的逻辑
  REPORT-38778 修改接口描述。添加了SnapChat的工厂
  REPORT-38778 格式化
  REPORT-38778 代码调整，去掉无用import
  REPORT-38778 1.新用户的小红点、弹窗提示； 2.去掉菜单项 3.新用户预装组件

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -12,6 +12,8 @@ import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.menu.SnapChatUtil;
+import com.fr.design.notification.SnapChat;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
@@ -171,7 +173,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                                 }
                                 updateAllPropertyPane();
                             }
-                        });                    }
+                        });
+                    }
                 }, filter);
         PluginListenerRegistration.getInstance().listen(
                 PluginEventType.BeforeStop,
@@ -225,7 +228,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 itemBean.getBtnIconName(),
                 itemBean.getBtnIconBaseDir(),
                 itemBean.getVisibleModes(),
-                    itemBean.getEnableModes());
+                itemBean.getEnableModes(),
+                itemBean.getSnapChat(),
+                itemBean.getPromptWindow());
         UIButton button = propertyItem.getButton();
         List<ActionListener> buttonListeners = itemBean.getButtonListeners();
         if (buttonListeners != null) {
@@ -324,6 +329,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             cellElement.popupDialog.showDefaultPane();
         }
     }
+
     // 禁用单元格元素tab
     private void enableCellElementPane(PropertyItem cellElement) {
         cellElement.setEnabled(true);
@@ -381,7 +387,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
     /**
      * 可通过此方法，判断当前的编辑模式
-     * */
+     */
     public PropertyMode getCurrentMode() {
         return currentMode;
     }
@@ -657,6 +663,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
 
     class PropertyItem {
+        private SnapChat snapChat;
         private UIButton button;
         private String name;  // 用于 card 切换
         private String title;  // 用于显示
@@ -667,6 +674,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private FixedPopupPane popupPane;  // 左侧固定弹出框
         private PopupToolPane popupToolPane;  // 弹出工具条
         private PopupDialog popupDialog;  // 弹出框
+        private PromptWindow promptWindow;   //提示窗
         private boolean isPoppedOut = false;  // 是否弹出
         private boolean isVisible = true;  // 是否可见
         private boolean replace = false;     // 是否被替代
@@ -687,14 +695,16 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
 
         public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes) {
-            this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes);
+            this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, null, null);
         }
 
-        public PropertyItem(String name, String title, String btnIconName, String iconBaseDir, PropertyMode[] visibleModes, PropertyMode[] enableModes) {
+        public PropertyItem(String name, String title, String btnIconName, String iconBaseDir, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow) {
             this.name = name;
             this.title = title;
             this.btnIconName = btnIconName;
             this.iconBaseDir = iconBaseDir;
+            this.snapChat = snapChat;
+            this.promptWindow = promptWindow;
             initButton();
             initPropertyPanel();
             initModes(visibleModes, enableModes);
@@ -872,9 +882,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 public Dimension getPreferredSize() {
                     return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_HEIGHT);
                 }
+
                 @Override
                 public void paintComponent(Graphics g) {
                     super.paintComponent(g);
+                    if (snapChat != null && !snapChat.hasRead()) {
+                        SnapChatUtil.paintPropertyItemPoint(g, getBounds());
+                    }
                 }
             };
             button.set4LargeToolbarButton();
@@ -902,6 +916,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                         popupFixedPane();
                     }
                     setTabButtonSelected();
+                    if (snapChat != null && !snapChat.hasRead()) {
+                        snapChat.markRead();
+                        if (promptWindow != null) {
+                            promptWindow.showWindow();
+                        }
+                    }
                 }
             });
             button.setToolTipText(title);
@@ -1015,8 +1035,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     /**
-     * @Description:刷新currentPopupPane面板位置，当设计器缩放时会调用这个函数
      * @param
+     * @Description:刷新currentPopupPane面板位置，当设计器缩放时会调用这个函数
      * @return:
      * @Author: Henry.Wang
      * @date: 2020/7/30 11:39
@@ -1031,8 +1051,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     /**
-     * @Description:清空currentPopupPane数据，当切换模板时会调用这个函数
      * @param
+     * @Description:清空currentPopupPane数据，当切换模板时会调用这个函数
      * @return:
      * @Author: Henry.Wang
      * @date: 2020/7/30 11:42
@@ -1071,12 +1091,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 }
                 repaint();
             }
+
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (e.getX() >= ARROW_RANGE_START) {
                     onPop();
                 }
             }
+
             @Override
             public void mouseReleased(MouseEvent e) {
                 mouseDownCompCoords = null;
@@ -1084,6 +1106,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     contentPane.setBackground(originColor);
                 }
             }
+
             @Override
             public void mousePressed(MouseEvent e) {
                 if (e.getX() < ARROW_RANGE_START) {
@@ -1105,6 +1128,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 }
                 repaint();
             }
+
             @Override
             public void mouseDragged(MouseEvent e) {
                 if (isMovable && mouseDownCompCoords != null) {
@@ -1217,6 +1241,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private Container contentPane;
         private JPanel defaultPane;  // 无可用配置项
         private PropertyItem propertyItem;
+
         public PopupDialog(PropertyItem propertyItem) {
             super(DesignerContext.getDesignerFrame());
             container = getContentPane();
@@ -1319,6 +1344,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                         mouseDownCompCoords = e.getLocationOnScreen();
                     }
                 }
+
                 @Override
                 public void mouseReleased(MouseEvent e) {
                     mouseDownCompCoords = null;

designer-base/src/main/java/com/fr/design/mainframe/PromptWindow.java

@@ -0,0 +1,20 @@
+package com.fr.design.mainframe;
+
+import javax.swing.JWindow;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/10/9
+ * 只关心Window的显示和隐藏操作时可以实现该接口
+ */
+public interface PromptWindow {
+    /**
+     * 显示弹窗
+     */
+    void showWindow();
+
+    /**
+     * 隐藏弹窗
+     */
+    void hideWindow();
+}

designer-base/src/main/java/com/fr/design/mainframe/PropertyItemBean.java

@@ -1,5 +1,7 @@
 package com.fr.design.mainframe;
 
+import com.fr.design.notification.SnapChat;
+
 import java.awt.event.ActionListener;
 import java.util.List;
 
@@ -12,6 +14,8 @@ public class PropertyItemBean {
     private String title;
     private String btnIconName;
     private String btnIconBaseDir;
+    private SnapChat snapChat;
+    private PromptWindow promptWindow;
     private EastRegionContainerPane.PropertyMode[] visibleModes;
     private EastRegionContainerPane.PropertyMode[] enableModes;
     private List<ActionListener> buttonListeners;
@@ -52,6 +56,22 @@ public class PropertyItemBean {
         this.btnIconBaseDir = btnIconBaseDir;
     }
 
+    public SnapChat getSnapChat() {
+        return snapChat;
+    }
+
+    public void setSnapChat(SnapChat snapChat) {
+        this.snapChat = snapChat;
+    }
+
+    public PromptWindow getPromptWindow() {
+        return promptWindow;
+    }
+
+    public void setPromptWindow(PromptWindow promptWindow) {
+        this.promptWindow = promptWindow;
+    }
+
     public EastRegionContainerPane.PropertyMode[] getVisibleModes() {
         return visibleModes;
     }

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -54,9 +54,7 @@ import com.fr.design.mainframe.ToolBarNewTemplatePane;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
-import com.fr.design.menu.SnapChatMenuDef;
 import com.fr.design.menu.ToolBarDef;
-import com.fr.design.notification.SnapChatAllTypes;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.remote.action.RemoteDesignAuthManagerAction;
 import com.fr.design.update.actions.SoftwareUpdateAction;
@@ -656,10 +654,7 @@ public abstract class ToolBarMenuDock {
 
     public MenuDef createCommunityMenuDef() {
 
-        MenuDef menuDef = new SnapChatMenuDef(
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"), 'C');
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"),
-                'C',
-                SnapChatAllTypes.Menu.BBS);
         ShortCut[] otherCommunityShortCuts = createCommunityShortCuts();
         for (ShortCut shortCut : otherCommunityShortCuts) {
             menuDef.addShortCut(shortCut);

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

@@ -4,6 +4,7 @@ import com.fr.design.gui.imenu.UIMenu;
 import com.fr.design.gui.imenu.UIScrollMenu;
 import com.fr.design.notification.SnapChat;
 import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.notification.SnapChatFactory;
 import com.fr.design.notification.SnapChatKey;
 
 import javax.swing.JMenu;
@@ -22,42 +23,44 @@ public class SnapChatMenuDef extends MenuDef implements SnapChat {
 
     private SnapChatKey uniqueKey;
     private SnapChatMenuUI menuUI = new SnapChatMenuUI(this);
+    private SnapChat snapChat ;
 
     public SnapChatMenuDef(String name, SnapChatKey uniqueKey) {
         super(name);
         this.uniqueKey = uniqueKey;
+        snapChat = SnapChatFactory.createSnapChat(true, uniqueKey);
     }
     
     public SnapChatMenuDef(Boolean rePaint, SnapChatKey uniqueKey) {
         super(rePaint);
         this.uniqueKey = uniqueKey;
+        snapChat = SnapChatFactory.createSnapChat(true, uniqueKey);
     }
     
     public SnapChatMenuDef(String name, char mnemonic, SnapChatKey uniqueKey) {
         super(name, mnemonic);
         this.uniqueKey = uniqueKey;
+        snapChat = SnapChatFactory.createSnapChat(true, uniqueKey);
     }
     
     @Override
     public boolean hasRead() {
-        
+        return snapChat.hasRead();
-        String calcKey = calcKey();
-        Boolean val = SnapChatConfig.getInstance().hasRead(calcKey);
-        // 默认读过了。
-        return val == null ? defaultStatus() : val;
     }
     
     @Override
     public void markRead() {
-        
+        snapChat.markRead();
-        String calcKey = calcKey();
-        SnapChatConfig.getInstance().markRead(calcKey);
     }
 
     @Override
     public boolean defaultStatus() {
+        return snapChat.defaultStatus();
+    }
 
-        return true;
+    @Override
+    public SnapChatKey key() {
+        return snapChat.key();
     }
 
     @Override
@@ -74,13 +77,6 @@ public class SnapChatMenuDef extends MenuDef implements SnapChat {
         super.insertShortCut(index, shortCut);
     }
     
-    
-    @Override
-    public SnapChatKey key() {
-        
-        return this.uniqueKey;
-    }
-    
     @Override
     protected MenuListener createMenuListener() {
         
@@ -97,17 +93,12 @@ public class SnapChatMenuDef extends MenuDef implements SnapChat {
         if (shortCut instanceof SnapChatUpdateAction) {
             SnapChatUpdateAction action = (SnapChatUpdateAction) shortCut;
             if (!action.hasRead()) {
-                String calcKey = calcKey();
+                String calcKey = snapChat.calcKey();
                 SnapChatConfig.getInstance().resetRead(calcKey);
             }
         }
     }
 
-    private String calcKey() {
-        
-        return key().calc();
-    }
-    
     @Override
     protected UIMenu createJMenu0() {
     

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

@@ -3,7 +3,7 @@ package com.fr.design.menu;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.notification.SnapChat;
-import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.notification.SnapChatFactory;
 import com.fr.design.notification.SnapChatKey;
 
 import java.awt.event.ActionEvent;
@@ -14,14 +14,15 @@ import java.awt.event.ActionEvent;
 public abstract class SnapChatUpdateAction extends UpdateAction implements SnapChat {
 
     private SnapChatKey uniqueKey;
+    private SnapChat snapChat ;
 
     public SnapChatUpdateAction(SnapChatKey uniqueKey) {
         this.uniqueKey = uniqueKey;
+        snapChat = SnapChatFactory.createSnapChat(false, uniqueKey);
     }
 
     @Override
     public final void actionPerformed(ActionEvent e) {
-        
         markRead();
         actionPerformed0(e);
     }
@@ -30,34 +31,22 @@ public abstract class SnapChatUpdateAction extends UpdateAction implements SnapC
 
     @Override
     public boolean hasRead() {
-        
+        return snapChat.hasRead();
-        String calcKey = calcKey();
-        Boolean val = SnapChatConfig.getInstance().hasRead(calcKey);
-        return val == null ? defaultStatus() : val;
     }
 
     @Override
     public void markRead() {
-        
+        snapChat.markRead();
-        String calcKey = calcKey();
-        SnapChatConfig.getInstance().markRead(calcKey);
     }
 
     @Override
     public boolean defaultStatus() {
-        
+        return snapChat.defaultStatus();
-        return false;
     }
 
     @Override
     public SnapChatKey key() {
-        
+        return snapChat.key();
-        return this.uniqueKey;
-    }
-    
-    private String calcKey() {
-        
-        return key().calc();
     }
 
     @Override

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

@@ -10,24 +10,31 @@ import java.awt.geom.Ellipse2D;
  * created by Harrison on 2020/03/22
  **/
 public class SnapChatUtil {
+    private static final int WIDTH = 4;
+    private static final int HEIGHT = 4;
+    private static final int TOP_GAP = 4;
+    private static final int RIGHT_GAP = 6;
 
+    /**
+     * 绘制菜单项的小红点
+     */
     public static void paintSnapChat(Graphics g, Rectangle textRect) {
-        
+        double x = textRect.getWidth() + textRect.getX() + 2;
-        Color oldColor = g.getColor();
-        
-        double x = textRect.getWidth();
-        x += textRect.getX();
-        x += 2;
-    
         double y = textRect.getY();
+        paintRedPoint(g, new Ellipse2D.Double(x, y, WIDTH, HEIGHT));
+    }
+
+    public static void paintPropertyItemPoint(Graphics g, Rectangle bounds) {
+        double x = bounds.getWidth() - RIGHT_GAP;
+        paintRedPoint(g, new Ellipse2D.Double(x, TOP_GAP, WIDTH, HEIGHT));
+    }
 
+    private static void paintRedPoint(Graphics g, Ellipse2D.Double shape) {
+        Color oldColor = g.getColor();
         Graphics2D g2d = (Graphics2D) g;
         g2d.setColor(Color.red);
-        Ellipse2D.Double shape =
-                new Ellipse2D.Double(x, y, 4, 4);
         g2d.fill(shape);
         g2d.draw(shape);
-        
         g2d.setColor(oldColor);
     }
 }

designer-base/src/main/java/com/fr/design/notification/AbstractSnapChat.java

@@ -0,0 +1,22 @@
+package com.fr.design.notification;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/9/27
+ */
+public abstract class AbstractSnapChat implements SnapChat {
+    @Override
+    public boolean hasRead() {
+
+        String calcKey = calcKey();
+        Boolean val = SnapChatConfig.getInstance().hasRead(calcKey);
+        return val == null ? defaultStatus() : val;
+    }
+
+    @Override
+    public void markRead() {
+
+        String calcKey = calcKey();
+        SnapChatConfig.getInstance().markRead(calcKey);
+    }
+}

designer-base/src/main/java/com/fr/design/notification/SnapChat.java

@@ -32,4 +32,8 @@ public interface SnapChat {
      * @return 字符标志
      */
     SnapChatKey key();
+
+    default String calcKey() {
+        return key().calc();
+    }
 }

designer-base/src/main/java/com/fr/design/notification/SnapChatFactory.java

@@ -0,0 +1,32 @@
+package com.fr.design.notification;
+
+import com.fr.plugin.context.PluginContext;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/10/10
+ */
+public class SnapChatFactory {
+    public static SnapChat createSnapChat(boolean defaultStatus, SnapChatKey snapChatKey) {
+        return createSnapChat(defaultStatus, snapChatKey, null);
+    }
+
+    public static SnapChat createSnapChat(boolean defaultStatus, SnapChatKey snapChatKey, PluginContext context) {
+        return new AbstractSnapChat() {
+            @Override
+            public boolean defaultStatus() {
+                return defaultStatus;
+            }
+
+            @Override
+            public SnapChatKey key() {
+                return snapChatKey;
+            }
+
+            @Override
+            public String calcKey() {
+                return context == null ? key().calc() : key().calc(context);
+            }
+        };
+    }
+}

designer-base/src/main/java/com/fr/design/notification/SnapChatKey.java

@@ -1,9 +1,18 @@
 package com.fr.design.notification;
 
+import com.fr.plugin.context.PluginContext;
+
 /**
  * created by Harrison on 2020/03/16
  **/
 public interface SnapChatKey {
 
     String calc();
+
+    /**
+     * 插件刚被安装时不能通过PluginContexts.getContext()方法获取插件上下文，因此加一个接口
+     */
+    default String calc(PluginContext context) {
+        throw new UnsupportedOperationException();
+    }
 }