Improve Exception handling for LTTng 2.0 trace control

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java
index a89ed0cb7b9a545c3b087d6cee169d1783eef3a3..00cadc68c1c83079989ff136feb7d8b817eeae40 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java
@@ -43,25 +43,35 @@ final public class Messages extends NLS {
     public static String TraceControl_EclipseCommandFailure;
     public static String TraceControl_NewNodeCreationFailure;
     public static String TraceControl_CreateSessionJob;
+    public static String TraceControl_CreateSessionFailure;
     
     public static String TraceControl_DestroySessionJob;
+    public static String TraceControl_DestroySessionFailure;
     public static String TraceControl_DestroyConfirmationTitle;
     public static String TraceControl_DestroyConfirmationMessage;
     
     public static String TraceControl_ImportJob;
+    public static String TraceControl_ImportFailure;
 
-    public static String TraceControl_StartSessionJob;
-    public static String TraceControl_StopSessionJob;
+    public static String TraceControl_ChangeSessionStateJob;
+    public static String TraceControl_ChangeSessionStateFailure;
 
+    public static String TraceControl_CreateChannelStateJob;
+    public static String TraceControl_CreateChannelStateFailure;
+    
     public static String TraceControl_ChangeChannelStateJob;
+    public static String TraceControl_ChangeChannelStateFailure;
     public static String TraceControl_ChangeEventStateJob;
+    public static String TraceControl_ChangeEventStateFailure;
     
     public static String TraceControl_EnableEventsJob;
     public static String TraceControl_EnableEventsFailure;
     public static String TraceControl_DisableEventsJob;
     
     public static String TraceControl_GetContextJob;
+    public static String TraceControl_GetContextFailure;
     public static String TraceControl_AddContextJob;
+    public static String TraceControl_AddContextFailure;
     
     // Dialogs
     public static String TraceControl_NewDialogTitle;

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
index 953332920ef747fa1c29a15bf3d8f28fee4f41ce..18ec7287a90165ff23a7c8de4b5f94cf1c2737c7 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
@@ -175,7 +175,9 @@ public class AddContextDialog extends Dialog implements IAddContextDialog  {
         Object[] checkedElements = fContextsViewer.getCheckedElements();
         for (int i = 0; i < checkedElements.length; i++) {
             IContextModelComponent component = (IContextModelComponent)checkedElements[i];
-            fSelectedContexts.add(component.getName());
+            if (!Messages.TraceControl_AddContextAllLabel.equals(component.getName())) {
+                fSelectedContexts.add(component.getName());
+            }
         }
         
         // validation successful -> call super.okPressed()

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
index 053e7915a2b7b0fa5e2c1532e6b785b6ee611083..9715f739c8ff04829e6cca92cdb3a78594369b6d 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
@@ -355,7 +355,7 @@ public class ImportDialog extends Dialog implements IImportDialog {
     // ------------------------------------------------------------------------
     // Helper methods and classes
     // ------------------------------------------------------------------------
-    public class FolderContentProvider extends WorkbenchContentProvider {
+    public static class FolderContentProvider extends WorkbenchContentProvider {
         @Override
         public Object[] getChildren(Object o) {
             if (o instanceof IRemoteFile) {

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java
index 2c565bcdc6142e10692f09aede2e5582942a67da..09c9aa25786b9d38c0426ad0b362c16e554ee37c 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java
@@ -85,7 +85,8 @@ public class AssignEventHandler extends BaseControlViewHandler {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
 
-                    StringBuffer errorString = new StringBuffer();
+                    Exception error = null;
+
                     try {
                         List<String> eventNames = new ArrayList<String>();
                         List<BaseEventComponent> events = param.getEvents();
@@ -104,21 +105,14 @@ public class AssignEventHandler extends BaseControlViewHandler {
                         }
 
                     } catch (ExecutionException e) {
-                        errorString.append(e.toString());
-                        errorString.append('\n');
+                        error = e;
                     }
 
-                    // get session configuration in all cases
-                    try {
-                        dialog.getSession().getConfigurationFromNode(monitor);
-                    } catch (ExecutionException e) {
-                        errorString.append(Messages.TraceControl_ListSessionFailure);
-                        errorString.append(": "); //$NON-NLS-1$
-                        errorString.append(e.toString());
-                    } 
+                    // refresh in all cases
+                    refresh(new CommandParameter(dialog.getSession()));
 
-                    if (errorString.length() > 0) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString.toString());
+                    if (error != null) {
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_EnableEventsFailure, error);
                     }
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java
index 339e0b5a08f3fa989077a844ae3be9dff9735632..4f029b319bf9ea39e8d1afccf2be2afa92b34cab 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java
@@ -90,28 +90,21 @@ abstract public class BaseAddContextHandler extends BaseControlViewHandler {
                         Job addJob = new Job(Messages.TraceControl_AddContextJob) {
                             @Override
                             protected IStatus run(IProgressMonitor monitor) {
-                                StringBuffer errorString = new StringBuffer();
+                                Exception error = null;
 
                                 try {
                                     List<String> contextNames = dialog.getContexts();
                                     addContexts(param, contextNames, monitor);
 
                                 } catch (ExecutionException e) {
-                                    errorString.append(e.toString());
-                                    errorString.append('\n');
+                                    error = e;
                                 }
 
                                 // get session configuration in all cases
-                                try {
-                                    param.getSession().getConfigurationFromNode(monitor);
-                                } catch (ExecutionException e) {
-                                    errorString.append(Messages.TraceControl_ListSessionFailure);
-                                    errorString.append(": "); //$NON-NLS-1$
-                                    errorString.append(e.toString());
-                                } 
-
-                                if (errorString.length() > 0) {
-                                    return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString.toString());
+                                refresh(param);
+                                
+                                if (error != null) {
+                                    return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_AddContextFailure, error);
                                 }
                                 return Status.OK_STATUS;
                             }
@@ -119,7 +112,7 @@ abstract public class BaseAddContextHandler extends BaseControlViewHandler {
                         addJob.setUser(true);
                         addJob.schedule();
                     } catch (ExecutionException e) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_GetContextFailure, e);
                     }
 
                     return Status.OK_STATUS;

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java
index 80782b04802da410c6abef24f7b73e5bf458068b..d9e5fc0a8bc33fe2807e6118d3a250be1f4f6dfa 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java
@@ -14,7 +14,14 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.linuxtools.internal.lttng2.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView;
+import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -61,4 +68,26 @@ abstract public class BaseControlViewHandler extends AbstractHandler {
         }
         return page;
     }
+
+    /**
+     * Refreshes the session information based on given session (in CommandParameter)
+     * @param param - command parameter containing the session to refresh
+     */
+    protected void refresh(final CommandParameter param) {
+        Job job = new Job(Messages.TraceControl_RetrieveNodeConfigurationJob) {
+            
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    param.getSession().getConfigurationFromNode(monitor);
+                } catch (ExecutionException e) {
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ListSessionFailure, e);
+                } 
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(true);
+        job.schedule();
+    }
+
 }
\ No newline at end of file

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java
index f069d8a49fb6109b51a86f3c73216b9eddc136bd..1bb2298bbebd67eab9cdefd2687b7943f65f03bb 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java
@@ -80,10 +80,10 @@ abstract class BaseCreateChannelHandler extends BaseControlViewHandler {
                 return null;
             }
 
-            Job job = new Job(Messages.TraceControl_ChangeChannelStateJob) {
+            Job job = new Job(Messages.TraceControl_CreateChannelStateJob) {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
-                    StringBuffer errorString = new StringBuffer();
+                    Exception error = null;
 
                     List<String> channelNames = new ArrayList<String>();                    
                     channelNames.add(dialog.getChannelInfo().getName());
@@ -91,21 +91,14 @@ abstract class BaseCreateChannelHandler extends BaseControlViewHandler {
                     try {
                         enableChannel(param, channelNames, dialog.getChannelInfo(), dialog.isKernel(), monitor);
                     } catch (ExecutionException e) {
-                        errorString.append(e.toString());
-                        errorString.append("\n"); //$NON-NLS-1$
+                        error = e;
                     }
 
-                    // get session configuration in all cases
-                    try {
-                        param.getSession().getConfigurationFromNode(monitor);
-                    } catch (ExecutionException e) {
-                        errorString.append(Messages.TraceControl_ListSessionFailure);
-                        errorString.append(": "); //$NON-NLS-1$
-                        errorString.append(e.toString());
-                    } 
+                    // refresh in all cases
+                    refresh(param);
 
-                    if (errorString.length() > 0) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString.toString());
+                    if (error != null) {
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_CreateChannelStateFailure, error);
                     }
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java
index e0772c68a713e4256bb1047f27e00fd826690b36..94dc78e4f90c8f0fb8aeaefd180c2b06368280e2 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java
@@ -129,7 +129,7 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler {
             Job job = new Job(Messages.TraceControl_ChangeEventStateJob) {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
-                    StringBuffer errorString = new StringBuffer();
+                    Exception error = null;
 
                     try {
                         // Enable tracepoint events
@@ -175,21 +175,14 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler {
                         }
 
                     } catch (ExecutionException e) {
-                        errorString.append(e.toString());
-                        errorString.append('\n');
+                        error = e;
                     }
 
-                    // get session configuration in all cases
-                    try {
-                        param.getSession().getConfigurationFromNode(monitor);
-                    } catch (ExecutionException e) {
-                        errorString.append(Messages.TraceControl_ListSessionFailure);
-                        errorString.append(": "); //$NON-NLS-1$
-                        errorString.append(e.toString());
-                    } 
+                    // refresh in all cases
+                    refresh(param);
 
-                    if (errorString.length() > 0) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString.toString());
+                    if (error != null) {
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ChangeEventStateFailure, error);
                     }
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
index 9a8545be42f8b8029c81ffbc9d1ffef3bd9d5eeb..2bc593c851e68c278dfabfa2d29761a2559819c7 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
@@ -90,7 +90,7 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
             Job job = new Job(Messages.TraceControl_ChangeChannelStateJob) {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
-                    String errorString = null;
+                    Exception error = null;
 
                     TraceSessionComponent session = null;
 
@@ -139,14 +139,14 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
                             }
                         }
                     } catch (ExecutionException e) {
-                        errorString = e.toString() + "\n"; //$NON-NLS-1$
+                        error = e;
                     }
 
                     // In all cases notify listeners  
                     session.fireComponentChanged(session);
 
-                    if (errorString != null) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString);
+                    if (error != null) {
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ChangeChannelStateFailure, error);
                     }
 
                     return Status.OK_STATUS;

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java
index 5536699becf5652462fcc10111f46c1397cea749..e2d82ae528e581f52a26889413832a5d02b6fdbe 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java
@@ -91,7 +91,7 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler {
             Job job = new Job(Messages.TraceControl_ChangeChannelStateJob) {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
-                    StringBuffer errorString = new StringBuffer();
+                    Exception error = null;
 
                     TraceSessionComponent session = null;
 
@@ -128,8 +128,7 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler {
                             }
                         }
                     } catch (ExecutionException e) {
-                        errorString.append(e.toString());
-                        errorString.append('\n');
+                        error = e;
                     }
 
                     if (session != null) {
@@ -137,8 +136,8 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler {
                         session.fireComponentChanged(session);
                     }
 
-                    if (errorString.length() > 0) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, errorString.toString());
+                    if (error != null) {
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ChangeEventStateFailure, error);
                     }
 
                     return Status.OK_STATUS;

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
index 2065c30a82a3312ddaeffd7a926d973cdc2ec970..002c3c8441c29b7187b018e6955555e798e0c644 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
@@ -87,7 +87,7 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler {
             final List<TraceSessionComponent> sessions = new ArrayList<TraceSessionComponent>();
             sessions.addAll(fSessions);
 
-            Job job = new Job(Messages.TraceControl_StartSessionJob) {
+            Job job = new Job(Messages.TraceControl_ChangeSessionStateJob) {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
                     try {
@@ -102,7 +102,7 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler {
                             session.fireComponentChanged(session);
                         }
                     } catch (ExecutionException e) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ChangeSessionStateFailure, e);
                     }  
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java
index 08eb91621dd273b1cf3eb3068c99acd24681fd69..ab53e8234008fe396c28a4fea5157c649d24a2d1 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java
@@ -75,7 +75,7 @@ public class CreateSessionHandler extends BaseControlViewHandler {
                     try {
                         sessionGroup.createSession(sessionName, sessionPath, monitor);
                     } catch (ExecutionException e) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_CreateSessionFailure, e);
                     } 
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java
index e20da5fd53764e16ad6e5c901ee7051548c361df..8e6359b63e16b1788f4d4f33fb2926d7d42d8842 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java
@@ -91,7 +91,7 @@ public class DestroySessionHandler extends BaseControlViewHandler {
                         sessionGroup.destroySession(session, monitor);
                     }
                 } catch (ExecutionException e) {
-                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_DestroySessionFailure, e);
                 }  
                 return Status.OK_STATUS;
             }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java
