diff options
author | dstadnik | 2006-05-11 13:57:49 +0000 |
---|---|---|
committer | dstadnik | 2006-05-11 13:57:49 +0000 |
commit | c847ad033470b1e743d1ae31d9707a2f274ed92c (patch) | |
tree | dc569d3f4de9e29ab1c05e127c5b72ab596a046d /devtools | |
parent | 09ae7477a043ee2848a2e86a2b70e152f8291652 (diff) | |
download | org.eclipse.gmf-tooling-c847ad033470b1e743d1ae31d9707a2f274ed92c.tar.gz org.eclipse.gmf-tooling-c847ad033470b1e743d1ae31d9707a2f274ed92c.tar.xz org.eclipse.gmf-tooling-c847ad033470b1e743d1ae31d9707a2f274ed92c.zip |
remove hook
Diffstat (limited to 'devtools')
-rw-r--r-- | devtools/org.eclipse.gmf.dev/META-INF/MANIFEST.MF | 1 | ||||
-rw-r--r-- | devtools/org.eclipse.gmf.dev/src/org/eclipse/gmf/dev/EditPartTraceView.java | 91 |
2 files changed, 13 insertions, 79 deletions
diff --git a/devtools/org.eclipse.gmf.dev/META-INF/MANIFEST.MF b/devtools/org.eclipse.gmf.dev/META-INF/MANIFEST.MF index fd89721ed..9ab53261c 100644 --- a/devtools/org.eclipse.gmf.dev/META-INF/MANIFEST.MF +++ b/devtools/org.eclipse.gmf.dev/META-INF/MANIFEST.MF @@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.draw2d, org.eclipse.gef, - org.eclipse.gmf.dev.hook, org.eclipse.gmf.runtime.diagram.ui Eclipse-LazyStart: true diff --git a/devtools/org.eclipse.gmf.dev/src/org/eclipse/gmf/dev/EditPartTraceView.java b/devtools/org.eclipse.gmf.dev/src/org/eclipse/gmf/dev/EditPartTraceView.java index 035c40db6..b71c89527 100644 --- a/devtools/org.eclipse.gmf.dev/src/org/eclipse/gmf/dev/EditPartTraceView.java +++ b/devtools/org.eclipse.gmf.dev/src/org/eclipse/gmf/dev/EditPartTraceView.java @@ -19,11 +19,8 @@ import java.util.Map; import java.util.Stack; import org.eclipse.gef.EditPart; -import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; -import org.eclipse.gmf.dev.hook.EditPartTraceListener; -import org.eclipse.gmf.dev.hook.EditPartTracer; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IToolBarManager; @@ -38,10 +35,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IMemento; -import org.eclipse.ui.IPartListener; import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; @@ -51,38 +45,12 @@ import org.eclipse.ui.part.ViewPart; public class EditPartTraceView extends ViewPart { private TreeViewer viewer; - private List<IAction> actions; - private EditPartTraceRequestFilters requestFilters = new EditPartTraceRequestFilters(); - private IWorkbenchPart part; - private Stack<CommandCreatedEvent> history = new Stack<CommandCreatedEvent>(); - - private IPartListener partListener = new IPartListener() { - - public void partActivated(IWorkbenchPart part) { - install(part); - } - - public void partDeactivated(IWorkbenchPart part) { - install(null); - } - - public void partBroughtToTop(IWorkbenchPart part) {} - public void partOpened(IWorkbenchPart part) {} - - public void partClosed(IWorkbenchPart part) {} - }; - - private EditPartTraceListener traceListener = new EditPartTraceListener() { + private List<IAction> actions; - public void commandRequested(EditPart editPart, Request request) { - traceCommandRequested(editPart, request); - } + private EditPartTraceRequestFilters requestFilters = new EditPartTraceRequestFilters(); - public void commandCreated(EditPart editPart, Request request, Command command, Map sources) { - traceCommandCreated(editPart, request, command, sources); - } - }; + private Stack<CommandCreatedEvent> history = new Stack<CommandCreatedEvent>(); private List<EditPartTraceRecord> getRecords() { return (List<EditPartTraceRecord>) viewer.getInput(); @@ -106,11 +74,6 @@ public class EditPartTraceView extends ViewPart { requestFilters.writeState(memento); } - protected void setSite(IWorkbenchPartSite site) { - super.setSite(site); - site.getWorkbenchWindow().getPartService().addPartListener(partListener); - } - public void createPartControl(Composite parent) { viewer = new TreeViewer(parent); viewer.addFilter(new TraceViewerFilter()); @@ -165,45 +128,14 @@ public class EditPartTraceView extends ViewPart { } } - public void dispose() { - getSite().getWorkbenchWindow().getPartService().removePartListener(partListener); - install(null); - super.dispose(); - } - - protected void install(IWorkbenchPart part) { - EditPartTracer tracer = getTracer(this.part, false); - if (tracer != null) { - tracer.removeTraceListener(traceListener); - this.part = null; - } - tracer = getTracer(part, true); - if (tracer != null) { - tracer.addTraceListener(traceListener); - this.part = part; - } - } - - protected static EditPartTracer getTracer(IWorkbenchPart part, boolean hook) { - if (part == null) { - return null; - } - GraphicalViewer viewer = (GraphicalViewer) part.getAdapter(GraphicalViewer.class); - EditPartTracer tracer = EditPartTracer.getInstance(viewer); - if (tracer == null && hook) { - tracer = EditPartTracer.install(viewer); - } - return tracer; - } - - protected void traceCommandRequested(EditPart editPart, Request request) { + public void traceCommandRequested(EditPart editPart, Request request) { CommandCreatedEvent event = new CommandCreatedEvent(); event.editPart = editPart; event.request = request; history.push(event); } - protected void traceCommandCreated(EditPart editPart, Request request, Command command, Map sources) { + public void traceCommandCreated(EditPart editPart, Request request, Command command, Map sources) { if (history.isEmpty()) { throw new IllegalStateException("Command requested event was not received."); } @@ -265,15 +197,16 @@ public class EditPartTraceView extends ViewPart { } } EditPartTraceRecord[] akids = (EditPartTraceRecord[]) kids.toArray(new EditPartTraceRecord[kids.size()]); - return top ? new TopEditPartTraceRecord(text.toString(), DevPlugin.EVENT_IMAGE, akids, requestType) - : new EditPartTraceRecord(text.toString(), DevPlugin.EVENT_IMAGE, akids); + return top ? new TopEditPartTraceRecord(text.toString(), DevPlugin.EVENT_IMAGE, akids, requestType) : new EditPartTraceRecord(text.toString(), DevPlugin.EVENT_IMAGE, akids); } private class TraceContentProvider implements ITreeContentProvider { - public void dispose() {} + public void dispose() { + } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } public Object getParent(Object element) { if (element instanceof TopEditPartTraceRecord) { @@ -337,7 +270,8 @@ public class EditPartTraceView extends ViewPart { private class TraceViewerFilter extends ViewerFilter { - public TraceViewerFilter() {} + public TraceViewerFilter() { + } public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof TopEditPartTraceRecord) { @@ -353,6 +287,7 @@ public class EditPartTraceView extends ViewPart { private class TopEditPartTraceRecord extends EditPartTraceRecord { private String requestType; + private int timesRequested = 1; public TopEditPartTraceRecord(String label, String imageId, EditPartTraceRecord[] kids, String requestType) { |