pass callbacks instead of helpers to editor instance

silentsignal · May 9, 2016 · c22822e · c22822e
1 parent a40d3d4
commit c22822e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/burp/BurpExtender.java b/src/burp/BurpExtender.java
@@ -4,18 +4,18 @@
 
 public class BurpExtender implements IBurpExtender, IMessageEditorTabFactory
 {
-	IExtensionHelpers helpers;
+	IBurpExtenderCallbacks callbacks;
 
 	@Override
 	public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks)
 	{
 		callbacks.setExtensionName("JSON JTree");
 		callbacks.registerMessageEditorTabFactory(this);
-		this.helpers = callbacks.getHelpers();
+		this.callbacks = callbacks;
 	}
 
 	@Override
 	public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
-		return new JsonJTree(helpers);
+		return new JsonJTree(callbacks);
 	}
 }
diff --git a/src/burp/JsonJTree.java b/src/burp/JsonJTree.java
@@ -18,13 +18,15 @@ public class JsonJTree extends MouseAdapter implements IMessageEditorTab, Clipbo
 	private final DefaultTreeModel model = (DefaultTreeModel)tree.getModel();
 	private byte[] content;
 	private final IExtensionHelpers helpers;
+	private final IBurpExtenderCallbacks callbacks;
 	private int bodyOffset;
 
-	JsonJTree(IExtensionHelpers helpers) {
+	JsonJTree(IBurpExtenderCallbacks callbacks) {
         tree.getSelectionModel().setSelectionMode
                 (TreeSelectionModel.SINGLE_TREE_SELECTION);
 		tree.addMouseListener(this);
-		this.helpers = helpers;
+		this.callbacks = callbacks;
+		this.helpers = callbacks.getHelpers();
 	}
 
 	@Override public void mousePressed (MouseEvent e) { if (e.isPopupTrigger()) doPop(e); }