projects / deliverable / tracecompass.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2010-11-09 Francois Chouinard <fchouinard@gmail.com> Contribution for Bug315307
[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / resources / ResourcesView.java
diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
index e1dee14dcce88530191f5cdca555ce3b4827d47c..2513a1bbff6538a05693df8bc4ca3e3e7e9f9b00 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
 import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
 import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
 import org.eclipse.linuxtools.lttng.ui.TraceDebug;
@@ -59,7 +60,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
        // ========================================================================
        // Data
        // ========================================================================
-       public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.resources";
+       public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.resources"; //$NON-NLS-1$
 
        // private int totalNumItems = 0;
        // Actions
@@ -115,8 +116,8 @@ public class ResourcesView extends AbsTimeUpdateView implements
 
                // Viewer to notify selection to this class
                // This class will synchronise selections with table.
-               tsfviewer.addWidgetSelectionListner(this);
-               tsfviewer.addWidgetTimeScaleSelectionListner(this);
+//             tsfviewer.addWidgetSelectionListner(this);
+//             tsfviewer.addWidgetTimeScaleSelectionListner(this);
 
                // Create the help context id for the viewer's control
                // TODO: Associate with help system
@@ -128,11 +129,11 @@ public class ResourcesView extends AbsTimeUpdateView implements
                hookContextMenu();
                contributeToActionBars();
 
-               // Read relevant values
-               int timeSpaceWidth = tsfviewer.getTimeSpace();
-               if (timeSpaceWidth < 0) {
-                       timeSpaceWidth = -timeSpaceWidth;
-               }
+//             // Read relevant values
+//             int timeSpaceWidth = tsfviewer.getTimeSpace();
+//             if (timeSpaceWidth < 0) {
+//                     timeSpaceWidth = -timeSpaceWidth;
+//             }
 
                TmfExperiment<?> experiment = TmfExperiment.getCurrentExperiment();
                if (experiment != null) {
@@ -141,7 +142,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
                                long time0 = experimentTRange.getStartTime().getValue();
                                long time1 = experimentTRange.getEndTime().getValue();
                                ParamsUpdater paramUpdater = getParamsUpdater();
-                               paramUpdater.update(time0, time1, timeSpaceWidth);
+                               paramUpdater.update(time0, time1); // , timeSpaceWidth);
                        }
                        // send the initial request and obtained the adjusted time used
                        TmfTimeRange adjustedTimeRange = initialExperimentDataRequest(this, experimentTRange);
@@ -157,6 +158,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
                MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
                menuMgr.setRemoveAllWhenShown(true);
                menuMgr.addMenuListener(new IMenuListener() {
+                       @Override
                        public void menuAboutToShow(IMenuManager manager) {
                                ResourcesView.this.fillContextMenu(manager);
                        }
@@ -234,12 +236,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                resetScale.setText(Messages.getString("ResourcesView.Action.Reset")); //$NON-NLS-1$
-               resetScale.setToolTipText(Messages
-                               .getString("ResourcesView.Action.Reset.ToolTip")); //$NON-NLS-1$
-               resetScale.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/home_nav.gif"));
+               resetScale.setToolTipText(Messages.getString("ResourcesView.Action.Reset.ToolTip")); //$NON-NLS-1$
+               resetScale.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/home_nav.gif")); //$NON-NLS-1$ //$NON-NLS-2$
 
                // action5
                nextEvent = new Action() {
@@ -251,12 +250,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                nextEvent.setText(Messages.getString("ResourcesView.Action.NextEvent")); //$NON-NLS-1$
-               nextEvent.setToolTipText(Messages
-                               .getString("ResourcesView.Action.NextEvent.Tooltip")); //$NON-NLS-1$
-               nextEvent.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/next_event.gif"));
+               nextEvent.setToolTipText(Messages.getString("ResourcesView.Action.NextEvent.Tooltip")); //$NON-NLS-1$
+               nextEvent.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/next_event.gif"));  //$NON-NLS-1$//$NON-NLS-2$
 
                // action6
                prevEvent = new Action() {
@@ -268,12 +264,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                prevEvent.setText(Messages.getString("ResourcesView.Action.PrevEvent")); //$NON-NLS-1$
-               prevEvent.setToolTipText(Messages
-                               .getString("ResourcesView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$
-               prevEvent.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/prev_event.gif"));
+               prevEvent.setToolTipText(Messages.getString("ResourcesView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$
+               prevEvent.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/prev_event.gif")); //$NON-NLS-1$//$NON-NLS-2$
 
                // action7
                nextTrace = new Action() {
@@ -284,14 +277,10 @@ public class ResourcesView extends AbsTimeUpdateView implements
                                }
                        }
                };
-               nextTrace.setText(Messages
-                               .getString("ResourcesView.Action.NextResource")); //$NON-NLS-1$
-               nextTrace.setToolTipText(Messages
-                               .getString("ResourcesView.Action.NextResource.ToolTip")); //$NON-NLS-1$
-               nextTrace.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/next_item.gif"));
+               nextTrace.setText(Messages.getString("ResourcesView.Action.NextResource")); //$NON-NLS-1$
+               nextTrace.setToolTipText(Messages.getString("ResourcesView.Action.NextResource.ToolTip")); //$NON-NLS-1$
+               nextTrace.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/next_item.gif")); //$NON-NLS-1$//$NON-NLS-2$
 
                // action8
                prevTrace = new Action() {
@@ -302,14 +291,10 @@ public class ResourcesView extends AbsTimeUpdateView implements
                                }
                        }
                };
-               prevTrace.setText(Messages
-                               .getString("ResourcesView.Action.PreviousResource")); //$NON-NLS-1$
-               prevTrace.setToolTipText(Messages
-                               .getString("ResourcesView.Action.PreviousResource.Tooltip")); //$NON-NLS-1$
-               prevTrace.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/prev_item.gif"));
+               prevTrace.setText(Messages.getString("ResourcesView.Action.PreviousResource")); //$NON-NLS-1$
+               prevTrace.setToolTipText(Messages.getString("ResourcesView.Action.PreviousResource.Tooltip")); //$NON-NLS-1$
+               prevTrace.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/prev_item.gif"));  //$NON-NLS-1$//$NON-NLS-2$
 
                // action9
                showLegend = new Action() {
@@ -321,8 +306,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                showLegend.setText(Messages.getString("ResourcesView.Action.Legend")); //$NON-NLS-1$
-               showLegend.setToolTipText(Messages
-                               .getString("ResourcesView.Action.Legend.ToolTip")); //$NON-NLS-1$
+               showLegend.setToolTipText(Messages.getString("ResourcesView.Action.Legend.ToolTip")); //$NON-NLS-1$
 
                // action10
                filterTraces = new Action() {
@@ -334,12 +318,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                filterTraces.setText(Messages.getString("ResourcesView.Action.Filter")); //$NON-NLS-1$
-               filterTraces.setToolTipText(Messages
-                               .getString("ResourcesView.Action.Filter.ToolTip")); //$NON-NLS-1$
-               filterTraces.setImageDescriptor(AbstractUIPlugin
-                               .imageDescriptorFromPlugin(Messages
-                                               .getString("ResourcesView.tmf.UI"),
-                                               "icons/filter_items.gif"));
+               filterTraces.setToolTipText(Messages.getString("ResourcesView.Action.Filter.ToolTip")); //$NON-NLS-1$
+               filterTraces.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/filter_items.gif"));  //$NON-NLS-1$//$NON-NLS-2$
 
                // action10
                zoomIn = new Action() {
@@ -351,11 +332,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                zoomIn.setText(Messages.getString("ResourcesView.Action.ZoomIn")); //$NON-NLS-1$
-               zoomIn.setToolTipText(Messages
-                               .getString("ResourcesView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$
+               zoomIn.setToolTipText(Messages.getString("ResourcesView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$
                zoomIn.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
-                               Messages.getString("ResourcesView.tmf.UI"),
-                               "icons/zoomin_nav.gif"));
+                               Messages.getString("ResourcesView.tmf.UI"), "icons/zoomin_nav.gif"));  //$NON-NLS-1$//$NON-NLS-2$
 
                // action10
                zoomOut = new Action() {
@@ -367,11 +346,9 @@ public class ResourcesView extends AbsTimeUpdateView implements
                        }
                };
                zoomOut.setText(Messages.getString("ResourcesView.Action.ZoomOut")); //$NON-NLS-1$
-               zoomOut.setToolTipText(Messages
-                               .getString("ResourcesView.Action.ZoomOut.tooltip")); //$NON-NLS-1$
+               zoomOut.setToolTipText(Messages.getString("ResourcesView.Action.ZoomOut.tooltip")); //$NON-NLS-1$
                zoomOut.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
-                               Messages.getString("ResourcesView.tmf.UI"),
-                               "icons/zoomout_nav.gif"));
+                               Messages.getString("ResourcesView.tmf.UI"),     "icons/zoomout_nav.gif"));  //$NON-NLS-1$//$NON-NLS-2$
 
                // zoomFilter
                zoomFilter = new Action() {
@@ -384,8 +361,8 @@ public class ResourcesView extends AbsTimeUpdateView implements
 
                zoomFilter.setText(Messages.getString("ResourcesView.Action.ZoomFilter")); //$NON-NLS-1$
                zoomFilter.setToolTipText(Messages.getString("ResourcesView.Action.ZoomFilter.tooltip")); //$NON-NLS-1$
-               zoomFilter.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Messages
-                               .getString("ResourcesView.tmf.UI"), "icons/filter_items.gif"));
+               zoomFilter.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
+                               Messages.getString("ResourcesView.tmf.UI"), "icons/filter_items.gif"));  //$NON-NLS-1$//$NON-NLS-2$
                zoomFilter.setChecked(false);
 
                // PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_SYNCED);