index 1d714e81c2af90c1b63a99a890586dd50f9e9cd6..ae2257d8e54dff5393c3a17f7c7cfae2b1f75a19 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
@@ -121,7 +120,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler {
                     // Add only if corresponding TraceSessionComponents is inactive and not destroyed
                     TraceChannelComponent tmpChannel = (TraceChannelComponent) element; 
                     session = tmpChannel.getSession();
-                    if(session.getSessionState() == TraceSessionState.INACTIVE && !session.isDestroyed()) {
+                    if(!session.isDestroyed()) {
                         channel = tmpChannel;
                     }
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java
index 81845b6af009b1d77b2a8bc7b419cfd18be96a31..b3b23ef2001d85e30b35702bf6c105d1e4ae5833 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java
@@ -30,8 +30,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.linuxtools.internal.lttng2.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages;
-import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ImportFileInfo;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog;
+import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ImportFileInfo;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
@@ -102,7 +102,7 @@ public class ImportHandler extends BaseControlViewHandler {
                         }
 
                     } catch (ExecutionException e) {
-                        return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                        return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ImportFailure, e);
                     }  
                     return Status.OK_STATUS;
                 }

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties
index 22b1e8a2da410f1feca53b1b13f548dbfa1d2aa6..d37aebef38f585819511574f50baaa1115bb000b 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties
@@ -16,25 +16,35 @@ TraceControl_RetrieveNodeConfigurationJob=Retrieving Target Node Configuration..
 TraceControl_EclipseCommandFailure=Command failed
 TraceControl_NewNodeCreationFailure=Creation of new connection failed
 TraceControl_CreateSessionJob=Creating Session...
