added whois to scanner panel

Exslims · Jan 22, 2018 · a618c8a · a618c8a
1 parent 3ff01c0
commit a618c8a
Show file tree

Hide file tree

Showing 10 changed files with 189 additions and 2 deletions.
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/...re/src/main/java/com/mercury/platform/core/utils/interceptor/PlainMessageInterceptor.java b/...re/src/main/java/com/mercury/platform/core/utils/interceptor/PlainMessageInterceptor.java
@@ -21,6 +21,8 @@ public PlainMessageInterceptor() {
         this.clients.add(new ArabicOutLocalizationMatcher());
         this.clients.add(new BZIncLocalizationMatcher());
         this.clients.add(new BZOutLocalizationMatcher());
+        this.clients.add(new FrenchIncLocalizationMatcher());
+        this.clients.add(new FrenchOutLocalizationMatcher());
     }
 
     @Override

diff --git a/...rc/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java b/...rc/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java
@@ -23,6 +23,7 @@ public TradeIncMessagesInterceptor() {
         this.clients.add(new RuIncLocalizationMatcher());
         this.clients.add(new ArabicInLocalizationMatcher());
         this.clients.add(new BZIncLocalizationMatcher());
+        this.clients.add(new FrenchIncLocalizationMatcher());
     }
 
     @Override
@@ -113,4 +114,16 @@ public String trimString(String src) {
             return StringUtils.substringAfter(src, "@De");
         }
     }
+
+    private class FrenchIncLocalizationMatcher extends LocalizationMatcher {
+        @Override
+        public boolean isSuitableFor(String message) {
+            return message.contains("@De") && super.isSuitableFor(message);
+        }
+
+        @Override
+        public String trimString(String src) {
+            return StringUtils.substringAfter(src, "@De");
+        }
+    }
 }
diff --git a/...rc/main/java/com/mercury/platform/core/utils/interceptor/TradeOutMessagesInterceptor.java b/...rc/main/java/com/mercury/platform/core/utils/interceptor/TradeOutMessagesInterceptor.java
@@ -25,6 +25,7 @@ public TradeOutMessagesInterceptor() {
         this.clients.add(new RuOutLocalizationMatcher());
         this.clients.add(new ArabicOutLocalizationMatcher());
         this.clients.add(new BZOutLocalizationMatcher());
+        this.clients.add(new FrenchOutLocalizationMatcher());
     }
 
     @Override
@@ -159,4 +160,27 @@ public NotificationDescriptor getDescriptor(String message) {
             return descriptor;
         }
     }
+
+    private class FrenchOutLocalizationMatcher extends LocalizationMatcher {
+        @Override
+        public boolean isSuitableFor(String message) {
+            return message.contains("@À") && super.isSuitableFor(message);
+        }
+
+        @Override
+        public String trimString(String src) {
+            return StringUtils.substringAfter(src, "@À");
+        }
+
+        @Override
+        public NotificationDescriptor getDescriptor(String message) {
+            NotificationDescriptor descriptor = messageParser.parse(this.trimString(message));
+            if (descriptor instanceof ItemTradeNotificationDescriptor) {
+                descriptor.setType(NotificationType.OUT_ITEM_MESSAGE);
+            } else {
+                descriptor.setType(NotificationType.OUT_CURRENCY_MESSAGE);
+            }
+            return descriptor;
+        }
+    }
 }
diff --git a/...java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java b/...java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java
@@ -64,6 +64,14 @@ public void validate() {
             this.selectedProfile.getHotkeysSettingsDescriptor()
                     .getOutNHotKeysList().add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor()));
         }
+
+        if (this.selectedProfile.getHotkeysSettingsDescriptor()
+                .getScannerNHotKeysList().stream()
+                .filter(it -> it.getType().equals(HotKeyType.N_WHO_IS))
+                .findAny().orElse(null) == null) {
+            this.selectedProfile.getHotkeysSettingsDescriptor()
+                    .getScannerNHotKeysList().add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor()));
+        }
     }
 
     @Override