@@ -439,17 +416,22 @@ public class ResourcesView extends AbsTimeUpdateView implements
        public void displayModel(final ITmfTimeAnalysisEntry[] items, final long startBoundTime,
                        final long endBoundTime, final boolean updateTimeBounds, final long startVisibleWindow,
                        final long endVisibleWindow, final Object source) {
-
+               
+               // Return if disposed
+               if ((tsfviewer == null) || (tsfviewer.getControl().isDisposed())) return;
+               
                Display display = tsfviewer.getControl().getDisplay();
                display.asyncExec(new Runnable() {
-
+                       @Override
                        public void run() {
-                               tsfviewer.display(items, startBoundTime, endBoundTime, updateTimeBounds);
-                               // validate visible boundaries
-                               if (startVisibleWindow > -1 && endVisibleWindow > -1) {
-                                       tsfviewer.setSelectVisTimeWindow(startVisibleWindow, endVisibleWindow, source);
+                               if ((tsfviewer != null) && (!tsfviewer.getControl().isDisposed())) {
+                                       tsfviewer.display(items, startBoundTime, endBoundTime, updateTimeBounds);
+                                       // validate visible boundaries
+                                       if (startVisibleWindow > -1 && endVisibleWindow > -1) {
+                                               tsfviewer.setSelectVisTimeWindow(startVisibleWindow, endVisibleWindow, source);
+                                       }
+                                       tsfviewer.resizeControls();
                                }
-                               tsfviewer.resizeControls();
                        }
                });
        }
@@ -534,7 +516,7 @@ public class ResourcesView extends AbsTimeUpdateView implements
 
                dataRequest(initTimeWindow, experimentTRange, true, ExecutionType.FOREGROUND);
                if (TraceDebug.isDEBUG()) {
-                       TraceDebug.debug("Initialization request time range is: " + initTimeWindow.getStartTime().toString() + "-"
+                       TraceDebug.debug("Initialization request time range is: " + initTimeWindow.getStartTime().toString() + "-" //$NON-NLS-1$ //$NON-NLS-2$
                                        + initTimeWindow.getEndTime().toString());
                }
 
@@ -562,4 +544,13 @@ public class ResourcesView extends AbsTimeUpdateView implements
        protected ItemContainer<?> getItemContainer() {
                return ResourceModelFactory.getResourceContainer();
        }
+       
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView#getProviderId()
+        */
+       @Override
+    protected int getProviderId() { 
+        return LttngCoreProviderFactory.RESOURCE_LTTNG_SYTH_EVENT_PROVIDER; 
+    }
 }
\ No newline at end of file
Tracecompass - Deliverables
This page took 0.053 seconds and 5 git commands to generate.