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

Merge pull request #1987 from joakimeriksson/cooja-fix

Browse source 
Fixed COOJA to avoid using UI based message list when not using UI.
This commit is contained in:
Simon Duquennoy 2016-12-15 08:40:03 +01:00 committed by GitHub
commit bba5a973ba
21 changed files with 68 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cooja/apps/avrora/src/org/contikios/cooja/avrmote/MicaZMoteType.java
View file

@ -63,8 +63,6 @@ import org.contikios.cooja.avrmote.interfaces.MicaZLED;
import org.contikios.cooja.avrmote.interfaces.MicaZRadio;
import org.contikios.cooja.dialogs.CompileContiki;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.MessageListText;
import org.contikios.cooja.dialogs.MessageListUI;
import org.contikios.cooja.dialogs.MessageContainer;
import org.contikios.cooja.interfaces.Mote2MoteRelations;
import org.contikios.cooja.interfaces.MoteAttributes;
@ -366,7 +364,7 @@ public class MicaZMoteType implements MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/AbstractMspMoteType.java
View file

@ -118,7 +118,7 @@ public abstract class AbstractMspMoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/CC430MoteType.java
View file

@ -115,7 +115,7 @@ public class CC430MoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/ESBMoteType.java
View file

@ -151,7 +151,7 @@ public class ESBMoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Eth1120MoteType.java
View file

@ -73,7 +73,7 @@ public class Eth1120MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1101MoteType.java
View file

@ -73,7 +73,7 @@ public class Exp1101MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp1120MoteType.java
View file

@ -74,7 +74,7 @@ public class Exp1120MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp2420MoteType.java
View file

@ -74,7 +74,7 @@ public class Exp2420MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Exp5438MoteType.java
View file

@ -115,7 +115,7 @@ public class Exp5438MoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

4
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/SkyMoteType.java
View file

@ -51,8 +51,6 @@ import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.dialogs.CompileContiki;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.MessageListText;
import org.contikios.cooja.dialogs.MessageListUI;
import org.contikios.cooja.dialogs.MessageContainer;
import org.contikios.cooja.interfaces.IPAddress;
import org.contikios.cooja.interfaces.Mote2MoteRelations;
@ -137,7 +135,7 @@ public class SkyMoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb1120MoteType.java
View file

@ -73,7 +73,7 @@ public class Trxeb1120MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/Trxeb2520MoteType.java
View file

@ -73,7 +73,7 @@ public class Trxeb2520MoteType extends Exp5438MoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

2
tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/TyndallMoteType.java
View file

