Please fix the license for the files. Thanks, Jessica
-----Original Message----- From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org] On Behalf Of Ioana Grigoropol Sent: Tuesday, June 04, 2013 6:26 AM To: yocto@yoctoproject.org Subject: [yocto] [Refactor RFC 3/9] Remove ICommandResponseHandler from plugin and use org.yocto.remote.utils implementation - add dependency to remote common plugin - update all references to use the common interface Signed-off-by: Ioana Grigoropol <ioanax.grigoro...@intel.com> --- plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF | 3 +- .../yocto/bc/bitbake/ICommandResponseHandler.java | 15 ---------- .../src/org/yocto/bc/bitbake/ShellSession.java | 2 ++ .../ui/actions/AbstractBitbakeCommandAction.java | 3 +- .../yocto/bc/ui/wizards/install/InstallWizard.java | 30 ++++++-------------- 5 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ICommandResponseHandler.java diff --git a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF index 6366424..3ca62df 100644 --- a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF +++ b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.ide, org.eclipse.ui.console, - org.eclipse.core.filesystem + org.eclipse.core.filesystem, + org.yocto.remote.utils;bundle-version="1.0.0" Eclipse-LazyStart: true Bundle-ClassPath: . diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ICommandResponseHandler.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ICommandResponseHandler.java deleted file mode 100644 index 4c44352..0000000 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ICommandResponseHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2009 Ken Gilmer - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ken Gilmer - initial API and implementation - *******************************************************************************/ -package org.yocto.bc.bitbake; - -public interface ICommandResponseHandler { - public void response(String line, boolean isError); -} diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java index 4719865..db8f564 100644 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java +++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java @@ -18,6 +18,8 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Writer; +import org.yocto.remote.utils.ICommandResponseHandler; + /** * A class for Linux shell sessions. * @author kgilmer diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/AbstractBitbakeCommandAction.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/AbstractBitbakeCommandAction.java index 41d5c73..cd4f4c9 100644 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/AbstractBitbakeCommandAction.java +++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/actions/AbstractBitbak +++ eCommandAction.java @@ -29,12 +29,11 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.console.MessageConsole; import org.eclipse.ui.console.MessageConsoleStream; - import org.yocto.bc.bitbake.BBLanguageHelper; import org.yocto.bc.bitbake.BBSession; -import org.yocto.bc.bitbake.ICommandResponseHandler; import org.yocto.bc.ui.Activator; import org.yocto.bc.ui.builder.BitbakeCommanderNature; +import org.yocto.remote.utils.ICommandResponseHandler; public abstract class AbstractBitbakeCommandAction implements IWorkbenchWindowActionDelegate { diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java index f2cb1da..3130cbf 100644 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/InstallWizard.java +++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/Instal +++ lWizard.java @@ -2,53 +2,39 @@ package org.yocto.bc.ui.wizards.install; import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileDescriptor; -import java.io.InputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.Writer; -import java.util.ArrayList; +import java.lang.reflect.InvocationTargetException; import java.util.Hashtable; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; - -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.console.IConsoleConstants; -import org.eclipse.ui.console.MessageConsole; -import org.eclipse.ui.console.MessageConsoleStream; +import org.eclipse.ui.IWorkbenchWizard; import +org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.ConsolePlugin; -import org.eclipse.ui.console.IConsoleManager; import org.eclipse.ui.console.IConsole; +import org.eclipse.ui.console.IConsoleConstants; +import org.eclipse.ui.console.IConsoleManager; import org.eclipse.ui.console.IConsoleView; -import org.eclipse.ui.progress.IProgressService; - -import org.yocto.bc.bitbake.ICommandResponseHandler; -import org.yocto.bc.bitbake.ShellSession; +import org.eclipse.ui.console.MessageConsole; +import org.eclipse.ui.console.MessageConsoleStream; import org.yocto.bc.ui.Activator; import org.yocto.bc.ui.model.ProjectInfo; import org.yocto.bc.ui.wizards.FiniteStateWizard; - import org.yocto.bc.ui.wizards.newproject.BBConfigurationInitializeOperation; import org.yocto.bc.ui.wizards.newproject.CreateBBCProjectOperation; +import org.yocto.remote.utils.ICommandResponseHandler; /** * A wizard for installing a fresh copy of an OE system. -- 1.7.9.5 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto