Add Call Graph [WIP]

recaf-ui/src/main/java/me/coley/recaf/ui/ClassView.java

@@ -1,7 +1,5 @@
 package me.coley.recaf.ui;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.geometry.Side;
 import javafx.scene.Node;
@@ -11,16 +9,16 @@
 import javafx.scene.control.TabPane;
 import javafx.scene.layout.BorderPane;
 import me.coley.recaf.RecafUI;
-import me.coley.recaf.code.*;
+import me.coley.recaf.code.ClassInfo;
+import me.coley.recaf.code.CommonClassInfo;
+import me.coley.recaf.code.DexClassInfo;
+import me.coley.recaf.code.MemberInfo;
 import me.coley.recaf.config.Configs;
-import me.coley.recaf.scripting.impl.WorkspaceAPI;
 import me.coley.recaf.ui.behavior.*;
 import me.coley.recaf.ui.control.CollapsibleTabPane;
-import me.coley.recaf.ui.control.NavigationBar;
 import me.coley.recaf.ui.control.hex.HexClassView;
 import me.coley.recaf.ui.pane.DecompilePane;
 import me.coley.recaf.ui.pane.HierarchyPane;
-import me.coley.recaf.ui.pane.MethodCallGraphPane;
 import me.coley.recaf.ui.pane.SmaliAssemblerPane;
 import me.coley.recaf.ui.pane.outline.OutlinePane;
 import me.coley.recaf.ui.util.Icons;
@@ -35,14 +33,13 @@
  *
  * @author Matt Coley
  */
