deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated according to new scanProcesseses() interface

Browse source
This commit is contained in:
fros4943 2008-10-03 13:10:09 +00:00
parent c928a5eec5
commit e547b55196
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: GUI.java,v 1.82 2008/10/03 10:23:05 fros4943 Exp $
* $Id: GUI.java,v 1.83 2008/10/03 13:10:09 fros4943 Exp $
*/
package se.sics.cooja;
@ -1067,34 +1067,26 @@ public class GUI extends Observable {
logger.info("> Scanning for user processes");
userProcesses = new Vector<String>();
Vector<String> autostartProcesses = new Vector<String>();
Vector<String[]> scannedProcessInfo = ContikiMoteTypeDialog
.scanForProcesses(contikiCoreDir);
Vector<ContikiProcess> scannedProcesses = ContikiMoteTypeDialog.scanForProcesses(contikiCoreDir);
for (String projectDir : projectDirs) {
// project directories
scannedProcessInfo.addAll(ContikiMoteTypeDialog
.scanForProcesses(new File(projectDir)));
scannedProcesses.addAll(ContikiMoteTypeDialog.scanForProcesses(new File(projectDir)));
}
for (String[] processInfo : scannedProcessInfo) {
if (processInfo[0].equals(mainProcessFile.getName())) {
logger.info(">> Found and added: " + processInfo[1] + " ("
+ processInfo[0] + ")");
userProcesses.add(processInfo[1]);
for (ContikiProcess processInfo : scannedProcesses) {
if (processInfo.getSourceFile().equals(mainProcessFile)) {
logger.info(">> Found and added: " + processInfo);
userProcesses.add(processInfo.getProcessName());
if (addAutostartProcesses) {
// Parse any autostart processes
try {
// logger.info(">>> Parsing " + processInfo[0] + " for autostart
// processes");
Vector<String> autostarters = ContikiMoteTypeDialog
.parseAutostartProcesses(mainProcessFile);
// logger.info(">>> Parsing " + processInfo.getProcessName() + " for autostart processes");
Vector<String> autostarters = ContikiMoteTypeDialog.parseAutostartProcesses(mainProcessFile);
if (autostarters != null) {
autostartProcesses.addAll(autostarters);
}
} catch (Exception e) {
logger
.fatal(">>> Error when parsing autostart processes, aborting: "
+ e);
logger.fatal(">>> Error when parsing autostart processes, aborting: " + e);
return false;
}
}