diff --git a/.../java/com/mercury/platform/ui/components/panel/notification/ScannerNotificationPanel.java b/.../java/com/mercury/platform/ui/components/panel/notification/ScannerNotificationPanel.java
@@ -76,6 +76,8 @@ private JPanel getHeader() {
         });
         JButton openChatButton = componentsFactory.getIconButton("app/openChat.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.OPEN_CHAT);
         openChatButton.addActionListener(e -> this.controller.performOpenChat());
+        JButton whoIsButton = componentsFactory.getIconButton("app/who-is.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.WHO_IS);
+        whoIsButton.addActionListener(e -> controller.performWhoIs());
         JButton hideButton = componentsFactory.getIconButton("app/close.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.HIDE_PANEL);
         hideButton.addActionListener(action -> {
             this.controller.performHide();
@@ -85,6 +87,7 @@ private JPanel getHeader() {
         interactionPanel.add(visiteHideout);
         interactionPanel.add(tradeButton);
         interactionPanel.add(leaveButton);
+        interactionPanel.add(whoIsButton);
         interactionPanel.add(openChatButton);
         interactionPanel.add(hideButton);
 
@@ -93,6 +96,7 @@ private JPanel getHeader() {
         this.interactButtonMap.put(HotKeyType.N_VISITE_HIDEOUT, visiteHideout);
         this.interactButtonMap.put(HotKeyType.N_TRADE_PLAYER, tradeButton);
         this.interactButtonMap.put(HotKeyType.N_LEAVE, leaveButton);
+        this.interactButtonMap.put(HotKeyType.N_WHO_IS, whoIsButton);
         this.interactButtonMap.put(HotKeyType.N_OPEN_CHAT, openChatButton);
         this.interactButtonMap.put(HotKeyType.N_CLOSE_NOTIFICATION, hideButton);
 

diff --git a/...y/platform/ui/components/panel/notification/controller/NotificationScannerController.java b/...y/platform/ui/components/panel/notification/controller/NotificationScannerController.java
@@ -28,6 +28,11 @@ public void performLeave(String nickName) {
         MercuryStoreCore.chatCommandSubject.onNext("/kick " + nickName);
     }
 
+    @Override
+    public void performWhoIs() {
+        MercuryStoreCore.chatCommandSubject.onNext("/whois " + notificationDescriptor.getNickName());
+    }
+
     @Override
     public void performOfferTrade() {
         MercuryStoreCore.chatCommandSubject.onNext("/tradewith " + notificationDescriptor.getNickName());

diff --git a/.../mercury/platform/ui/components/panel/notification/controller/ScannerPanelController.java b/.../mercury/platform/ui/components/panel/notification/controller/ScannerPanelController.java
@@ -6,4 +6,6 @@ public interface ScannerPanelController extends NotificationController {
     void performInvite();
 
     void performLeave(String nickName);
+
+    void performWhoIs();
 }
diff --git a/...cury/platform/ui/components/panel/notification/controller/stub/ScannerStubController.java b/...cury/platform/ui/components/panel/notification/controller/stub/ScannerStubController.java
@@ -40,4 +40,9 @@ public void performInvite() {
     public void performLeave(String nickName) {
 
     }
+
+    @Override
+    public void performWhoIs() {
+
+    }
 }
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java
@@ -156,8 +156,8 @@ private JPanel getOperationsButtons() {
         JButton openTests = this.getOperationButton("Open tests", "app/open-tests.png");
         openTests.addActionListener(action -> {
             FramesManager.INSTANCE.hideFrame(SettingsFrame.class);
-//            FramesManager.INSTANCE.showFrame(TestCasesFrame.class);
-            FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class);
+            FramesManager.INSTANCE.showFrame(TestCasesFrame.class);
+//            FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class);
         });
         root.add(this.componentsFactory.wrapToSlide(openTutorial));
         root.add(this.componentsFactory.wrapToSlide(checkUpdates));