diff options
10 files changed, 30 insertions, 23 deletions
diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java index 6686d3944c0..d6004aa0f19 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java @@ -15,7 +15,7 @@ import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.model.IHost; import org.yocto.remote.utils.RemoteHelper; @@ -84,23 +84,23 @@ abstract public class BaseModel implements IRunnableWithProgress { monitor.beginTask(RUN_MSG + taskName, WORKLOAD); monitor.subTask(INIT_MSG + taskName + DOTS); - init(new SubProgressMonitor(monitor, INIT_PERCENT)); + init(SubMonitor.convert(monitor, INIT_PERCENT)); monitor.subTask(PRE_PROCESS_MSG + taskName + DOTS); - preProcess(new SubProgressMonitor(monitor, PRE_PROCESS_PERCENT)); + preProcess(SubMonitor.convert(monitor, PRE_PROCESS_PERCENT)); monitor.subTask(PROCESS_MSG + taskName + DOTS); - process(new SubProgressMonitor(monitor, PROCESS_PERCENT)); + process(SubMonitor.convert(monitor, PROCESS_PERCENT)); monitor.subTask(POST_PROCESS_MSG + taskName + DOTS); - postProcess(new SubProgressMonitor(monitor, POST_PROCESS_PERCENT)); + postProcess(SubMonitor.convert(monitor, POST_PROCESS_PERCENT)); } catch (InterruptedException e){ throw new InterruptedException("User cancelled!"); } catch (InvocationTargetException e) { throw e; } finally { monitor.subTask(CLEAN_MSG + taskName + DOTS); - clean(new SubProgressMonitor(monitor, CLEAN_PERCENT)); + clean(SubMonitor.convert(monitor, CLEAN_PERCENT)); monitor.done(); } } diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java index 7fbe7c67082..d482448f0cb 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; @@ -118,7 +118,7 @@ public class OprofileModel extends BaseModel { monitor.beginTask("Starting oprofile", 100); //start oprofile-server monitor.subTask("Starting oprofile-server"); - startServer(new SubProgressMonitor(monitor,80)); + startServer(SubMonitor.convert(monitor,80)); //start local oprofile-viewer monitor.subTask("oprofile-viewer is running locally"); @@ -140,7 +140,7 @@ public class OprofileModel extends BaseModel { //stop oprofile-server if(stopServer) { monitor.subTask("Stopping oprofile-viewer"); - stopServer(new SubProgressMonitor(monitor,30)); + stopServer(SubMonitor.convert(monitor,30)); } } }catch (InterruptedException e){ diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/PowertopModel.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/PowertopModel.java index 79bef61e478..20dc0e4806e 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/PowertopModel.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/PowertopModel.java @@ -16,7 +16,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.rse.core.model.IHost; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchPage; @@ -74,10 +74,10 @@ public class PowertopModel extends BaseModel { try { //running powertop monitor.subTask("Generating powertop data file remotely"); - generateData(new SubProgressMonitor(monitor,30)); + generateData(SubMonitor.convert(monitor,30)); //download datafile monitor.subTask("Downloading powertop data file"); - getDataFile(new SubProgressMonitor(monitor,30)); + getDataFile(SubMonitor.convert(monitor,30)); //show it in the powertop view display.syncExec(new Runnable() { public void run() { diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapHandler.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapHandler.java index 466f0c39093..886e6353936 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapHandler.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapHandler.java @@ -9,6 +9,7 @@ * Intel - initial API and implementation *******************************************************************************/ package org.yocto.sdk.remotetools.actions; + import java.lang.reflect.InvocationTargetException; import org.eclipse.core.commands.AbstractHandler; @@ -34,6 +35,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; import org.yocto.remote.utils.RemoteHelper; +@SuppressWarnings("restriction") public class SystemtapHandler extends AbstractHandler { protected SystemtapSettingDialog setting; protected String changeTerm="export TERM=vt100;"; diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java index 5c14c9a45ed..ed110174d98 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java @@ -219,6 +219,7 @@ public class SystemtapSettingDialog extends Dialog { @Override protected void okPressed() { + @SuppressWarnings("unused") IDialogSettings settings = Activator.getDefault().getDialogSettings(); metadata_location = metadataLocationText.getText(); if ( (metadata_location == null) || metadata_location.isEmpty()) { diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/Ust2Model.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/Ust2Model.java index 8dcc5b3d98f..5ef3e5ee833 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/Ust2Model.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/Ust2Model.java @@ -25,7 +25,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; @@ -46,6 +46,7 @@ public class Ust2Model extends BaseModel { private String prj_name; + @SuppressWarnings("unused") private IWorkbenchWindow window; public Ust2Model(IHost host, String trace, String project, IWorkbenchWindow window) { @@ -89,6 +90,7 @@ public class Ust2Model extends BaseModel { String traceName = localFile.substring(0,localFile.length()-LOCAL_FILE_SUFFIX.length()); IWorkspaceRoot wsroot = ResourcesPlugin.getWorkspace().getRoot(); + @SuppressWarnings("unused") IPath full_path = wsroot.getFullPath(); IProject project = wsroot.getProject(prj_name); IFolder traceFolder = project.getFolder(TRACE_FOLDER_NAME); @@ -111,6 +113,7 @@ public class Ust2Model extends BaseModel { } } + @SuppressWarnings("unused") private String[] generateViewerParam() throws Exception { String viewerParam=new String(LOCAL_EXEC); int i; @@ -135,23 +138,20 @@ public class Ust2Model extends BaseModel { @Override public void process(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - // TODO Auto-generated method stub - - String datafile; - + monitor.beginTask("Running ust", 100); try { //preparing remote trace monitor.subTask("Preparing user space lttng data file remotely"); - generateData(new SubProgressMonitor(monitor,30)); + generateData(SubMonitor.convert(monitor,30)); //download datafile to local monitor.subTask("Downloading user space lttng data file"); - getDataFile(new SubProgressMonitor(monitor,30)); + getDataFile(SubMonitor.convert(monitor,30)); //extract datafile and import to lttng project - importToProject(new SubProgressMonitor(monitor,30)); + importToProject(SubMonitor.convert(monitor,30)); }catch (InterruptedException e){ throw e; diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/BaseFileView.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/BaseFileView.java index a5801c78a05..1df5a67c392 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/BaseFileView.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/BaseFileView.java @@ -85,6 +85,7 @@ public class BaseFileView extends ViewPart { if(line!=null) elements.add(line); }while(line!=null); + in.close(); }catch (Exception e) { e.printStackTrace(); } diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewTab.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewTab.java index c3fbd6a83c6..5af51ddd08c 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewTab.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewTab.java @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Menu; +// import org.eclipse.swt.widgets.Menu; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionClearAll; import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy; @@ -59,7 +59,8 @@ public class TerminalViewTab extends Composite { private IPropertyChangeListener propertyChangeListener; - private Menu menu; + // Only used in commented out code + // Menu menu; private boolean fMenuAboutToShow; diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewer.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewer.java index 21d010c78d9..38c6b5ef0e7 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewer.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TerminalViewer.java @@ -131,7 +131,8 @@ public class TerminalViewer extends ViewPart implements ISelectionListener, pagebook.showPage(noTabShownLabel); } - private void showTabsPage(){ + @SuppressWarnings("unused") + private void showTabsPage(){ pagebook.showPage(tabFolder); } diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java index 18149e78069..58ee11fe760 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/wizards/bsp/PropertiesPage.java @@ -442,6 +442,7 @@ public class PropertiesPage extends WizardPage { } private void updateKernelValues(final String value, String property) { + @SuppressWarnings("unused") String build_dir = ""; if ((bspElem.getBuildLoc() == null) || bspElem.getBuildLoc().isEmpty()) build_dir = bspElem.getMetadataLoc()+"/build"; |