@ -114,7 +114,7 @@ public class TyndallMoteType extends MspMoteType {
throw new MoteTypeCreationException("No identifier");
}
final MessageList compilationOutput = visAvailable ? new MessageListUI() : new MessageListText();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
if (getCompileCommands() != null) {
/* Handle multiple compilation commands one by one */

7
tools/cooja/java/org/contikios/cooja/Cooja.java
View file

@ -3378,7 +3378,7 @@ public class Cooja extends Observable {
}
/* Verify extension directories */
boolean projectsOk = verifyProjects(root.getChildren(), !quick);
boolean projectsOk = verifyProjects(root.getChildren(), isVisualized());
/* GENERATE UNIQUE MOTE TYPE IDENTIFIERS */
root.detach();
@ -3428,7 +3428,8 @@ public class Cooja extends Observable {
Collection<Element> config = ((Element) element).getChildren();
newSim = new Simulation(this);
System.gc();
boolean createdOK = newSim.setConfigXML(config, !quick, manualRandomSeed);
boolean createdOK = newSim.setConfigXML(config, isVisualized(), manualRandomSeed);
if (!createdOK) {
logger.info("Simulation not loaded");
return null;
@ -3437,7 +3438,7 @@ public class Cooja extends Observable {
}
// Restart plugins from config
setPluginsConfigXML(root.getChildren(), newSim, !quick);
setPluginsConfigXML(root.getChildren(), newSim, isVisualized());
} catch (JDOMException e) {
throw (SimulationCreationException) new SimulationCreationException(

8
tools/cooja/java/org/contikios/cooja/CoreComm.java
View file

@ -35,8 +35,9 @@ import java.util.Vector;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.dialogs.MessageContainer;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.MessageListUI;
/**
* The purpose of corecomm's is communicating with a compiled Contiki system
@ -204,9 +205,10 @@ public abstract class CoreComm {
*/
public static void compileSourceFile(String className)
throws MoteTypeCreationException {
MessageListUI compilationOutput = new MessageListUI();
/* Try to create a message list with support for GUI - will give not UI if headless */
MessageList compilationOutput = MessageContainer.createMessageList(true);
OutputStream compilationStandardStream = compilationOutput
.getInputStream(MessageListUI.NORMAL);
.getInputStream(MessageList.NORMAL);
OutputStream compilationErrorStream = compilationOutput
.getInputStream(MessageList.ERROR);

4
tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
View file

@ -66,7 +66,7 @@ import org.contikios.cooja.mote.memory.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.dialogs.CompileContiki;
import org.contikios.cooja.dialogs.ContikiMoteCompileDialog;
import org.contikios.cooja.dialogs.MessageListUI;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.MessageContainer;
import org.contikios.cooja.mote.memory.ArrayMemory;
import org.contikios.cooja.mote.memory.MemoryInterface;
@ -317,7 +317,7 @@ public class ContikiMoteType implements MoteType {
if (getCompileCommands() == null) {
throw new MoteTypeCreationException("No compile commands specified");
}
final MessageListUI compilationOutput = new MessageListUI();
final MessageList compilationOutput = MessageContainer.createMessageList(visAvailable);
String[] arr = getCompileCommands().split("\n");
for (String cmd : arr) {
if (cmd.trim().isEmpty()) {

18
tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java
View file

@ -127,7 +127,7 @@ public class CompileContiki {
/* TODO Fix me */
final MessageList messageDialog;
if (compilationOutput == null) {
messageDialog = new MessageListUI();
messageDialog = MessageContainer.createMessageList(true);
} else {
messageDialog = compilationOutput;
}
@ -138,8 +138,8 @@ public class CompileContiki {
cmd += c + " ";
}
logger.info("> " + cmd);
messageDialog.addMessage("", MessageListUI.NORMAL);
messageDialog.addMessage("> " + cmd, MessageListUI.NORMAL);
messageDialog.addMessage("", MessageList.NORMAL);
messageDialog.addMessage("> " + cmd, MessageList.NORMAL);
}
final Process compileProcess;
@ -170,7 +170,7 @@ public class CompileContiki {
String readLine;
while ((readLine = processNormal.readLine()) != null) {
if (messageDialog != null) {
messageDialog.addMessage(readLine, MessageListUI.NORMAL);
messageDialog.addMessage(readLine, MessageList.NORMAL);
}
}
} catch (IOException e) {
@ -203,7 +203,7 @@ public class CompileContiki {
compileProcess.waitFor();
} catch (Exception e) {
messageDialog.addMessage(e.getMessage(), MessageList.ERROR);
syncException.setCompilationOutput(new MessageListUI());
syncException.setCompilationOutput(MessageContainer.createMessageList(true));
syncException.fillInStackTrace();
return;
}
@ -214,7 +214,7 @@ public class CompileContiki {
if (onFailure != null) {
onFailure.actionPerformed(null);
}
syncException.setCompilationOutput(new MessageListUI());
syncException.setCompilationOutput(MessageContainer.createMessageList(true));
syncException.fillInStackTrace();
return;
}
@ -232,13 +232,13 @@ public class CompileContiki {
if (onFailure != null) {
onFailure.actionPerformed(null);
}
syncException.setCompilationOutput(new MessageListUI());
syncException.setCompilationOutput(MessageContainer.createMessageList(true));
syncException.fillInStackTrace();
return;
}
messageDialog.addMessage("", MessageListUI.NORMAL);
messageDialog.addMessage("Compilation succeded", MessageListUI.NORMAL);
messageDialog.addMessage("", MessageList.NORMAL);
messageDialog.addMessage("Compilation succeded", MessageList.NORMAL);
if (onSuccess != null) {
onSuccess.actionPerformed(null);
}

14
tools/cooja/java/org/contikios/cooja/dialogs/MessageContainer.java
View file

@ -1,4 +1,7 @@
package org.contikios.cooja.dialogs;
import java.awt.GraphicsEnvironment;
import org.contikios.cooja.Cooja;
public class MessageContainer {
@ -14,4 +17,15 @@ public class MessageContainer {
public String toString() {
return message;
}
/* This will select UI based or not UI based depending on withUI in combination with
* headless info.
*/
public static MessageList createMessageList(boolean withUI) {
if (withUI && !GraphicsEnvironment.isHeadless() && Cooja.isVisualized()) {
return new MessageListUI();
} else {
return new MessageListText();
}
}
}

4
tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java
View file

@ -1,5 +1,7 @@
package org.contikios.cooja.dialogs;
import java.io.OutputStream;
public interface MessageList {
public static final int NORMAL = 0;
@ -14,4 +16,6 @@ public interface MessageList {
public void addMessage(String string);
public OutputStream getInputStream(int type);
}

13
tools/cooja/java/org/contikios/cooja/dialogs/MessageListText.java
View file

@ -1,7 +1,12 @@
package org.contikios.cooja.dialogs;
import java.io.OutputStream;
public class MessageListText implements MessageList {
public MessageListText() {
}
@Override
public void addMessage(String string, int type) {
System.out.println("Message:" + string);
@ -24,4 +29,12 @@ public class MessageListText implements MessageList {
addMessage(string, MessageList.NORMAL);
}
@Override
public OutputStream getInputStream(int type) {
// TODO Auto-generated method stub
return System.out;
}
}

4
tools/cooja/java/org/contikios/cooja/dialogs/MessageListUI.java
View file

@ -33,6 +33,7 @@ package org.contikios.cooja.dialogs;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
@ -81,6 +82,9 @@ public class MessageListUI extends JList implements MessageList {
private int max = -1;
public MessageListUI() {
if (GraphicsEnvironment.isHeadless()) {
throw new RuntimeException("Can not use UI version of message list in Headless mode");
}
super.setModel(new MessageModel());
setCellRenderer(new MessageRenderer());
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);