fix bug then "move to group" operation duplicated components

Exslims · Aug 5, 2017 · 631f3d8 · 631f3d8
1 parent 09bd3c5
commit 631f3d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/adr/AdrManager.java b/app-ui/src/main/java/com/mercury/platform/ui/adr/AdrManager.java
@@ -174,6 +174,7 @@ public void subscribe() {
                             .filter(it -> it.getDescriptor().equals(descriptor))
                             .findAny().orElse(null);
             if(targetFrame != null) {
+                targetFrame.onDestroy();
                 this.frames.remove(targetFrame);
                 this.selectedProfile.getContents().remove(descriptor);
                 targetFrame.dispose();

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AbstractAdrComponentFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AbstractAdrComponentFrame.java
@@ -1,6 +1,5 @@
 package com.mercury.platform.ui.adr.components;
 
-import com.mercury.platform.shared.FrameVisibleState;
 import com.mercury.platform.shared.config.descriptor.adr.AdrComponentDescriptor;
 import com.mercury.platform.shared.store.MercuryStoreCore;
 import com.mercury.platform.ui.adr.components.panel.tree.AdrMouseOverListener;

diff --git a/app-ui/src/main/resources/notes/showcase-profile.json b/app-ui/src/main/resources/notes/showcase-profile.json
@@ -1286,8 +1286,8 @@
           "height": 64
         },
         "hotKeyDescriptor": {
-          "virtualKeyCode": 49,
-          "keyChar": "1",
+          "virtualKeyCode": 0,
+          "keyChar": "\u0000",
           "menuPressed": false,
           "shiftPressed": false,
           "controlPressed": false,
@@ -1364,8 +1364,8 @@
           "height": 64
         },
         "hotKeyDescriptor": {
-          "virtualKeyCode": 50,
-          "keyChar": "2",
+          "virtualKeyCode": 0,
+          "keyChar": "\u0000",
           "menuPressed": false,
           "shiftPressed": false,
           "controlPressed": false,
@@ -1442,8 +1442,8 @@
           "height": 64
         },
         "hotKeyDescriptor": {
-          "virtualKeyCode": 51,
-          "keyChar": "3",
+          "virtualKeyCode": 0,
+          "keyChar": "\u0000",
           "menuPressed": false,
           "shiftPressed": false,
           "controlPressed": false,
@@ -1520,8 +1520,8 @@
           "height": 64
         },
         "hotKeyDescriptor": {
-          "virtualKeyCode": 52,
-          "keyChar": "4",
+          "virtualKeyCode": 0,
+          "keyChar": "\u0000",
           "menuPressed": false,
           "shiftPressed": false,
           "controlPressed": false,