- common helper is better suited to org.yocto.remote.utils since it is used for: - running commands - displaying error dialogs - remove common helper from remote tools plugin and add it to a separated plugin - modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
Signed-off-by: Ioana Grigoropol <[email protected]> --- .../src/org/yocto/remote/utils}/CommonHelper.java | 20 +++++++++++--------- .../sdk/remotetools/actions/OprofileModel.java | 2 +- .../actions/SystemtapSettingDialog.java | 2 +- .../sdk/remotetools/actions/TerminalHandler.java | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/CommonHelper.java (77%) diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java similarity index 77% rename from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java rename to plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java index 72a5dfd..c01e866 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java +++ b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java @@ -8,7 +8,7 @@ * Contributors: * Intel - initial API and implementation *******************************************************************************/ -package org.yocto.sdk.remotetools; +package org.yocto.remote.utils; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -18,27 +18,29 @@ import org.eclipse.swt.widgets.Display; public class CommonHelper { static public boolean isExecAvail(String exec) { - boolean ret=false; + boolean ret = false; try { - Process p=Runtime.getRuntime().exec(new String[] {"which",exec}); + Process p = Runtime.getRuntime().exec(new String[] {"which", exec}); p.waitFor(); - if(p.exitValue()==0) { - ret=true; + if(p.exitValue() == 0) { + ret = true; } } catch (Exception e) { e.printStackTrace(); } return ret; } - + public static void showErrorDialog(final String dialogTitle, final String errorMessage, final String reason) { - //needs to be run in the ui thread otherwise swt throws invalid thread access + //needs to be run in the ui thread otherwise swt throws invalid thread access Display.getDefault().syncExec(new Runnable() { + @Override public void run() { - ErrorDialog.openError(null, dialogTitle, errorMessage, new Status(IStatus.ERROR,Activator.PLUGIN_ID,reason)); + ErrorDialog.openError(null, dialogTitle, errorMessage, + new Status(IStatus.ERROR,Activator.PLUGIN_ID,reason)); } }); } - + } 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 c125df7..7fbe7c6 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 @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.ide.YoctoSDKPlugin; import org.yocto.sdk.ide.preferences.PreferenceConstants; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.LocalJob; import org.yocto.sdk.remotetools.Messages; 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 8b4703c..c447569 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 @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.remotetools.Activator; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.Messages; import org.yocto.sdk.remotetools.SWTFactory; diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java index 4ad8688..ae04dc9 100644 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java @@ -33,8 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.yocto.remote.utils.CommonHelper; import org.yocto.remote.utils.RSEHelper; -import org.yocto.sdk.remotetools.CommonHelper; abstract public class TerminalHandler extends AbstractHandler { -- 1.7.9.5 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