+TraceControl_CreateSessionFailure=Command to create session failed
 
 TraceControl_DestroySessionJob=Destroying Session...
+TraceControl_DestroySessionFailure=Command to destroy session failed
 TraceControl_DestroyConfirmationTitle=Destroy Confirmation
 TraceControl_DestroyConfirmationMessage=Do you want to delete all selected sessions?
 
 TraceControl_ImportJob=Importing Traces...
+TraceControl_ImportFailure=Command to import traces failed
 
-TraceControl_StartSessionJob=Starting Session...
-TraceControl_StopSessionJob=Stopping Session...
+TraceControl_ChangeSessionStateJob=Changing Session State...
+TraceControl_ChangeSessionStateFailure=Command to change session state failed...
+
+TraceControl_CreateChannelStateJob=Enabling (creating) channel... 
+TraceControl_CreateChannelStateFailure=Command to enable channel failed
     
 TraceControl_ChangeChannelStateJob=Changing State of Channels...
+TraceControl_ChangeChannelStateFailure=Command to change state of channels failed
 TraceControl_ChangeEventStateJob=Changing State of Events...
+TraceControl_ChangeEventStateFailure=Command to change state of events failed
 
 TraceControl_EnableEventsJob=Enabling Events...
-TraceControl_EnableEventsFailure=Enable Events failed
+TraceControl_EnableEventsFailure=Command to enable events failed
 TraceControl_DisableEventsJob=Disabling Events...
 