-public class ClassView extends BorderPane implements ClassRepresentation, ToolSideTabbed, Cleanable, Undoable, FontSizeChangeable {
+public class ClassView extends BorderPane
+		implements ClassRepresentation, ToolSideTabbed, Cleanable, Undoable, FontSizeChangeable {
 	private final OutlinePane outline;
 	private final HierarchyPane hierarchy;
 	private final BorderPane mainViewWrapper = new BorderPane();
 	private final CollapsibleTabPane sideTabs = new CollapsibleTabPane();
 	private final SplitPane contentSplit = new SplitPane();
-	private final MethodCallGraphPane methodCallGraphCalls;
-	private final MethodCallGraphPane methodCallGraphCallers;
 	private ClassViewMode mode = Configs.editor().defaultClassMode;
 	private ClassRepresentation mainView;
 	private CommonClassInfo info;
@@ -55,16 +52,8 @@ public ClassView(CommonClassInfo info) {
 		this.info = info;
 		outline = new OutlinePane(this);
 		hierarchy = new HierarchyPane();
-		methodCallGraphCalls = new MethodCallGraphPane(WorkspaceAPI.getWorkspace(), MethodCallGraphPane.CallGraphMode.CALLS);
-		methodCallGraphCallers = new MethodCallGraphPane(WorkspaceAPI.getWorkspace(), MethodCallGraphPane.CallGraphMode.CALLERS);
 		// Setup main view
 		mainView = createViewForClass(info);
-		final ObjectBinding<MethodInfo> currentMethodBinding = Bindings.createObjectBinding(() -> {
-			final ItemInfo itemInfo = NavigationBar.getInstance().currentItemProperty().get();
-			return itemInfo instanceof MethodInfo ? (MethodInfo) itemInfo : null;
-		}, NavigationBar.getInstance().currentItemProperty());
-		methodCallGraphCalls.currentMethodProperty().bind(currentMethodBinding);
-		methodCallGraphCallers.currentMethodProperty().bind(currentMethodBinding);
 		mainViewWrapper.setCenter(mainView.getNodeRepresentation());
 		contentSplit.getItems().add(mainViewWrapper);
 		contentSplit.getStyleClass().add("view-split-pane");
@@ -118,8 +107,6 @@ public void onUpdate(CommonClassInfo newValue) {
 		info = newValue;
 		outline.onUpdate(newValue);
 		hierarchy.onUpdate(newValue);
-		methodCallGraphCalls.onUpdate(newValue);
-		methodCallGraphCallers.onUpdate(newValue);
 		if (mainView != null) {
 			mainView.onUpdate(newValue);
 		}
@@ -213,9 +200,7 @@ public void installSideTabs(CollapsibleTabPane tabPane) {
 	public void populateSideTabs(CollapsibleTabPane tabPane) {
 		tabPane.getTabs().addAll(
 				createOutlineTab(),
-				createHierarchyTab(),
-				createCallGraphTabCalls(),
-				createCallGraphTabCallers()
+				createHierarchyTab()
 		);
 		if (mainView instanceof ToolSideTabbed) {
 			((ToolSideTabbed) mainView).populateSideTabs(tabPane);
@@ -284,13 +269,6 @@ private Tab createHierarchyTab() {
 		return createTab("hierarchy.title", Icons.T_TREE, hierarchy);
 	}
 
-	private Tab createCallGraphTabCalls() {
-		return createTab("callgraph.calls.title", Icons.T_TREE, methodCallGraphCalls);
-	}
-	private Tab createCallGraphTabCallers() {
-		return createTab("callgraph.callers.title", Icons.T_TREE, methodCallGraphCallers);
-	}
-
 	private static Resource getPrimary() {
 		Workspace workspace = RecafUI.getController().getWorkspace();
 		if (workspace != null)

recaf-ui/src/main/java/me/coley/recaf/ui/context/MethodContextBuilder.java

@@ -10,6 +10,7 @@
 import me.coley.recaf.code.MethodInfo;
 import me.coley.recaf.config.Configs;
 import me.coley.recaf.mapping.MappingsAdapter;
+import me.coley.recaf.scripting.impl.WorkspaceAPI;
 import me.coley.recaf.search.TextMatchMode;
 import me.coley.recaf.ssvm.SsvmIntegration;
 import me.coley.recaf.ui.CommonUX;
@@ -20,6 +21,7 @@
 import me.coley.recaf.ui.docking.DockTab;
 import me.coley.recaf.ui.docking.RecafDockingManager;
 import me.coley.recaf.ui.docking.impl.ClassTab;
+import me.coley.recaf.ui.pane.MethodCallGraphsPane;
 import me.coley.recaf.ui.pane.SearchPane;
 import me.coley.recaf.ui.pane.assembler.AssemblerPane;
 import me.coley.recaf.ui.pane.graph.MethodGraphPane;
@@ -36,7 +38,9 @@
 
 import java.util.Optional;
 
-import static me.coley.recaf.ui.util.Menus.*;
+import static me.coley.recaf.ui.util.Menus.action;
+import static me.coley.recaf.ui.util.Menus.createHeader;
+import static me.coley.recaf.ui.util.Menus.menu;
 
 /**
  * Context menu builder for methods.
@@ -77,6 +81,7 @@ public ContextMenu build() {
 			menu.getItems().add(refactor);
 			Menu view = menu("menu.view", Icons.EYE);
 			view.getItems().add(action("menu.view.methodcfg", Icons.CHILDREN, this::graph));
+			view.getItems().add(action("menu.view.methodcallgraph", Icons.CHILDREN, this::callGraph));
 			menu.getItems().add(view);
 		}
 		if (canUseVm()) {
@@ -95,6 +100,10 @@ public ContextMenu build() {
 		return menu;
 	}
 
+	private void callGraph() {
+		new GenericWindow(new MethodCallGraphsPane(WorkspaceAPI.getWorkspace(), methodInfo)).show();
+	}
+
 	@Override
 	public MethodContextBuilder setOwnerInfo(CommonClassInfo info) {
 		this.ownerInfo = info;

recaf-ui/src/main/java/me/coley/recaf/ui/pane/MethodCallGraphPane.java

@@ -3,6 +3,7 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableObjectValue;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.scene.control.Label;
@@ -32,6 +33,8 @@
 import me.coley.recaf.util.threading.ThreadUtil;
 import me.coley.recaf.workspace.Workspace;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -55,12 +58,16 @@ public enum CallGraphMode {
 		}
 	}
 
-	public MethodCallGraphPane(Workspace workspace, CallGraphMode mode) {
+	public MethodCallGraphPane(@Nonnull Workspace workspace, @Nonnull CallGraphMode mode, @Nullable ObservableObjectValue<MethodInfo> methodInfoObservable) {
 		this.mode = mode;
 		this.workspace = workspace;
 		currentMethod.addListener((ChangeListener<? super MethodInfo>) this::onUpdateMethod);
 		graphTreeView.onUpdate(classInfo);
 		setCenter(graphTreeView);
+		if (methodInfoObservable != null) currentMethod.bind(methodInfoObservable);
+	}
+	public MethodCallGraphPane(@Nonnull Workspace workspace, @Nonnull CallGraphMode mode) {
+		this(workspace, mode, null);
 	}
 
 	private void onUpdateMethod(

recaf-ui/src/main/java/me/coley/recaf/ui/pane/MethodCallGraphsPane.java

@@ -0,0 +1,40 @@
+package me.coley.recaf.ui.pane;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.layout.BorderPane;
+import me.coley.recaf.code.MethodInfo;
+import me.coley.recaf.ui.docking.DockTab;
+import me.coley.recaf.ui.docking.DockingRegion;
+import me.coley.recaf.ui.docking.RecafDockingManager;
+import me.coley.recaf.workspace.Workspace;
+
+import javax.annotation.Nonnull;
+
+public class MethodCallGraphsPane extends BorderPane {
+
+	private final ObjectProperty<MethodInfo> currentMethodInfo;
+
+	public MethodCallGraphsPane(@Nonnull Workspace workspace, @Nonnull MethodInfo methodInfo) {
+		currentMethodInfo = new SimpleObjectProperty<>(methodInfo);
+		DockingWrapperPane wrapper = DockingWrapperPane.builder()
+				.title(currentMethodInfo.map(method -> "Calls: " + method.getOwner() + "#" + method.getName() + method.getDescriptor()))
+				.content(new MethodCallGraphPane(workspace, MethodCallGraphPane.CallGraphMode.CALLS, currentMethodInfo))
+				.size(600, 300)
+				.build();
+		DockingRegion region = wrapper.getTab().getParent();
+		RecafDockingManager.getInstance().createTabIn(region,
+				() -> new DockTab(currentMethodInfo.map(method -> "Callers: " + method.getOwner() + "#" + method.getName() + method.getDescriptor()),
+						new MethodCallGraphPane(workspace, MethodCallGraphPane.CallGraphMode.CALLERS, currentMethodInfo)));
+		region.getDockTabs().forEach(t -> t.setClosable(true));
+		setCenter(wrapper);
+	}
+
+	public MethodInfo getCurrentMethodInfo() {
+		return currentMethodInfo.get();
+	}
+
+	public ObjectProperty<MethodInfo> currentMethodInfoProperty() {
+		return currentMethodInfo;
+	}
+}

recaf-ui/src/main/resources/translations/en_US.lang

@@ -67,6 +67,7 @@ menu.view.hierarchy=Class hierarchy
 menu.view.hierarchy.children=Children
 menu.view.hierarchy.parents=Parents
 menu.view.methodcfg=Control flow graph
+menu.view.methodcallgraph=Call Graph
 menu.tab.close=Close
 menu.tab.closeothers=Close others
 menu.tab.closeall=Close all