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

Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies

Browse source 
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
This commit is contained in:
Fredrik Osterlind 2013-11-19 12:17:37 +01:00
parent 2a9283884c
commit b5c94910ac
400 changed files with 8446 additions and 8458 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/cooja/java/se/sics/cooja/AbstractionLevelDescription.java → tools/cooja/java/org/contikios/cooja/AbstractionLevelDescription.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;

2
tools/cooja/java/se/sics/cooja/AddressMemory.java → tools/cooja/java/org/contikios/cooja/AddressMemory.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
public interface AddressMemory {

14
tools/cooja/java/se/sics/cooja/COOJAProject.java → tools/cooja/java/org/contikios/cooja/COOJAProject.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.io.File;
import java.util.ArrayList;
@ -141,22 +141,22 @@ public class COOJAProject {
return arr;
}
public String[] getConfigPlugins() {
return getStringArray("se.sics.cooja.Cooja.PLUGINS");
return getStringArray("org.contikios.cooja.Cooja.PLUGINS");
}
public String[] getConfigJARs() {
return getStringArray("se.sics.cooja.Cooja.JARFILES");
return getStringArray("org.contikios.cooja.Cooja.JARFILES");
}
public String[] getConfigMoteTypes() {
return getStringArray("se.sics.cooja.Cooja.MOTETYPES");
return getStringArray("org.contikios.cooja.Cooja.MOTETYPES");
}
public String[] getConfigRadioMediums() {
return getStringArray("se.sics.cooja.Cooja.RADIOMEDIUMS");
return getStringArray("org.contikios.cooja.Cooja.RADIOMEDIUMS");
}
public String[] getConfigMoteInterfaces() {
return getStringArray("se.sics.cooja.contikimote.ContikiMoteType.MOTE_INTERFACES");
return getStringArray("org.contikios.cooja.contikimote.ContikiMoteType.MOTE_INTERFACES");
}
public String[] getConfigCSources() {
return getStringArray("se.sics.cooja.contikimote.ContikiMoteType.C_SOURCES");
return getStringArray("org.contikios.cooja.contikimote.ContikiMoteType.C_SOURCES");
}
public String toString() {

2
tools/cooja/java/se/sics/cooja/COOJARadioPacket.java → tools/cooja/java/org/contikios/cooja/COOJARadioPacket.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
public class COOJARadioPacket implements RadioPacket {
private byte[] data;

2
tools/cooja/java/se/sics/cooja/ClassDescription.java → tools/cooja/java/org/contikios/cooja/ClassDescription.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;

2
tools/cooja/java/se/sics/cooja/ContikiError.java → tools/cooja/java/org/contikios/cooja/ContikiError.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
public class ContikiError extends RuntimeException {
private static final long serialVersionUID = -6841448235846874865L;

2
tools/cooja/java/se/sics/cooja/ConvertedRadioPacket.java → tools/cooja/java/org/contikios/cooja/ConvertedRadioPacket.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
public class ConvertedRadioPacket implements RadioPacket {
private byte[] convertedData, originalData;

44
tools/cooja/java/se/sics/cooja/Cooja.java → tools/cooja/java/org/contikios/cooja/Cooja.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.awt.BorderLayout;
import java.awt.Color;
@ -125,21 +125,21 @@ import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.VisPlugin.PluginRequiresVisualizationException;
import se.sics.cooja.contikimote.ContikiMoteType;
import se.sics.cooja.dialogs.AddMoteDialog;
import se.sics.cooja.dialogs.BufferSettings;
import se.sics.cooja.dialogs.ConfigurationWizard;
import se.sics.cooja.dialogs.CreateSimDialog;
import se.sics.cooja.dialogs.ExternalToolsDialog;
import se.sics.cooja.dialogs.MessageList;
import se.sics.cooja.dialogs.ProjectDirectoriesDialog;
import se.sics.cooja.plugins.MoteTypeInformation;
import se.sics.cooja.plugins.ScriptRunner;
import se.sics.cooja.plugins.SimControl;
import se.sics.cooja.plugins.SimInformation;
import se.sics.cooja.util.ExecuteJAR;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.VisPlugin.PluginRequiresVisualizationException;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.dialogs.AddMoteDialog;
import org.contikios.cooja.dialogs.BufferSettings;
import org.contikios.cooja.dialogs.ConfigurationWizard;
import org.contikios.cooja.dialogs.CreateSimDialog;
import org.contikios.cooja.dialogs.ExternalToolsDialog;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.ProjectDirectoriesDialog;
import org.contikios.cooja.plugins.MoteTypeInformation;
import org.contikios.cooja.plugins.ScriptRunner;
import org.contikios.cooja.plugins.SimControl;
import org.contikios.cooja.plugins.SimInformation;
import org.contikios.cooja.util.ExecuteJAR;
/**
* Main file of COOJA Simulator. Typically contains a visualizer for the
@ -3636,13 +3636,13 @@ public class Cooja extends Observable {
String pluginClassName = pluginElement.getText().trim();
/* Backwards compatibility: old visualizers were replaced */
if (pluginClassName.equals("se.sics.cooja.plugins.VisUDGM") ||
pluginClassName.equals("se.sics.cooja.plugins.VisBattery") ||
pluginClassName.equals("se.sics.cooja.plugins.VisTraffic") ||
pluginClassName.equals("se.sics.cooja.plugins.VisState") ||
pluginClassName.equals("se.sics.cooja.plugins.VisUDGM")) {
if (pluginClassName.equals("org.contikios.cooja.plugins.VisUDGM") ||
pluginClassName.equals("org.contikios.cooja.plugins.VisBattery") ||
pluginClassName.equals("org.contikios.cooja.plugins.VisTraffic") ||
pluginClassName.equals("org.contikios.cooja.plugins.VisState") ||
pluginClassName.equals("org.contikios.cooja.plugins.VisUDGM")) {
logger.warn("Old simulation config detected: visualizers have been remade");
pluginClassName = "se.sics.cooja.plugins.Visualizer";
pluginClassName = "org.contikios.cooja.plugins.Visualizer";
}
Class<? extends Plugin> pluginClass =

2
tools/cooja/java/se/sics/cooja/CoojaApplet.java → tools/cooja/java/org/contikios/cooja/CoojaApplet.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import javax.swing.*;

24
tools/cooja/java/se/sics/cooja/CoreComm.java → tools/cooja/java/org/contikios/cooja/CoreComm.java
View file

@ -26,16 +26,16 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.io.*;
import java.lang.reflect.*;
import java.net.*;
import java.util.Vector;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.contikimote.ContikiMoteType;
import se.sics.cooja.dialogs.MessageList;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.dialogs.MessageList;
/**
* The purpose of corecomm's is communicating with a compiled Contiki system
@ -46,7 +46,7 @@ import se.sics.cooja.dialogs.MessageList;
* we wish to load several libraries, the names and associated native functions
* must have unique names. And those names are defined via the calling class in
* JNI. For example, the corresponding function for a native tick method in
* class Lib1 will be named Java_se_sics_cooja_corecomm_Lib1_tick. When creating
* class Lib1 will be named Java_org_contikios_cooja_corecomm_Lib1_tick. When creating
* a new mote type, the main Contiki source file is generated with function
* names compatible with the next available corecomm class. This also implies
* that even if a mote type is deleted, a new one cannot be created using the
@ -151,13 +151,13 @@ public abstract class CoreComm {
templateFileReader = new BufferedReader(reader);
destFilename = className + ".java";
File dir = new File("se/sics/cooja/corecomm");
File dir = new File("org/contikios/cooja/corecomm");
if (!dir.exists()) {
dir.mkdirs();
}
sourceFileWriter = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream("se/sics/cooja/corecomm/" + destFilename)));
new FileOutputStream("org/contikios/cooja/corecomm/" + destFilename)));
// Replace special fields in template
String line;
@ -184,7 +184,7 @@ public abstract class CoreComm {
.initCause(e);
}
File genFile = new File("se/sics/cooja/corecomm/" + destFilename);
File genFile = new File("org/contikios/cooja/corecomm/" + destFilename);
if (genFile.exists()) {
return;
}
@ -209,12 +209,12 @@ public abstract class CoreComm {
OutputStream compilationErrorStream = compilationOutput
.getInputStream(MessageList.ERROR);
File classFile = new File("se/sics/cooja/corecomm/" + className + ".class");
File classFile = new File("org/contikios/cooja/corecomm/" + className + ".class");
try {
int b;
String[] cmd = new String[] { Cooja.getExternalToolsSetting("PATH_JAVAC"),
"-version", "se/sics/cooja/corecomm/" + className + ".java" };
"-version", "org/contikios/cooja/corecomm/" + className + ".java" };
Process p = Runtime.getRuntime().exec(cmd, null, null);
InputStream outputStream = p.getInputStream();
@ -235,7 +235,7 @@ public abstract class CoreComm {
cmd = new String[] {
Cooja.getExternalToolsSetting("PATH_JAVAC"),
"-version",
"se/sics/cooja/corecomm/" + className + ".java",
"org/contikios/cooja/corecomm/" + className + ".java",
"-cp",
Cooja.getExternalToolsSetting("PATH_CONTIKI")
+ "/tools/cooja/dist/cooja.jar" };
@ -290,7 +290,7 @@ public abstract class CoreComm {
ClassLoader urlClassLoader = new URLClassLoader(
new URL[] { new File(".").toURI().toURL() },
CoreComm.class.getClassLoader());
loadedClass = urlClassLoader.loadClass("se.sics.cooja.corecomm."
loadedClass = urlClassLoader.loadClass("org.contikios.cooja.corecomm."
+ className);
} catch (MalformedURLException e) {

2
tools/cooja/java/se/sics/cooja/EventQueue.java → tools/cooja/java/org/contikios/cooja/EventQueue.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
/**
* @author Joakim Eriksson (ported to COOJA by Fredrik Osterlind)

2
tools/cooja/java/se/sics/cooja/HasQuickHelp.java → tools/cooja/java/org/contikios/cooja/HasQuickHelp.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja;
package org.contikios.cooja;
public interface HasQuickHelp {
/**

8
tools/cooja/java/se/sics/cooja/Mote.java → tools/cooja/java/org/contikios/cooja/Mote.java
View file

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.Collection;
@ -36,9 +36,9 @@ import org.jdom.Element;
*
* All motes have an interface handler, a mote type and a mote memory.
*
* @see se.sics.cooja.MoteInterfaceHandler
* @see se.sics.cooja.MoteMemory
* @see se.sics.cooja.MoteType
* @see org.contikios.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteMemory
* @see org.contikios.cooja.MoteType
*
* @author Fredrik Osterlind
*/

10
tools/cooja/java/se/sics/cooja/MoteInterface.java → tools/cooja/java/org/contikios/cooja/MoteInterface.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.Collection;
import java.util.Observable;
@ -36,10 +36,10 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import se.sics.cooja.interfaces.PolledAfterAllTicks;
import se.sics.cooja.interfaces.PolledBeforeActiveTicks;
import se.sics.cooja.interfaces.PolledBeforeAllTicks;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.interfaces.PolledAfterAllTicks;
import org.contikios.cooja.interfaces.PolledBeforeActiveTicks;
import org.contikios.cooja.interfaces.PolledBeforeAllTicks;
/**
* A mote interface represents a mote property. Typically, this is a simulated

4
tools/cooja/java/se/sics/cooja/MoteInterfaceHandler.java → tools/cooja/java/org/contikios/cooja/MoteInterfaceHandler.java
View file

@ -28,12 +28,12 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.*;
import org.apache.log4j.Logger;
import se.sics.cooja.interfaces.*;
import org.contikios.cooja.interfaces.*;
/**
* The mote interface handler holds all interfaces for a specific mote.

4
tools/cooja/java/se/sics/cooja/MoteMemory.java → tools/cooja/java/org/contikios/cooja/MoteMemory.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
/**
@ -41,7 +41,7 @@ package se.sics.cooja;
* different memory sections, not covering the entire range
* between the start address and the end address of this memory.
*
* @see se.sics.cooja.SectionMoteMemory
* @see org.contikios.cooja.SectionMoteMemory
* @author Fredrik Osterlind
*/
public interface MoteMemory extends AddressMemory {

2
tools/cooja/java/se/sics/cooja/MotePlugin.java → tools/cooja/java/org/contikios/cooja/MotePlugin.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
public interface MotePlugin {
public Mote getMote();

2
tools/cooja/java/se/sics/cooja/MoteTimeEvent.java → tools/cooja/java/org/contikios/cooja/MoteTimeEvent.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
/**
* Time event associated with a mote.

6
tools/cooja/java/se/sics/cooja/MoteType.java → tools/cooja/java/org/contikios/cooja/MoteType.java
View file

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.awt.Container;
import java.io.File;
@ -35,8 +35,8 @@ import javax.swing.JComponent;
import org.jdom.Element;
import se.sics.cooja.contikimote.ContikiMoteType;
import se.sics.cooja.dialogs.MessageList;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.dialogs.MessageList;
/**
* The mote type defines properties common for several motes. These properties

8
tools/cooja/java/se/sics/cooja/Plugin.java → tools/cooja/java/org/contikios/cooja/Plugin.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.Collection;
@ -40,9 +40,9 @@ import org.jdom.Element;
* COOJA plugin. For graphical plugins, extend abstract class VisPlugin.
* A plugin should also use ClassDecription and PluginType.
*
* @see se.sics.cooja.ClassDescription
* @see se.sics.cooja.PluginType
* @see se.sics.cooja.VisPlugin
* @see org.contikios.cooja.ClassDescription
* @see org.contikios.cooja.PluginType
* @see org.contikios.cooja.VisPlugin
*
* @author Fredrik Osterlind
*/

2
tools/cooja/java/se/sics/cooja/PluginType.java → tools/cooja/java/org/contikios/cooja/PluginType.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

2
tools/cooja/java/se/sics/cooja/Positioner.java → tools/cooja/java/org/contikios/cooja/Positioner.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;

4
tools/cooja/java/se/sics/cooja/ProjectConfig.java → tools/cooja/java/org/contikios/cooja/ProjectConfig.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.io.*;
import java.util.*;
@ -76,7 +76,7 @@ import org.apache.log4j.Logger;
* associated with the information. For example, let's say a battery interface
* wants to store its initial capacity (a double) using this approach. Data
* stored in the external configuration file can look like the following:
* se.sics.cooja.interfaces.Battery.initial_capacity 54.123321
* org.contikios.cooja.interfaces.Battery.initial_capacity 54.123321
*
* This value is then be read by: myMoteTypeConfig.getDoubleValue(Battery.class,
* "initial_capacity");

4
tools/cooja/java/se/sics/cooja/RadioConnection.java → tools/cooja/java/org/contikios/cooja/RadioConnection.java
View file

@ -28,13 +28,13 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.ArrayList;
import org.apache.log4j.Logger;
import se.sics.cooja.interfaces.Radio;
import org.contikios.cooja.interfaces.Radio;
/**
* A radio connection represents a connection between a single source radio and

4
tools/cooja/java/se/sics/cooja/RadioMedium.java → tools/cooja/java/org/contikios/cooja/RadioMedium.java
View file

@ -28,14 +28,14 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import org.jdom.Element;
import se.sics.cooja.interfaces.Radio;
import org.contikios.cooja.interfaces.Radio;
/**
* The abstract class RadioMedium should be implemented by all COOJA radio

4
tools/cooja/java/se/sics/cooja/RadioPacket.java → tools/cooja/java/org/contikios/cooja/RadioPacket.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import se.sics.cooja.interfaces.CustomDataRadio;
import org.contikios.cooja.interfaces.CustomDataRadio;
/**
* COOJA's general radio packet. In order to support cross-level communication,

2
tools/cooja/java/se/sics/cooja/SectionMoteMemory.java → tools/cooja/java/org/contikios/cooja/SectionMoteMemory.java
View file

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.ArrayList;
import java.util.Arrays;

8
tools/cooja/java/se/sics/cooja/SimEventCentral.java → tools/cooja/java/org/contikios/cooja/SimEventCentral.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.io.File;
import java.util.ArrayDeque;
@ -39,9 +39,9 @@ import java.util.Vector;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.interfaces.Log;
import se.sics.cooja.util.ArrayUtils;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.interfaces.Log;
import org.contikios.cooja.util.ArrayUtils;
/**
* Simulation event central. Simplifies implementations of plugins that observe

6
tools/cooja/java/se/sics/cooja/Simulation.java → tools/cooja/java/org/contikios/cooja/Simulation.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.ArrayDeque;
import java.util.ArrayList;
@ -41,7 +41,7 @@ import javax.swing.JOptionPane;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.dialogs.CreateSimDialog;
import org.contikios.cooja.dialogs.CreateSimDialog;
/**
* A simulation consists of a number of motes and mote types.
@ -645,7 +645,7 @@ public class Simulation extends Observable implements Runnable {
/* Try to recreate simulation using a different mote type */
if (visAvailable) {
String[] availableMoteTypes = getCooja().getProjectConfig().getStringArrayValue("se.sics.cooja.Cooja.MOTETYPES");
String[] availableMoteTypes = getCooja().getProjectConfig().getStringArrayValue("org.contikios.cooja.Cooja.MOTETYPES");
String newClass = (String) JOptionPane.showInputDialog(
Cooja.getTopParentContainer(),
"The simulation is about to load '" + moteTypeClassName + "'\n" +

6
tools/cooja/java/se/sics/cooja/SupportedArguments.java → tools/cooja/java/org/contikios/cooja/SupportedArguments.java
View file

@ -25,15 +25,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import javax.swing.MenuElement;
import se.sics.cooja.plugins.Visualizer;
import se.sics.cooja.plugins.skins.DGRMVisualizerSkin;
import org.contikios.cooja.plugins.Visualizer;
import org.contikios.cooja.plugins.skins.DGRMVisualizerSkin;
/**
* With this annotation, Cooja components (e.g. mote plugins) can be activated

2
tools/cooja/java/se/sics/cooja/TimeEvent.java → tools/cooja/java/org/contikios/cooja/TimeEvent.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
/**
* @author Joakim Eriksson (ported to COOJA by Fredrik Osterlind)

4
tools/cooja/java/se/sics/cooja/VisPlugin.java → tools/cooja/java/org/contikios/cooja/VisPlugin.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.util.Collection;
@ -38,7 +38,7 @@ import javax.swing.event.InternalFrameEvent;
import org.jdom.Element;
import se.sics.cooja.plugins.SimControl;
import org.contikios.cooja.plugins.SimControl;
/**
* Visualized plugins can extend VisPlugin for basic visualization functionality.

2
tools/cooja/java/se/sics/cooja/Watchpoint.java → tools/cooja/java/org/contikios/cooja/Watchpoint.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.awt.Color;
import java.io.File;

2
tools/cooja/java/se/sics/cooja/WatchpointMote.java → tools/cooja/java/org/contikios/cooja/WatchpointMote.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja;
package org.contikios.cooja;
import java.io.File;

18
tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java → tools/cooja/java/org/contikios/cooja/contikimote/ContikiMote.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote;
package org.contikios.cooja.contikimote;
import java.util.ArrayList;
import java.util.Collection;
@ -36,14 +36,14 @@ import java.util.Collection;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteInterfaceHandler;
import se.sics.cooja.MoteMemory;
import se.sics.cooja.MoteType;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.Simulation;
import se.sics.cooja.motes.AbstractWakeupMote;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteInterfaceHandler;
import org.contikios.cooja.MoteMemory;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.motes.AbstractWakeupMote;
/**
* A Contiki mote executes an actual Contiki system via

2
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java → tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteInterface.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote;
package org.contikios.cooja.contikimote;
/**
* A Contiki mote interface has information about which, if any, core interfaces

34
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java → tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote;
package org.contikios.cooja.contikimote;
import java.awt.Container;
import java.io.BufferedReader;
@ -54,21 +54,21 @@ import javax.swing.JLabel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.AbstractionLevelDescription;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.CoreComm;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteType;
import se.sics.cooja.ProjectConfig;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.Simulation;
import se.sics.cooja.dialogs.CompileContiki;
import se.sics.cooja.dialogs.ContikiMoteCompileDialog;
import se.sics.cooja.dialogs.MessageList;
import se.sics.cooja.dialogs.MessageList.MessageContainer;
import se.sics.cooja.util.StringUtils;
import org.contikios.cooja.AbstractionLevelDescription;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.CoreComm;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.ProjectConfig;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.dialogs.CompileContiki;
import org.contikios.cooja.dialogs.ContikiMoteCompileDialog;
import org.contikios.cooja.dialogs.MessageList;
import org.contikios.cooja.dialogs.MessageList.MessageContainer;
import org.contikios.cooja.util.StringUtils;
/**
* The Cooja mote type holds the native library used to communicate with an
@ -1320,7 +1320,7 @@ public class ContikiMoteType implements MoteType {
} else if (name.equals("netstack")) {
netStack = NetworkStack.parseConfig(element.getText());
} else if (name.equals("moteinterface")) {
if (element.getText().trim().equals("se.sics.cooja.contikimote.interfaces.ContikiLog")) {
if (element.getText().trim().equals("org.contikios.cooja.contikimote.interfaces.ContikiLog")) {
/* Backwards compatibility: ContikiLog was removed */
} else {
Class<? extends MoteInterface> moteInterfaceClass =

2
tools/cooja/java/se/sics/cooja/contikimote/ContikiProcess.java → tools/cooja/java/org/contikios/cooja/contikimote/ContikiProcess.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote;
package org.contikios.cooja.contikimote;
import java.io.*;

14
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiBeeper.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.Dimension;
import java.awt.Toolkit;
@ -43,11 +43,11 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.Beeper;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.Mote;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.Beeper;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
/**
* Beeper mote interface.
@ -79,7 +79,7 @@ public class ContikiBeeper extends Beeper implements ContikiMoteInterface, Polle
* @param mote
* Beeper's mote.
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiBeeper(Mote mote) {
this.mote = mote;

12
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.event.*;
import java.util.Collection;
@ -36,10 +36,10 @@ import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.Button;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.Button;
/**
* Button mote interface.
@ -72,7 +72,7 @@ public class ContikiButton extends Button implements ContikiMoteInterface {
*
* @param mote Mote
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiButton(Mote mote) {
this.mote = (ContikiMote) mote;

10
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiCFS.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.Component;
import java.awt.Dimension;
@ -40,9 +40,9 @@ import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
/**
* Contiki FileSystem (CFS) interface (such as external flash).
@ -81,7 +81,7 @@ public class ContikiCFS extends MoteInterface implements ContikiMoteInterface, P
*
* @param mote Mote
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiCFS(Mote mote) {
this.mote = mote;

20
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiClock.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.util.Collection;
@ -36,14 +36,14 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.Simulation;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.Clock;
import se.sics.cooja.interfaces.PolledAfterAllTicks;
import se.sics.cooja.interfaces.PolledBeforeActiveTicks;
import org.contikios.cooja.Mote;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.Clock;
import org.contikios.cooja.interfaces.PolledAfterAllTicks;
import org.contikios.cooja.interfaces.PolledBeforeActiveTicks;
/**
* Clock mote interface. Controls Contiki time.
@ -80,7 +80,7 @@ public class ContikiClock extends Clock implements ContikiMoteInterface, PolledB
* @param mote Mote
*
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiClock(Mote mote) {
this.simulation = mote.getSimulation();

10
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiIPAddress.java
View file

@ -28,12 +28,12 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import org.apache.log4j.Logger;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.IPAddress;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.IPAddress;
/**
* uIP IP address.
@ -65,7 +65,7 @@ public class ContikiIPAddress extends IPAddress implements ContikiMoteInterface
*
* @param mote IP address' mote.
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiIPAddress(final Mote mote) {
super(mote);

12
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiLED.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.*;
import java.util.*;
@ -36,10 +36,10 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.LED;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.LED;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
/**
* LEDs mote interface.
@ -87,7 +87,7 @@ public class ContikiLED extends LED implements ContikiMoteInterface, PolledAfter
* @param mote Mote
*
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiLED(Mote mote) {
this.mote = mote;

10
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiMoteID.java
View file

@ -28,16 +28,16 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.util.*;
import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.MoteID;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.MoteID;
/**
* Mote ID interface: 'node_id'.
@ -73,7 +73,7 @@ public class ContikiMoteID extends MoteID implements ContikiMoteInterface {
* @param mote Mote
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiMoteID(Mote mote) {
this.mote = mote;

14
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiPIR.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -36,11 +36,11 @@ import java.util.Collection;
import javax.swing.JButton;
import javax.swing.JPanel;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.PIR;
import org.contikios.cooja.Mote;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.PIR;
/**
* Passive IR sensor mote interface.
@ -73,7 +73,7 @@ public class ContikiPIR extends PIR implements ContikiMoteInterface {
* @param mote Mote
*
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiPIR(Mote mote) {
this.mote = (ContikiMote) mote;

14
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRS232.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRS232.java
View file

@ -28,16 +28,16 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.util.Vector;
import org.apache.log4j.Logger;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.dialogs.SerialUI;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.dialogs.SerialUI;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
/**
* Contiki mote serial port and log interfaces.
@ -78,7 +78,7 @@ public class ContikiRS232 extends SerialUI implements ContikiMoteInterface, Poll
* @param mote
* RS232's mote.
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiRS232(Mote mote) {
this.mote = (ContikiMote) mote;

26
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.util.ArrayList;
import java.util.Collection;
@ -36,17 +36,17 @@ import java.util.Collection;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.COOJARadioPacket;
import se.sics.cooja.Mote;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.Simulation;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import se.sics.cooja.interfaces.PolledAfterActiveTicks;
import se.sics.cooja.interfaces.Position;
import se.sics.cooja.interfaces.Radio;
import se.sics.cooja.radiomediums.UDGM;
import org.contikios.cooja.COOJARadioPacket;
import org.contikios.cooja.Mote;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.interfaces.Position;
import org.contikios.cooja.interfaces.Radio;
import org.contikios.cooja.radiomediums.UDGM;
/**
* Packet radio transceiver mote interface.
@ -124,7 +124,7 @@ public class ContikiRadio extends Radio implements ContikiMoteInterface, PolledA
* @param mote Mote
*
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiRadio(Mote mote) {
// Read class configurations of this mote type

16
tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java → tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiVib.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.contikimote.interfaces;
package org.contikios.cooja.contikimote.interfaces;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -36,12 +36,12 @@ import java.util.Collection;
import javax.swing.JButton;
import javax.swing.JPanel;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.ContikiMoteInterface;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.contikimote.ContikiMote;
import org.contikios.cooja.contikimote.ContikiMoteInterface;
/**
* Vibration sensor mote interface.
@ -75,7 +75,7 @@ public class ContikiVib extends MoteInterface implements ContikiMoteInterface {
* @param mote
* Vib's mote.
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public ContikiVib(Mote mote) {
this.mote = (ContikiMote) mote;

14
tools/cooja/java/se/sics/cooja/dialogs/AbstractCompileDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Component;
@ -73,12 +73,12 @@ import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
import se.sics.cooja.Cooja;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteType;
import se.sics.cooja.Simulation;
import se.sics.cooja.interfaces.MoteID;
import se.sics.cooja.interfaces.Position;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.MoteID;
import org.contikios.cooja.interfaces.Position;
/**
* Abstract configure mote type dialog used by Contiki-based mote type implementations.

16
tools/cooja/java/se/sics/cooja/dialogs/AddMoteDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/AddMoteDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Color;
@ -62,13 +62,13 @@ import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteType;
import se.sics.cooja.Positioner;
import se.sics.cooja.Simulation;
import se.sics.cooja.interfaces.MoteID;
import se.sics.cooja.interfaces.Position;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Positioner;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.MoteID;
import org.contikios.cooja.interfaces.Position;
/**
* A dialog for adding motes.

8
tools/cooja/java/se/sics/cooja/dialogs/BufferSettings.java → tools/cooja/java/org/contikios/cooja/dialogs/BufferSettings.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
@ -53,9 +53,9 @@ import javax.swing.KeyStroke;
import org.apache.log4j.Logger;
import se.sics.cooja.Cooja;
import se.sics.cooja.SimEventCentral;
import se.sics.cooja.Simulation;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.SimEventCentral;
import org.contikios.cooja.Simulation;
public class BufferSettings extends JDialog {
private static final long serialVersionUID = 7086171115472941104L;

10
tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java → tools/cooja/java/org/contikios/cooja/dialogs/CompileContiki.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -49,10 +49,10 @@ import javax.swing.Action;
import org.apache.log4j.Logger;
import se.sics.cooja.Cooja;
import se.sics.cooja.MoteType;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.contikimote.ContikiMoteType;
/**
* Contiki compiler library.

20
tools/cooja/java/se/sics/cooja/dialogs/ConfigurationWizard.java → tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Container;
@ -63,11 +63,11 @@ import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import se.sics.cooja.CoreComm;
import se.sics.cooja.Cooja;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.CoreComm;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.contikimote.ContikiMoteType;
/* TODO Test common section */
/* TODO Test readonly section */
@ -647,7 +647,7 @@ public class ConfigurationWizard extends JDialog {
}
dummyStream.close();
testOutput.addMessage("### Generating Java library source: se/sics/cooja/corecomm/" + javaLibraryName + ".java");
testOutput.addMessage("### Generating Java library source: org/contikios/cooja/corecomm/" + javaLibraryName + ".java");
try {
CoreComm.generateLibSourceFile(javaLibraryName);
} catch (MoteTypeCreationException e) {
@ -656,7 +656,7 @@ public class ConfigurationWizard extends JDialog {
return false;
}
testOutput.addMessage("### Compiling Java library source: se/sics/cooja/corecomm/" + javaLibraryName + ".java");
testOutput.addMessage("### Compiling Java library source: org/contikios/cooja/corecomm/" + javaLibraryName + ".java");
try {
CoreComm.compileSourceFile(javaLibraryName);
} catch (MoteTypeCreationException e) {
@ -665,7 +665,7 @@ public class ConfigurationWizard extends JDialog {
return false;
}
testOutput.addMessage("### Loading Java library class: se/sics/cooja/corecomm/" + javaLibraryName);
testOutput.addMessage("### Loading Java library class: org/contikios/cooja/corecomm/" + javaLibraryName);
Class<? extends CoreComm> javaLibraryClass = null;
try {
javaLibraryClass = (Class<? extends CoreComm>) CoreComm.loadClassFile(javaLibraryName);
@ -675,7 +675,7 @@ public class ConfigurationWizard extends JDialog {
return false;
}
testOutput.addMessage("### Creating Java library: se/sics/cooja/corecomm/" + javaLibraryName + " with argument: " + cLibraryFile);
testOutput.addMessage("### Creating Java library: org/contikios/cooja/corecomm/" + javaLibraryName + " with argument: " + cLibraryFile);
javaLibrary = null;
try {
Constructor<? extends CoreComm> constr = javaLibraryClass.getConstructor(new Class[] { File.class });

18
tools/cooja/java/se/sics/cooja/dialogs/ContikiMoteCompileDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/ContikiMoteCompileDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Component;
@ -55,14 +55,14 @@ import javax.swing.event.DocumentListener;
import org.apache.log4j.Logger;
import se.sics.cooja.CoreComm;
import se.sics.cooja.Cooja;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteType;
import se.sics.cooja.ProjectConfig;
import se.sics.cooja.Simulation;
import se.sics.cooja.contikimote.ContikiMoteType;
import se.sics.cooja.contikimote.ContikiMoteType.NetworkStack;
import org.contikios.cooja.CoreComm;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.ProjectConfig;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.contikimote.ContikiMoteType.NetworkStack;
/**
* Contiki Mote Type compile dialog.

8
tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/CreateSimDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Component;
@ -60,9 +60,9 @@ import javax.swing.KeyStroke;
import org.apache.log4j.Logger;
import se.sics.cooja.Cooja;
import se.sics.cooja.RadioMedium;
import se.sics.cooja.Simulation;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.RadioMedium;
import org.contikios.cooja.Simulation;
/**
* A dialog for creating and configuring a simulation.

4
tools/cooja/java/se/sics/cooja/dialogs/ExternalToolsDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/ExternalToolsDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.*;
import java.awt.event.*;
@ -36,7 +36,7 @@ import java.io.File;
import javax.swing.*;
import org.apache.log4j.Logger;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A dialog for viewing/editing external tools settings.

10
tools/cooja/java/se/sics/cooja/dialogs/ImportAppMoteDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/ImportAppMoteDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
@ -54,10 +54,10 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.filechooser.FileFilter;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.Simulation;
import se.sics.cooja.motes.ImportAppMoteType;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.motes.ImportAppMoteType;
/**
* Java Application Mote Type compile dialog.

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

@ -35,7 +35,7 @@
* $Revision: 1.15 $
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.Color;
import java.awt.Component;
@ -65,7 +65,7 @@ import javax.swing.JSeparator;
import javax.swing.ListModel;
import javax.swing.ListSelectionModel;
import se.sics.cooja.Cooja;
import org.contikios.cooja.Cooja;
public class MessageList extends JList {

8
tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.java → tools/cooja/java/org/contikios/cooja/dialogs/ProjectDirectoriesDialog.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Color;
@ -83,9 +83,9 @@ import javax.swing.tree.TreePath;
import org.apache.log4j.Logger;
import se.sics.cooja.COOJAProject;
import se.sics.cooja.Cooja;
import se.sics.cooja.ProjectConfig;
import org.contikios.cooja.COOJAProject;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.ProjectConfig;
/**
* This dialog allows a user to manage Cooja extensions: extensions to COOJA that

8
tools/cooja/java/se/sics/cooja/dialogs/SerialUI.java → tools/cooja/java/org/contikios/cooja/dialogs/SerialUI.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.BorderLayout;
import java.awt.Dimension;
@ -53,9 +53,9 @@ import javax.swing.JTextField;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.interfaces.Log;
import se.sics.cooja.interfaces.SerialPort;
import org.contikios.cooja.Mote;
import org.contikios.cooja.interfaces.Log;
import org.contikios.cooja.interfaces.SerialPort;
public abstract class SerialUI extends Log implements SerialPort {
private static Logger logger = Logger.getLogger(SerialUI.class);

2
tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java → tools/cooja/java/org/contikios/cooja/dialogs/TableColumnAdjuster.java
View file

@ -35,7 +35,7 @@
* $Revision: 1.1 $
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.Component;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;

4
tools/cooja/java/se/sics/cooja/dialogs/UpdateAggregator.java → tools/cooja/java/org/contikios/cooja/dialogs/UpdateAggregator.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja.dialogs;
package org.contikios.cooja.dialogs;
import java.awt.EventQueue;
import java.awt.event.ActionEvent;
@ -36,7 +36,7 @@ import java.util.List;
import javax.swing.Timer;
import se.sics.cooja.plugins.LogListener;
import org.contikios.cooja.plugins.LogListener;
/**
* Help class to avoid EventQueue flooding by aggregating several update events.

2
tools/cooja/java/se/sics/cooja/emulatedmote/CRCCoder.java → tools/cooja/java/org/contikios/cooja/emulatedmote/CRCCoder.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.emulatedmote;
package org.contikios.cooja.emulatedmote;
import org.apache.log4j.Logger;
/**

10
tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154.java → tools/cooja/java/org/contikios/cooja/emulatedmote/Radio802154.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
*/
package se.sics.cooja.emulatedmote;
package org.contikios.cooja.emulatedmote;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@ -38,10 +38,10 @@ import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.interfaces.CustomDataRadio;
import se.sics.cooja.interfaces.Position;
import se.sics.cooja.interfaces.Radio;
import org.contikios.cooja.*;
import org.contikios.cooja.interfaces.CustomDataRadio;
import org.contikios.cooja.interfaces.Position;
import org.contikios.cooja.interfaces.Radio;
/**
* 802.15.4 radio class for COOJA.

8
tools/cooja/java/se/sics/cooja/emulatedmote/Radio802154PacketConverter.java → tools/cooja/java/org/contikios/cooja/emulatedmote/Radio802154PacketConverter.java
View file

@ -28,12 +28,12 @@
*
*/
package se.sics.cooja.emulatedmote;
package org.contikios.cooja.emulatedmote;
import org.apache.log4j.Logger;
import se.sics.cooja.ConvertedRadioPacket;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.util.StringUtils;
import org.contikios.cooja.ConvertedRadioPacket;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.util.StringUtils;
/**
* Converts radio packets between X-MAC/802.15.4 nodes and COOJA.
* Handles radio driver specifics such as length header and CRC footer.

4
tools/cooja/java/se/sics/cooja/emulatedmote/RadioByte.java → tools/cooja/java/org/contikios/cooja/emulatedmote/RadioByte.java
View file

@ -28,8 +28,8 @@
*
*/
package se.sics.cooja.emulatedmote;
import se.sics.cooja.RadioPacket;
package org.contikios.cooja.emulatedmote;
import org.contikios.cooja.RadioPacket;
public class RadioByte implements RadioPacket {
private byte[] data = new byte[1];

6
tools/cooja/java/se/sics/cooja/interfaces/ApplicationLED.java → tools/cooja/java/org/contikios/cooja/interfaces/ApplicationLED.java
View file

@ -1,4 +1,4 @@
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
@ -11,8 +11,8 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import se.sics.cooja.contikimote.interfaces.ContikiLED;
import org.contikios.cooja.*;
import org.contikios.cooja.contikimote.interfaces.ContikiLED;
public class ApplicationLED extends LED {
private static Logger logger = Logger.getLogger(ContikiLED.class);

10
tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java → tools/cooja/java/org/contikios/cooja/interfaces/ApplicationRadio.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
@ -50,10 +50,10 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteTimeEvent;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.Simulation;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteTimeEvent;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.Simulation;
/**
* Application radio.

8
tools/cooja/java/se/sics/cooja/interfaces/ApplicationSerialPort.java → tools/cooja/java/org/contikios/cooja/interfaces/ApplicationSerialPort.java
View file

@ -1,8 +1,8 @@
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.Mote;
import se.sics.cooja.dialogs.SerialUI;
import se.sics.cooja.motes.AbstractApplicationMote;
import org.contikios.cooja.Mote;
import org.contikios.cooja.dialogs.SerialUI;
import org.contikios.cooja.motes.AbstractApplicationMote;
public class ApplicationSerialPort extends SerialUI {
private Mote mote;

8
tools/cooja/java/se/sics/cooja/interfaces/Battery.java → tools/cooja/java/org/contikios/cooja/interfaces/Battery.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.util.Collection;
@ -37,9 +37,9 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
/**
* A Battery represents the energy source for a mote.

4
tools/cooja/java/se/sics/cooja/interfaces/Beeper.java → tools/cooja/java/org/contikios/cooja/interfaces/Beeper.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A Beeper represents a mote beeper. An implementation should notify all

4
tools/cooja/java/se/sics/cooja/interfaces/Button.java → tools/cooja/java/org/contikios/cooja/interfaces/Button.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A Button represents a mote button. An implementation should notify all

4
tools/cooja/java/se/sics/cooja/interfaces/Clock.java → tools/cooja/java/org/contikios/cooja/interfaces/Clock.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* Represents a mote's internal clock. Notice that the overall

2
tools/cooja/java/se/sics/cooja/interfaces/CustomDataRadio.java → tools/cooja/java/org/contikios/cooja/interfaces/CustomDataRadio.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
/**
* Custom data radio interface.

2
tools/cooja/java/se/sics/cooja/interfaces/DirectionalAntennaRadio.java → tools/cooja/java/org/contikios/cooja/interfaces/DirectionalAntennaRadio.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
/**
* Directional antenna.

14
tools/cooja/java/se/sics/cooja/interfaces/IPAddress.java → tools/cooja/java/org/contikios/cooja/interfaces/IPAddress.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.util.Collection;
import java.util.Observable;
@ -39,12 +39,12 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteMemory;
import se.sics.cooja.MoteMemory.MemoryEventType;
import se.sics.cooja.MoteMemory.MemoryMonitor;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteMemory;
import org.contikios.cooja.MoteMemory.MemoryEventType;
import org.contikios.cooja.MoteMemory.MemoryMonitor;
/**
* Read-only interface to IPv4 or IPv6 address.

4
tools/cooja/java/se/sics/cooja/interfaces/LED.java → tools/cooja/java/org/contikios/cooja/interfaces/LED.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A LED represents three mote LEDs (green, yellow and red). An implementation should notify all

4
tools/cooja/java/se/sics/cooja/interfaces/Log.java → tools/cooja/java/org/contikios/cooja/interfaces/Log.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A Log represents a mote logging output. An implementation should notify all

12
tools/cooja/java/se/sics/cooja/interfaces/Mote2MoteRelations.java → tools/cooja/java/org/contikios/cooja/interfaces/Mote2MoteRelations.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.awt.Color;
import java.util.ArrayList;
@ -43,11 +43,11 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.SimEventCentral.MoteCountListener;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.SimEventCentral.MoteCountListener;
/**
* Mote2Mote Relations is used to show mote relations in simulated

10
tools/cooja/java/se/sics/cooja/interfaces/MoteAttributes.java → tools/cooja/java/org/contikios/cooja/interfaces/MoteAttributes.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.awt.BorderLayout;
import java.util.Collection;
@ -42,10 +42,10 @@ import javax.swing.JTextArea;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.plugins.skins.AttributeVisualizerSkin;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.plugins.skins.AttributeVisualizerSkin;
/**
* MoteAttributes used to store mote attributes for debugging and statistics

6
tools/cooja/java/se/sics/cooja/interfaces/MoteID.java → tools/cooja/java/org/contikios/cooja/interfaces/MoteID.java
View file

@ -28,15 +28,15 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.util.ArrayList;
import java.util.Collection;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.MoteInterface;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.MoteInterface;
/**
* A MoteID represents a mote ID number. An implementation should notify all

2
tools/cooja/java/se/sics/cooja/interfaces/NoiseSourceRadio.java → tools/cooja/java/org/contikios/cooja/interfaces/NoiseSourceRadio.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
/**
* The noise source radio is used to simulate ambient background noise or

4
tools/cooja/java/se/sics/cooja/interfaces/PIR.java → tools/cooja/java/org/contikios/cooja/interfaces/PIR.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* A PIR represents a passive infrared sensor. An implementation should notify all

4
tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java → tools/cooja/java/org/contikios/cooja/interfaces/PolledAfterActiveTicks.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.contikimote.interfaces.ContikiRS232;
import org.contikios.cooja.contikimote.interfaces.ContikiRS232;
/**
* A mote interface polled after a mote tick ONLY IF the mote is awake.

2
tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java → tools/cooja/java/org/contikios/cooja/interfaces/PolledAfterAllTicks.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
/**
* A mote interface polled after ALL mote ticks.

4
tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java → tools/cooja/java/org/contikios/cooja/interfaces/PolledBeforeActiveTicks.java
View file

@ -28,9 +28,9 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import se.sics.cooja.contikimote.interfaces.ContikiClock;
import org.contikios.cooja.contikimote.interfaces.ContikiClock;
/**
* A mote interface polled before each mote tick ONLY IF the mote is awake.

2
tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java → tools/cooja/java/org/contikios/cooja/interfaces/PolledBeforeAllTicks.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
/**
* A mote interface polled before ALL mote ticks.

6
tools/cooja/java/se/sics/cooja/interfaces/Position.java → tools/cooja/java/org/contikios/cooja/interfaces/Position.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.text.NumberFormat;
import java.util.*;
@ -36,7 +36,7 @@ import javax.swing.*;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.*;
import org.contikios.cooja.*;
/**
* Mote 3D position.
@ -58,7 +58,7 @@ public class Position extends MoteInterface {
* @param mote
* Led's mote.
* @see Mote
* @see se.sics.cooja.MoteInterfaceHandler
* @see org.contikios.cooja.MoteInterfaceHandler
*/
public Position(Mote mote) {
this.mote = mote;

12
tools/cooja/java/se/sics/cooja/interfaces/Radio.java → tools/cooja/java/org/contikios/cooja/interfaces/Radio.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
@ -41,11 +41,11 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.contikimote.interfaces.ContikiRadio;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.contikimote.interfaces.ContikiRadio;
/**
* A mote radio transceiver.

14
tools/cooja/java/se/sics/cooja/interfaces/RimeAddress.java → tools/cooja/java/org/contikios/cooja/interfaces/RimeAddress.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.util.Collection;
import java.util.Observable;
@ -40,12 +40,12 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteMemory;
import se.sics.cooja.MoteMemory.MemoryEventType;
import se.sics.cooja.MoteMemory.MemoryMonitor;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteMemory;
import org.contikios.cooja.MoteMemory.MemoryEventType;
import org.contikios.cooja.MoteMemory.MemoryMonitor;
/**
* Read-only interface to Rime address read from Contiki variable: rimeaddr_node_addr.

4
tools/cooja/java/se/sics/cooja/interfaces/SerialPort.java → tools/cooja/java/org/contikios/cooja/interfaces/SerialPort.java
View file

@ -28,11 +28,11 @@
*
*/
package se.sics.cooja.interfaces;
package org.contikios.cooja.interfaces;
import java.util.Observer;
import se.sics.cooja.*;
import org.contikios.cooja.*;
@ClassDescription("Serial port")
public interface SerialPort {

24
tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMote.java → tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMote.java
View file

@ -26,7 +26,7 @@
*
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import java.util.ArrayList;
import java.util.Collection;
@ -38,17 +38,17 @@ import java.util.Properties;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteInterfaceHandler;
import se.sics.cooja.MoteMemory;
import se.sics.cooja.MoteType;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.SectionMoteMemory;
import se.sics.cooja.Simulation;
import se.sics.cooja.interfaces.ApplicationRadio;
import se.sics.cooja.interfaces.ApplicationSerialPort;
import se.sics.cooja.interfaces.Radio;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteInterfaceHandler;
import org.contikios.cooja.MoteMemory;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.ApplicationRadio;
import org.contikios.cooja.interfaces.ApplicationSerialPort;
import org.contikios.cooja.interfaces.Radio;
/**
* Abstract application mote.

30
tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.java → tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMoteType.java
View file

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import java.awt.Container;
import java.io.File;
@ -39,20 +39,20 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteInterface;
import se.sics.cooja.MoteType;
import se.sics.cooja.ProjectConfig;
import se.sics.cooja.Simulation;
import se.sics.cooja.interfaces.ApplicationLED;
import se.sics.cooja.interfaces.ApplicationRadio;
import se.sics.cooja.interfaces.ApplicationSerialPort;
import se.sics.cooja.interfaces.Mote2MoteRelations;
import se.sics.cooja.interfaces.MoteAttributes;
import se.sics.cooja.interfaces.MoteID;
import se.sics.cooja.interfaces.Position;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.ProjectConfig;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.ApplicationLED;
import org.contikios.cooja.interfaces.ApplicationRadio;
import org.contikios.cooja.interfaces.ApplicationSerialPort;
import org.contikios.cooja.interfaces.Mote2MoteRelations;
import org.contikios.cooja.interfaces.MoteAttributes;
import org.contikios.cooja.interfaces.MoteID;
import org.contikios.cooja.interfaces.Position;
@ClassDescription("Application Mote Type")
public abstract class AbstractApplicationMoteType implements MoteType {

10
tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java → tools/cooja/java/org/contikios/cooja/motes/AbstractEmulatedMote.java
View file

@ -26,12 +26,12 @@
*
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import se.sics.cooja.Mote;
import se.sics.cooja.plugins.BufferListener;
import se.sics.cooja.plugins.BufferListener.BufferAccess;
import se.sics.cooja.plugins.TimeLine;
import org.contikios.cooja.Mote;
import org.contikios.cooja.plugins.BufferListener;
import org.contikios.cooja.plugins.BufferListener.BufferAccess;
import org.contikios.cooja.plugins.TimeLine;
public abstract class AbstractEmulatedMote extends AbstractWakeupMote implements Mote {

10
tools/cooja/java/se/sics/cooja/motes/AbstractWakeupMote.java → tools/cooja/java/org/contikios/cooja/motes/AbstractWakeupMote.java
View file

@ -26,16 +26,16 @@
*
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import java.util.HashMap;
import org.apache.log4j.Logger;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteTimeEvent;
import se.sics.cooja.Simulation;
import se.sics.cooja.TimeEvent;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteTimeEvent;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.TimeEvent;
public abstract class AbstractWakeupMote implements Mote {
private static Logger logger = Logger.getLogger(AbstractWakeupMote.class);

24
tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java → tools/cooja/java/org/contikios/cooja/motes/DisturberMoteType.java
View file

@ -29,23 +29,23 @@
*
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import java.awt.Container;
import org.apache.log4j.Logger;
import se.sics.cooja.AbstractionLevelDescription;
import se.sics.cooja.COOJARadioPacket;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteTimeEvent;
import se.sics.cooja.MoteType;
import se.sics.cooja.RadioPacket;
import se.sics.cooja.Simulation;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.interfaces.ApplicationRadio;
import se.sics.cooja.interfaces.Radio.RadioEvent;
import org.contikios.cooja.AbstractionLevelDescription;
import org.contikios.cooja.COOJARadioPacket;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteTimeEvent;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.MoteType.MoteTypeCreationException;
import org.contikios.cooja.interfaces.ApplicationRadio;
import org.contikios.cooja.interfaces.Radio.RadioEvent;
/**
* Simple application-level mote that periodically transmits dummy radio packets

16
tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java → tools/cooja/java/org/contikios/cooja/motes/ImportAppMoteType.java
View file

@ -29,7 +29,7 @@
*
*/
package se.sics.cooja.motes;
package org.contikios.cooja.motes;
import java.awt.Container;
import java.io.File;
@ -43,13 +43,13 @@ import java.util.Collection;
import org.jdom.Element;
import se.sics.cooja.AbstractionLevelDescription;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteType;
import se.sics.cooja.Simulation;
import se.sics.cooja.dialogs.ImportAppMoteDialog;
import se.sics.cooja.util.ArrayUtils;
import org.contikios.cooja.AbstractionLevelDescription;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.dialogs.ImportAppMoteDialog;
import org.contikios.cooja.util.ArrayUtils;
/**
* @author Fredrik Osterlind

40
tools/cooja/java/se/sics/cooja/plugins/BufferListener.java → tools/cooja/java/org/contikios/cooja/plugins/BufferListener.java
View file

@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
package se.sics.cooja.plugins;
package org.contikios.cooja.plugins;
import java.awt.BorderLayout;
import java.awt.Color;
@ -86,23 +86,23 @@ import javax.swing.table.TableRowSorter;
import org.apache.log4j.Logger;
import org.jdom.Element;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.MoteMemory;
import se.sics.cooja.MoteMemory.MemoryEventType;
import se.sics.cooja.Plugin;
import se.sics.cooja.PluginType;
import se.sics.cooja.SimEventCentral.MoteCountListener;
import se.sics.cooja.Simulation;
import se.sics.cooja.TimeEvent;
import se.sics.cooja.VisPlugin;
import se.sics.cooja.dialogs.TableColumnAdjuster;
import se.sics.cooja.dialogs.UpdateAggregator;
import se.sics.cooja.interfaces.IPAddress;
import se.sics.cooja.motes.AbstractEmulatedMote;
import se.sics.cooja.util.ArrayQueue;
import se.sics.cooja.util.StringUtils;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteMemory;
import org.contikios.cooja.MoteMemory.MemoryEventType;
import org.contikios.cooja.Plugin;
import org.contikios.cooja.PluginType;
import org.contikios.cooja.SimEventCentral.MoteCountListener;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.TimeEvent;
import org.contikios.cooja.VisPlugin;
import org.contikios.cooja.dialogs.TableColumnAdjuster;
import org.contikios.cooja.dialogs.UpdateAggregator;
import org.contikios.cooja.interfaces.IPAddress;
import org.contikios.cooja.motes.AbstractEmulatedMote;
import org.contikios.cooja.util.ArrayQueue;
import org.contikios.cooja.util.StringUtils;
/**
* @author Fredrik Osterlind, Niclas Finne
@ -674,7 +674,7 @@ public class BufferListener extends VisPlugin {
}
final public void memoryChanged(MoteMemory memory,
se.sics.cooja.MoteMemory.MemoryEventType type, int address) {
org.contikios.cooja.MoteMemory.MemoryEventType type, int address) {
if (type == MemoryEventType.READ) {
return;
}
@ -704,7 +704,7 @@ public class BufferListener extends VisPlugin {
}
}
static class SegmentMemoryMonitor implements se.sics.cooja.MoteMemory.MemoryMonitor {
static class SegmentMemoryMonitor implements org.contikios.cooja.MoteMemory.MemoryMonitor {
protected final BufferListener bl;
protected final Mote mote;

28
tools/cooja/java/se/sics/cooja/plugins/DGRMConfigurator.java → tools/cooja/java/org/contikios/cooja/plugins/DGRMConfigurator.java
View file

@ -28,7 +28,7 @@
*
*/
package se.sics.cooja.plugins;
package org.contikios.cooja.plugins;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@ -59,19 +59,19 @@ import javax.swing.table.TableCellEditor;
import org.apache.log4j.Logger;
import se.sics.cooja.ClassDescription;
import se.sics.cooja.Cooja;
import se.sics.cooja.Mote;
import se.sics.cooja.PluginType;
import se.sics.cooja.Simulation;
import se.sics.cooja.SupportedArguments;
import se.sics.cooja.VisPlugin;
import se.sics.cooja.interfaces.Radio;
import se.sics.cooja.radiomediums.AbstractRadioMedium;
import se.sics.cooja.radiomediums.DGRMDestinationRadio;
import se.sics.cooja.radiomediums.DirectedGraphMedium;
import se.sics.cooja.radiomediums.DirectedGraphMedium.Edge;
import se.sics.cooja.util.StringUtils;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.PluginType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.SupportedArguments;
import org.contikios.cooja.VisPlugin;
import org.contikios.cooja.interfaces.Radio;
import org.contikios.cooja.radiomediums.AbstractRadioMedium;
import org.contikios.cooja.radiomediums.DGRMDestinationRadio;
import org.contikios.cooja.radiomediums.DirectedGraphMedium;
import org.contikios.cooja.radiomediums.DirectedGraphMedium.Edge;
import org.contikios.cooja.util.StringUtils;
/**
* Simple user interface for configuring edges for the Directed Graph

Some files were not shown because too many files have changed in this diff Show more