-TraceControl_GetContextJob=Getting Available Contexts... 
+TraceControl_GetContextJob=Getting Available Contexts...
+TraceControl_GetContextFailure=Command to get available contexts failed
 TraceControl_AddContextJob=Adding Contexts...
+TraceControl_AddContextFailure=Command to add contexts failed
 
 # Dialogs
 TraceControl_NewDialogTitle=New Connection

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java
index ab5b160a9044d76e85deb2a9c386564097b30b93..c62966f9677f8a212ab0c5108da18682961f5746 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java
@@ -259,7 +259,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
            } catch (Exception e) {
                setTargetNodeState(TargetNodeState.DISCONNECTED);
                Activator.getDefault().getLog().log(
-                       new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ConnectionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$
+                       new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ConnectionFailure + " (" + getName() + "). \n", e)); //$NON-NLS-1$ //$NON-NLS-2$
            }
        }
     }
@@ -274,7 +274,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
                 fRemoteProxy.disconnect();
             } catch (Exception e) {
                 Activator.getDefault().getLog().log(
-                        new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_DisconnectionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$
+                        new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_DisconnectionFailure + " (" + getName() + "). \n", e)); //$NON-NLS-1$ //$NON-NLS-2$
             } finally {
                 handleDisconnected();                    
             }
@@ -304,7 +304,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
                     sessionGroup.getSessionsFromNode(monitor);
                 } catch (ExecutionException e) {
                     removeAllChildren();
-                    return new Status(Status.ERROR, Activator.PLUGIN_ID, e.toString());
+                    return new Status(Status.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ListSessionFailure, e);
                 } 
 
                 return Status.OK_STATUS;
@@ -345,7 +345,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu
             getConfigurationFromNode();
         } catch (ExecutionException e) {
             Activator.getDefault().getLog().log(
-                    new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ListSessionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$
+                    new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ListSessionFailure + " (" + getName() + "). \n", e)); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }