/**********************************************************************
- * Copyright (c) 2013 Ericsson
+ * Copyright (c) 2013, 2014 Ericsson
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
*
* Contributors:
* Matthew Khouzam - Initial API and implementation
+ * Patrick Tasse - Add support for folder elements
**********************************************************************/
package org.eclipse.linuxtools.internal.tmf.ui.commands;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.linuxtools.internal.tmf.ui.Activator;
import org.eclipse.linuxtools.tmf.core.TmfCommonConstants;
import org.eclipse.linuxtools.tmf.ui.project.model.TmfOpenTraceHelper;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectRegistry;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@Override
public Object execute(ExecutionEvent event) {
+
+ ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+ // Menu Selection is not null for context-sensitive menu
+ ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);
+
+ // Get trace path
final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
FileDialog fd = new FileDialog(shell);
fd.setText(Messages.OpenFileHandler_SelectTraceFile);
return null;
}
- TmfOpenTraceHelper oth = new TmfOpenTraceHelper();
try {
- IProject project = TmfHandlerUtil.getProjectFromSelection(HandlerUtil.getCurrentSelection(event));
- String projectName = project != null ? project.getName() : TmfCommonConstants.DEFAULT_TRACE_PROJECT_NAME;
- oth.openTraceFromPath(projectName, filePath, shell);
+
+ TmfTraceFolder destinationFolder;
+
+ if ((menuSelection != null) && (currentSelection instanceof IStructuredSelection)) {
+ // If handler is called from the context sensitive menu of a tracing project import to
+ // the traces folder from this project
+ destinationFolder = TmfHandlerUtil.getTraceFolderFromSelection(currentSelection);
+ } else {
+ // If handler is called from file menu import into default tracing project
+ IProject project = TmfProjectRegistry.createProject(
+ TmfCommonConstants.DEFAULT_TRACE_PROJECT_NAME, null, new NullProgressMonitor());
+ TmfProjectElement projectElement = TmfProjectRegistry.getProject(project, true);
+ destinationFolder = projectElement.getTracesFolder();
+ }
+
+ TmfOpenTraceHelper.openTraceFromPath(destinationFolder, filePath, shell);
} catch (CoreException e) {
Activator.getDefault().logError(e.getMessage(), e);
}