From 9013ec71fcf90a1cd27e59f268edb3ae38ff58ff Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Thu, 29 Mar 2012 11:25:18 -0400 Subject: [PATCH] changed TmfEvent to ITmfEvent --- .../handlers/OpenExperimentHandler.java | 22 ++++++++----- .../ui/project/handlers/OpenTraceHandler.java | 25 +++++++------- .../tmf/ui/editors/EventsViewEditor.java | 21 ++++++------ .../tmf/ui/editors/TmfEventsEditor.java | 33 ++++++++++--------- .../tmf/ui/project/model/TmfTraceElement.java | 22 ++++++++----- 5 files changed, 68 insertions(+), 55 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java index 87fdfb830a..6c3e817232 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2010, 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; @@ -67,15 +68,17 @@ public class OpenExperimentHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } // Get the selection IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IWorkbenchPart part = page.getActivePart(); ISelectionProvider selectionProvider = part.getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return false; + } ISelection selection = selectionProvider.getSelection(); // Make sure there is only one selection and that it is an experiment @@ -103,8 +106,9 @@ public class OpenExperimentHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } try { IFile bookmarksFile = fExperiment.getProject().getExperimentsFolder().getResource().getFile(BOOKMARKS_HIDDEN_FILE); @@ -131,8 +135,8 @@ public class OpenExperimentHandler extends AbstractHandler { for (int i = 0; i < nbTraces; i++) { TmfTraceElement element = traceEntries.get(i); ITmfTrace trace = element.instantiateTrace(); - TmfEvent traceEvent = element.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = element.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { displayErrorMsg(Messages.OpenExperimentHandler_NoTraceType); for (int j = 0; j < i; j++) { traces[j].dispose(); @@ -168,10 +172,10 @@ public class OpenExperimentHandler extends AbstractHandler { IEditorInput editorInput = new TmfEditorInput(file, experiment); IWorkbench wb = PlatformUI.getWorkbench(); IWorkbenchPage activePage = wb.getActiveWorkbenchWindow().getActivePage(); - + String editorId = TmfEventsEditor.ID; IEditorPart editor = activePage.findEditor(new FileEditorInput(file)); - if (editor != null && editor instanceof IReusableEditor) { + if ((editor != null) && (editor instanceof IReusableEditor)) { activePage.reuseEditor((IReusableEditor) editor, editorInput); activePage.activate(editor); } else { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java index 69b6bba6ec..740f20e4a9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2010, 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; @@ -73,15 +73,17 @@ public class OpenTraceHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } // Get the selection IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IWorkbenchPart part = page.getActivePart(); ISelectionProvider selectionProvider = part.getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return false; + } ISelection selection = selectionProvider.getSelection(); // Make sure there is only one selection and that it is a trace @@ -109,8 +111,9 @@ public class OpenTraceHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return null; + } // Check that the trace is valid if (fTrace == null) { @@ -128,15 +131,15 @@ public class OpenTraceHandler extends AbstractHandler { } ITmfTrace trace = fTrace.instantiateTrace(); - TmfEvent traceEvent = fTrace.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = fTrace.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { displayErrorMsg(Messages.OpenTraceHandler_NoTraceType); return null; } // Get the editor_id from the extension point String editorId = fTrace.getEditorId(); - boolean usesEditor = editorId != null && editorId.length() > 0; + boolean usesEditor = (editorId != null) && (editorId.length() > 0); try { trace.initTrace(fTrace.getName(), fTrace.getLocation().getPath(), traceEvent.getClass()); @@ -184,7 +187,7 @@ public class OpenTraceHandler extends AbstractHandler { IWorkbenchPage activePage = wb.getActiveWorkbenchWindow().getActivePage(); IEditorPart editor = activePage.findEditor(new FileEditorInput(file)); - if (editor != null && editor instanceof IReusableEditor) { + if ((editor != null) && (editor instanceof IReusableEditor)) { activePage.reuseEditor((IReusableEditor) editor, editorInput); activePage.activate(editor); } else { @@ -201,7 +204,7 @@ public class OpenTraceHandler extends AbstractHandler { ITmfTrace[] traces = new ITmfTrace[] { trace }; TmfExperiment experiment = new TmfExperiment(traceEvent.getClass(), fTrace.getName(), traces, trace.getIndexPageSize()); experiment.setBookmarksFile(file); - + TmfExperiment.setCurrentExperiment(experiment); TmfSignalManager.dispatchSignal(new TmfExperimentSelectedSignal(this, experiment)); IDE.setDefaultEditor(file, EventsViewEditor.ID); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java index 0268dd5479..a4cc1dbefc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.linuxtools.internal.tmf.ui.project.handlers.Messages; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; @@ -46,7 +47,7 @@ import org.eclipse.ui.ide.IGotoMarker; import org.eclipse.ui.part.EditorPart; /** - * + * * This editor is used to open a trace in the Events view * and set the trace as the current experiment. * It intercepts the IGotoMarker adapter and dispatches @@ -97,7 +98,7 @@ public class EventsViewEditor extends TmfEditor { throw new PartInitException("Invalid IFileEditorInput: " + input); //$NON-NLS-1$ } TmfExperiment currentExperiment = TmfExperiment.getCurrentExperiment(); - if (currentExperiment != null && fFile.equals(currentExperiment.getBookmarksFile())) { + if ((currentExperiment != null) && fFile.equals(currentExperiment.getBookmarksFile())) { fTrace = currentExperiment; super.setSite(site); super.setInput(input); @@ -128,8 +129,8 @@ public class EventsViewEditor extends TmfEditor { for (int i = 0; i < nbTraces; i++) { TmfTraceElement traceElement = traceEntries.get(i); ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { for (int j = 0; j < i; j++) { traces[j].dispose(); } @@ -162,8 +163,8 @@ public class EventsViewEditor extends TmfEditor { TmfTraceElement traceElement = (TmfTraceElement) projectElement; // Instantiate the experiment trace ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { throw new PartInitException(Messages.OpenTraceHandler_NoTraceType); } try { @@ -189,8 +190,8 @@ public class EventsViewEditor extends TmfEditor { TmfTraceElement traceElement = (TmfTraceElement) projectElement; // Instantiate the experiment trace ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { throw new PartInitException(Messages.OpenTraceHandler_NoTraceType); } try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java index 9d26d4bc44..e9f736a52a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -34,6 +34,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.internal.tmf.ui.project.handlers.Messages; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; @@ -70,7 +71,7 @@ import org.osgi.framework.Bundle; public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReusableEditor, IPropertyListener, IResourceChangeListener { public static final String ID = "org.eclipse.linuxtools.tmf.ui.editors.events"; //$NON-NLS-1$ - + private TmfEventsTable fEventsTable; private IFile fFile; @SuppressWarnings("rawtypes") @@ -122,8 +123,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus for (int i = 0; i < nbTraces; i++) { TmfTraceElement traceElement = traceEntries.get(i); ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { for (int j = 0; j < i; j++) { traces[j].dispose(); } @@ -156,8 +157,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus TmfTraceElement traceElement = (TmfTraceElement) projectElement; // Instantiate the trace ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { throw new PartInitException(Messages.OpenTraceHandler_NoTraceType); } try { @@ -179,8 +180,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus TmfTraceElement traceElement = (TmfTraceElement) projectElement; // Instantiate the trace ITmfTrace trace = traceElement.instantiateTrace(); - TmfEvent traceEvent = traceElement.instantiateEvent(); - if (trace == null || traceEvent == null) { + ITmfEvent traceEvent = traceElement.instantiateEvent(); + if ((trace == null) || (traceEvent == null)) { throw new PartInitException(Messages.OpenTraceHandler_NoTraceType); } try { @@ -286,7 +287,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } return eventsTable; } - + private TmfEventsTable getEventsTable(Composite parent, int cacheSize) { if (fTrace instanceof TmfExperiment) { return getExperimentEventsTable((TmfExperiment) fTrace, parent, cacheSize); @@ -313,7 +314,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus break; } String eventsTableType = eventsTableTypeCE[0].getAttribute(TmfTraceType.CLASS_ATTR); - if (eventsTableType == null || eventsTableType.length() == 0) { + if ((eventsTableType == null) || (eventsTableType.length() == 0)) { break; } Bundle bundle = Platform.getBundle(ce.getContributor().getName()); @@ -366,7 +367,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus return null; } String traceType = resource.getPersistentProperty(TmfTraceElement.TRACETYPE); - if (commonTraceType != null && !commonTraceType.equals(traceType)) { + if ((commonTraceType != null) && !commonTraceType.equals(traceType)) { return null; } commonTraceType = traceType; @@ -387,7 +388,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus break; } String eventsTableType = eventsTableTypeCE[0].getAttribute(TmfTraceType.CLASS_ATTR); - if (eventsTableType == null || eventsTableType.length() == 0) { + if ((eventsTableType == null) || (eventsTableType.length() == 0)) { break; } Bundle bundle = Platform.getBundle(ce.getContributor().getName()); @@ -479,12 +480,12 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus public void addBookmark() { fEventsTable.addBookmark(fFile); } - + // ------------------------------------------------------------------------ // Signal handlers // ------------------------------------------------------------------------ - + @SuppressWarnings("unchecked") @TmfSignalHandler public void traceParserUpdated(TmfTraceParserUpdatedSignal signal) { @@ -527,7 +528,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus @TmfSignalHandler public void traceSelected(TmfTraceSelectedSignal signal) { - if (signal.getSource() != this && signal.getTrace().equals(fTrace)) { + if ((signal.getSource() != this) && signal.getTrace().equals(fTrace)) { getSite().getPage().bringToTop(this); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index e886b3e541..3c33a4e497 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010, 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -27,7 +27,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefin import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlEvent; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.editors.TmfEventsEditor; import org.eclipse.ui.IActionFilter; @@ -170,7 +170,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi return null; } - public TmfEvent instantiateEvent() { + public ITmfEvent instantiateEvent() { try { if (fTraceTypeId != null) { if (fTraceTypeId.startsWith(CustomTxtTrace.class.getCanonicalName())) { @@ -188,7 +188,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } } IConfigurationElement ce = sfTraceTypeAttributes.get(fTraceTypeId); - TmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR); + ITmfEvent event = (ITmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR); return event; } } catch (CoreException e) { @@ -264,17 +264,21 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi @Override public Object getPropertyValue(Object id) { - if (sfName.equals(id)) + if (sfName.equals(id)) { return getName(); + } - if (sfPath.equals(id)) + if (sfPath.equals(id)) { return getPath().toString(); + } - if (sfLocation.equals(id)) + if (sfLocation.equals(id)) { return getLocation().toString(); + } - if (sfIsLinked.equals(id)) + if (sfIsLinked.equals(id)) { return Boolean.valueOf(getResource().isLinked()).toString(); + } if (sfEventType.equals(id)) { if (fTraceTypeId != null) { -- 2.34.1