fix SendTo

Readme-ja.md

@@ -18,7 +18,7 @@ Burp Suiteにはアジアの文字エンコーディングの利用に欠点が
 ## ビルド
 
 ```
-gradlew build
+gradlew release
 ```
 
 ## 動作環境
@@ -36,7 +36,7 @@ gradlew build
 
 ## 必須ライブラリ
 ビルドには別途 [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) のライブラリを必要とします。
-* BurpExtlib v2.1.2.0
+* BurpExtlib v2.1.2.2
 
 ### 利用ライブラリ
 
@@ -48,7 +48,7 @@ gradlew build
   * BSD 3-Clause license
   * https://github.com/bobbylight/RSyntaxTextArea/blob/master/RSyntaxTextArea/src/main/resources/META-INF/LICENSE
 
-* gson (https://github.com/google/gson)
+* Google gson (https://github.com/google/gson)
   * Apache License 2.0
   * https://github.com/google/gson/blob/master/LICENSE
 

Readme.md

@@ -18,7 +18,7 @@ If you are online, please refer to [help](/src/main/help/help.adoc).
 ## build
 
 ```
-gradlew build
+gradlew release
 ```
 
 ## Operating environment
@@ -36,7 +36,7 @@ gradlew build
 
 ## Required library
 Building requires a [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) library.
-* BurpExtlib v2.1.2.0
+* BurpExtlib v2.1.2.2
 
 ## Use Library
 * Apache common codec (https://commons.apache.org/proper/commons-codec/)
@@ -47,7 +47,7 @@ Building requires a [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) lib
   * BSD 3-Clause license
   * https://github.com/bobbylight/RSyntaxTextArea/blob/master/RSyntaxTextArea/src/main/resources/META-INF/LICENSE
 
-* gson (https://github.com/google/gson)
+* Google gson (https://github.com/google/gson)
   * Apache License 2.0
   * https://github.com/google/gson/blob/master/LICENSE
 

build.gradle

@@ -43,24 +43,28 @@ processResources {
     }
 }
 
-clean.doFirst { 
-    delete 'release/*.jar';
+clean.doFirst {
+    delete fileTree('release') {
+      include '*.jar'
+    }
 }
 
 jar {
+    // Keep jar clean:
+    exclude 'META-INF/**', 'about.html', 'module-info.class'
+
     manifest {
         attributes 'Main-Class': mainClassName
     }
-    
+
     from {
         configurations.runtimeClasspath.filter{ it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }
     }
 
-    destinationDir = file('release')
-    version =  "v${release_version_major}"
+    destinationDirectory = file('release')
+    archiveVersion =  "v${release_version_major}"
 }
 
-
 task release(type: Zip, dependsOn: ['build', 'asciidoctor']) {
     archiveBaseName ="${rootProject.name}_v${release_version_major}.${release_version_minor}"
     destinationDirectory = file("${projectDir}")

gradle.properties

@@ -1,3 +1,3 @@
 netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
 release_version_major=2.1
-release_version_minor=8.1
+release_version_minor=8.2

src/main/java/burp/BurpExtender.java

@@ -56,6 +56,7 @@
 import java.util.regex.Pattern;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
+import javax.swing.SwingUtilities;
 import javax.swing.table.TableModel;
 import passive.IssueItem;
 import yagura.Config;
@@ -228,13 +229,16 @@ public void uncaughtException(Thread t, Throwable e) {
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, null, ex);
             }
-
-            setSendToMenu(new SendToMenu(callbacks, this.option.getSendToProperty()));
+
             callbacks.registerHttpListener(this);
             callbacks.registerProxyListener(this);
-            callbacks.addSuiteTab(this.tabbetOption);
             callbacks.registerExtensionStateListener(this);
-            callbacks.registerContextMenuFactory(this.getSendToMenu());
+            SwingUtilities.invokeLater(() -> {
+                callbacks.addSuiteTab(this.tabbetOption);
+                setSendToMenu(new SendToMenu(callbacks, this.option.getSendToProperty()));
+                callbacks.registerContextMenuFactory(this.getSendToMenu());
+            });
+
             this.tabbetOption.setProperty(this.option);
             this.tabbetOption.addPropertyChangeListener(newPropertyChangeListener());
             this.registerView();

src/main/java/yagura/model/SendToMenu.java

@@ -25,6 +25,7 @@
 import javax.swing.FocusManager;
 import javax.swing.JMenuItem;
 import javax.swing.JTable;
+import javax.swing.KeyStroke;
 import javax.swing.table.TableModel;
 
 /**

src/main/java/yagura/model/SendToMultiEditor.java

@@ -1,5 +1,6 @@
 package yagura.model;
 
+import burp.BurpExtender;
 import burp.IContextMenuInvocation;
 import burp.IHttpRequestResponse;
 import extend.util.Util;

src/test/java/yagura/ConfigTest.java

@@ -32,7 +32,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import yagura.model.HotKey;
 import yagura.model.IOptionProperty;
 import yagura.model.MatchAlertItem;
 import yagura.model.MatchAlertProperty;
@@ -63,7 +62,6 @@ public static void tearDownClass() {
     @Before
     public void setUp() {
         JsonUtil.registerTypeHierarchyAdapter(MatchItem.class, new XMatchItemAdapter());
-        JsonUtil.registerTypeHierarchyAdapter(HotKey.class, new HotKeyAdapter());
     }
 
     @After