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

Merge pull request #565 from cmorty/pull/backwards

Browse source 
Fix backwards compatibility (and docs)
This commit is contained in:
Fredrik Österlind 2014-02-21 13:35:09 +01:00
parent 4fe17ef17f 19e7611061
commit 3fe2890ddf
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java
View file

@ -252,7 +252,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface, PolledA
/** Set LQI to a value between 0 and 255. /** Set LQI to a value between 0 and 255.
* *
* @see se.sics.cooja.interfaces.Radio#setLQI(int) * @see org.contikios.cooja.interfaces.Radio#setLQI(int)
*/ */
public void setLQI(int lqi){ public void setLQI(int lqi){
if(lqi<0) { if(lqi<0) {

3
tools/cooja/java/org/contikios/cooja/radiomediums/DirectedGraphMedium.java
View file

@ -380,6 +380,9 @@ public void simulationFinishedLoading() {
if (destClassName == null || destClassName.isEmpty()) { if (destClassName == null || destClassName.isEmpty()) {
continue; continue;
} }
/* Backwards compatibility: se.sics -> org.contikios */
destClassName = destClassName.replaceFirst("^se\\.sics", "org.contikios");
Class<? extends DGRMDestinationRadio> destClass = Class<? extends DGRMDestinationRadio> destClass =
simulation.getCooja().tryLoadClass(this, DGRMDestinationRadio.class, destClassName); simulation.getCooja().tryLoadClass(this, DGRMDestinationRadio.class, destClassName);
if (destClass == null) { if (destClass == null) {