diff --git a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/model/CallTreeGraphNode.java b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/model/CallTreeGraphNode.java index a47f96b..12a6d92 100644 --- a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/model/CallTreeGraphNode.java +++ b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/model/CallTreeGraphNode.java @@ -18,17 +18,16 @@ public CallTreeGraphNode(IContainer graphModel, int style, MethodExecution method) { super(graphModel, style, method.getMethodName(), method); - setSize(20.0, 5.0); -// set +// setSize(20.0, 5.0); } public void highlight() { this.focus = true; System.out.println(this.getSize().height() + ", " + this.getSize().width()); - GUIUtil.openEditor(this.getMethod()); + GUIUtil.openEditor(this.getMethodExecution()); } - public MethodExecution getMethod() { + public MethodExecution getMethodExecution() { return (MethodExecution)this.getData(); } diff --git a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/CallTreeGraph.java b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/CallTreeGraph.java index 2d68300..3d91f81 100644 --- a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/CallTreeGraph.java +++ b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/CallTreeGraph.java @@ -48,7 +48,7 @@ } public CallTreeGraphNode createCallerTreeGraphNode(CallTreeGraphNode calleeNode) { - MethodExecution parent = calleeNode.getMethod().getCallerMethodExecution(); + MethodExecution parent = calleeNode.getMethodExecution().getCallerMethodExecution(); if (parent == null) return null; CallTreeGraphNode callerNode = createTreeGraphNode(this, SWT.NONE, parent); setCurrentNode(callerNode); @@ -57,12 +57,6 @@ return callerNode; } - public void openFile() { - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); -// IEditorPart editorPart = page.openEditor - - } - public CallTreeGraphNode getCurrentNode() { return currentNode; } diff --git a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/InteractionComposite.java b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/InteractionComposite.java index 663ae21..878dc89 100644 --- a/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/InteractionComposite.java +++ b/org.ntlab.interactiveFeatureLocator/src/interactivefeaturelocator/views/InteractionComposite.java @@ -41,7 +41,7 @@ comboData.top = new FormAttachment(0, 10); comboData.right = new FormAttachment(100, -10); combo.setLayoutData(comboData); - updateCombo(me); + updateCombo(combo, me); combo.setVisible(!dataflow); decideButton = new Button(this, SWT.NONE); @@ -62,7 +62,7 @@ decideButton.setLayoutData(decideButtonData); discription = new Label(this, SWT.NONE); - updateDiscription(me); + updateDiscription(discription, me); FormData textData = new FormData(); textData.top = new FormAttachment(0, 0); textData.left = new FormAttachment(0, 0); @@ -86,11 +86,11 @@ } public void update(MethodExecution me) { - updateCombo(me); - updateDiscription(me); + updateCombo(combo, me); + updateDiscription(discription, me); } - public void updateCombo(MethodExecution me) { + public void updateCombo(Combo combo, MethodExecution me) { ArrayList propertyList = new ArrayList<>(((MethodInfo)me.getAugmentation()).getProperties()); setData(propertyList); for (MethodProperty property : (ArrayList)this.getData()) { @@ -114,7 +114,7 @@ } } - public void updateDiscription(MethodExecution me) { + public void updateDiscription(Label discription, MethodExecution me) { String text = ""; text += "Current Method : " + me.getSignature() + "\n"; discription.setText(text);