- remove inner classes & interfaces and use RemoteHelper implementation
Signed-off-by: Ioana Grigoropol <[email protected]> --- .../yocto/bc/ui/wizards/install/InstallWizard.java | 155 -------------------- 1 file changed, 155 deletions(-) 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 8294219..42a3bef 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/InstallWizard.java @@ -197,161 +197,6 @@ public class InstallWizard extends FiniteStateWizard implements public void init(IWorkbench workbench, IStructuredSelection selection) { } - private interface ICalculatePercentage { - public float calWorkloadDone(String info) throws IllegalArgumentException; - } - - private class LongtimeRunningTask implements IRunnableWithProgress { - private String []cmdArray; - private String []envp; - private File dir; - private ICommandResponseHandler handler; - private Process p; - private String taskName; - static public final int TOTALWORKLOAD=100; - private int reported_workload; - ICalculatePercentage cal; - - public LongtimeRunningTask(String taskName, - String []cmdArray, String []envp, File dir, - ICommandResponseHandler handler, - ICalculatePercentage calculator) { - this.taskName=taskName; - this.cmdArray=cmdArray; - this.envp=envp; - this.dir=dir; - this.handler=handler; - this.p=null; - this.cal=calculator; - } - - private void reportProgress(IProgressMonitor monitor,String info) { - if(cal == null) { - monitor.worked(1); - }else { - float percentage; - try { - percentage=cal.calWorkloadDone(info); - } catch (IllegalArgumentException e) { - //can't get percentage - return; - } - int delta=(int) (TOTALWORKLOAD * percentage - reported_workload); - if( delta > 0 ) { - monitor.worked(delta); - reported_workload += delta; - } - } - } - - synchronized public void run(IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - - boolean cancel=false; - reported_workload=0; - - try { - monitor.beginTask(taskName, TOTALWORKLOAD); - - p=Runtime.getRuntime().exec(cmdArray,envp,dir); - BufferedReader inbr = new BufferedReader(new InputStreamReader(p.getInputStream())); - BufferedReader errbr = new BufferedReader(new InputStreamReader(p.getErrorStream())); - String info; - while (!cancel) { - if(monitor.isCanceled()) - { - cancel=true; - throw new InterruptedException("User Cancelled"); - } - - info=null; - //reading stderr - while (errbr.ready()) { - info=errbr.readLine(); - //some application using stderr to print out information - handler.response(info, false); - } - //reading stdout - while (inbr.ready()) { - info=inbr.readLine(); - handler.response(info, false); - } - - //report progress - if(info!=null) - reportProgress(monitor,info); - - //check if exit - try { - int exitValue=p.exitValue(); - if (exitValue != 0) { - handler.response( - taskName + " failed with the return value " + new Integer(exitValue).toString(), - true); - } - break; - }catch (IllegalThreadStateException e) { - } - - Thread.sleep(500); - } - } catch (IOException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - if (p != null ) { - p.destroy(); - } - } - } - } - - private class BCCommandResponseHandler implements ICommandResponseHandler { - private MessageConsoleStream myConsoleStream; - private Boolean errorOccured = false; - - public BCCommandResponseHandler(MessageConsole console) { - try { - this.myConsoleStream = console.newMessageStream(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void printDialog(String msg) { - try { - myConsoleStream.println(msg); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public Boolean hasError() { - return errorOccured; - } - - public void response(String line, boolean isError) { - try { - if (isError) { - myConsoleStream.println(line); - errorOccured = true; - } else { - myConsoleStream.println(line); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void printCmd(String cmd) { - try { - myConsoleStream.println(cmd); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - private class ConsoleWriter extends Writer { private StringBuffer sb; -- 1.7.9.5 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
