Re-structure LTTng sub-project as per the Linux Tools guidelines

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / tracecontrol / actions / ImportToProject.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
index 1f030bb09ff6765a29023a57288566af3b8495a7..370fb857ff55ec0907e23f9585c54f07ce2db96b 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.ImportTraceDialog;
 import org.eclipse.rse.core.RSECorePlugin;
@@ -124,7 +124,7 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
                String traceName = dialog.getTraceName();
                if (trace.getTraceConfig().isNetworkTrace()) {
                        if (dialog.getLinkOnly()) {
-                               linkTrace(trace, project, traceName);
+                               linkTrace(getShell(), trace, project, traceName);
                        } else {
                                copyTrace(trace, project, traceName);
                        }
@@ -246,10 +246,10 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
     /*
      * Method to create a symbolic link to a trace residing on the local host. 
      */
-       private void linkTrace(TraceResource trace, IProject project, String traceName) {
+       public static void linkTrace(Shell shell, TraceResource trace, IProject project, String traceName) {
                IFolder traceFolder = project.getFolder(TRACE_FOLDER_NAME);
                if (!traceFolder.exists()) {
-                       MessageDialog.openWarning(getShell(),
+                       MessageDialog.openWarning(shell,
                                        Messages.ImportToProject_ImportFailed,
                                        Messages.ImportToProject_NoProjectTraceFolder);
                        return;
@@ -257,7 +257,7 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
                
                IFolder folder = traceFolder.getFolder(traceName);
                if (folder.exists()) {
-                       MessageDialog.openWarning(getShell(),
+                       MessageDialog.openWarning(shell,
                                        Messages.ImportToProject_ImportFailed,
                                        Messages.ImportToProject_AlreadyExists);
                        return;
@@ -268,7 +268,7 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
                try {
                        folder.createLink(sourceFolder.toURI(), IResource.REPLACE, null);
                } catch (CoreException e) {
-                       MessageDialog.openWarning(getShell(),
+                       MessageDialog.openWarning(shell,
                                        Messages.ImportToProject_ImportFailed,
                                        e.getMessage());
                }