[Esbox-commits] r889 - in trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb: launch service
lwang at garage.maemo.org
lwang at garage.maemo.org
Fri Oct 24 00:41:45 EEST 2008
Author: lwang
Date: 2008-10-24 00:41:45 +0300 (Fri, 24 Oct 2008)
New Revision: 889
Removed:
trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/ESboxFinalLaunchSequence.java
Modified:
trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/LocalLaunchDelegate.java
trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/RemoteLaunchDelegate.java
trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/LocalFinalLaunchSequence.java
trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/RemoteFinalLaunchSequence.java
Log:
Changes to match DSF change on progress monitor (fix to bug 232311, 251806).
Modified: trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/LocalLaunchDelegate.java
===================================================================
--- trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/LocalLaunchDelegate.java 2008-10-23 20:19:50 UTC (rev 888)
+++ trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/LocalLaunchDelegate.java 2008-10-23 21:41:45 UTC (rev 889)
@@ -103,7 +103,7 @@
//
@Override
protected Sequence getFinalLaunchSequence(DsfExecutor executor,
- GdbLaunch launch, SessionType type, boolean attach) {
- return new LocalFinalLaunchSequence(executor, launch, type, attach);
+ GdbLaunch launch, SessionType type, boolean attach, IProgressMonitor pm) {
+ return new LocalFinalLaunchSequence(executor, launch, type, attach, pm);
}
}
Modified: trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/RemoteLaunchDelegate.java
===================================================================
--- trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/RemoteLaunchDelegate.java 2008-10-23 20:19:50 UTC (rev 888)
+++ trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/launch/RemoteLaunchDelegate.java 2008-10-23 21:41:45 UTC (rev 889)
@@ -11,6 +11,7 @@
package org.maemo.esbox.cpp.launch.dsf.gdb.launch;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dd.dsf.concurrent.DsfExecutor;
import org.eclipse.dd.dsf.concurrent.Sequence;
import org.eclipse.dd.gdb.internal.provisional.launching.GdbLaunch;
@@ -39,7 +40,7 @@
//
@Override
protected Sequence getFinalLaunchSequence(DsfExecutor executor,
- GdbLaunch launch, SessionType type, boolean attach) {
- return new RemoteFinalLaunchSequence(executor, launch, type, attach);
+ GdbLaunch launch, SessionType type, boolean attach, IProgressMonitor pm) {
+ return new RemoteFinalLaunchSequence(executor, launch, type, attach, pm);
}
}
Deleted: trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/ESboxFinalLaunchSequence.java
===================================================================
--- trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/ESboxFinalLaunchSequence.java 2008-10-23 20:19:50 UTC (rev 888)
+++ trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/ESboxFinalLaunchSequence.java 2008-10-23 21:41:45 UTC (rev 889)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * 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:
- * Ling Wang (Nokia) - initial version. Jun 17, 2008
- *******************************************************************************/
-package org.maemo.esbox.cpp.launch.dsf.gdb.service;
-
-import org.eclipse.dd.dsf.concurrent.DsfExecutor;
-import org.eclipse.dd.gdb.internal.provisional.launching.FinalLaunchSequence;
-import org.eclipse.dd.gdb.internal.provisional.launching.GdbLaunch;
-import org.eclipse.dd.gdb.internal.provisional.service.SessionType;
-
-/**
- * @author LWang.
- *
- */
-public class ESboxFinalLaunchSequence extends FinalLaunchSequence {
-
- public ESboxFinalLaunchSequence(DsfExecutor executor, GdbLaunch launch,
- SessionType sessionType, boolean attach) {
- super(executor, launch, sessionType, attach);
- }
-
-}
Modified: trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/LocalFinalLaunchSequence.java
===================================================================
--- trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/LocalFinalLaunchSequence.java 2008-10-23 20:19:50 UTC (rev 888)
+++ trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/LocalFinalLaunchSequence.java 2008-10-23 21:41:45 UTC (rev 889)
@@ -47,8 +47,8 @@
* @param execPath
*/
public LocalFinalLaunchSequence(DsfExecutor executor, GdbLaunch launch,
- SessionType type, boolean attach) {
- super(executor, launch, type, attach);
+ SessionType type, boolean attach, IProgressMonitor pm) {
+ super(executor, launch, type, attach, pm);
fLaunchConfig = launch.getLaunchConfiguration();
}
@@ -57,25 +57,46 @@
public Step[] getSteps() {
if (fSteps == null) {
Step[] fExtraSteps = new Step[] {
- new Step() {
+ new StepWithProgress() {
@Override
- public void execute(RequestMonitor requestMonitor) {
+ public String getTaskName() {
+ return "Downloading:";
+ }
+
+ @Override
+ public int getTicks() {
+ return 5;
+ }
+
+ @Override
+ public void execute(RequestMonitor requestMonitor, IProgressMonitor pm) {
try {
- downloadFiles(fLaunchConfig, getProgressMonitor());
+ downloadFiles(fLaunchConfig, pm);
} catch (CoreException e) {
requestMonitor.setStatus(e.getStatus());
}
requestMonitor.done();
}
+
},
- new Step() {
+ new StepWithProgress() {
+ @Override
+ public String getTaskName() {
+ return "Starting gdbserver";
+ }
+
+ @Override
+ public int getTicks() {
+ return 5;
+ }
+
private Process gdbserver = null;
@Override
- public void execute(RequestMonitor requestMonitor) {
+ public void execute(RequestMonitor requestMonitor, IProgressMonitor pm) {
// start gdbserver
try {
- gdbserver = startGDBServer(fLaunchConfig, getProgressMonitor());
+ gdbserver = startGDBServer(fLaunchConfig, pm);
} catch (CoreException e) {
requestMonitor.setStatus(e.getStatus());
}
Modified: trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/RemoteFinalLaunchSequence.java
===================================================================
--- trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/RemoteFinalLaunchSequence.java 2008-10-23 20:19:50 UTC (rev 888)
+++ trunk/cpp/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/cpp/launch/dsf/gdb/service/RemoteFinalLaunchSequence.java 2008-10-23 21:41:45 UTC (rev 889)
@@ -27,8 +27,8 @@
public class RemoteFinalLaunchSequence extends LocalFinalLaunchSequence {
public RemoteFinalLaunchSequence(DsfExecutor executor, GdbLaunch launch,
- SessionType type, boolean attach) {
- super(executor, launch, type, attach);
+ SessionType type, boolean attach, IProgressMonitor pm) {
+ super(executor, launch, type, attach, pm);
}
@Override
More information about the Esbox-commits
mailing list