From 186240821f1f6bb5d458ec91c1e28f47305d2e96 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Wed, 23 Jul 2014 10:52:25 +0200 Subject: [PATCH] [cooja] memory: Moved SectionMoteMemory to package memory --- .../cooja/java/org/contikios/cooja/contikimote/ContikiMote.java | 2 +- .../java/org/contikios/cooja/contikimote/ContikiMoteType.java | 2 +- .../contikios/cooja/contikimote/interfaces/ContikiBeeper.java | 2 +- .../contikios/cooja/contikimote/interfaces/ContikiClock.java | 2 +- .../org/contikios/cooja/contikimote/interfaces/ContikiPIR.java | 2 +- .../contikios/cooja/contikimote/interfaces/ContikiRadio.java | 2 +- .../org/contikios/cooja/contikimote/interfaces/ContikiVib.java | 2 +- .../java/org/contikios/cooja/dialogs/ConfigurationWizard.java | 2 +- .../contikios/cooja/{ => mote/memory}/SectionMoteMemory.java | 2 +- .../java/org/contikios/cooja/motes/AbstractApplicationMote.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename tools/cooja/java/org/contikios/cooja/{ => mote/memory}/SectionMoteMemory.java (99%) diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMote.java b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMote.java index e39d5d86e..de033aaa4 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMote.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMote.java @@ -39,7 +39,7 @@ import org.contikios.cooja.Mote; import org.contikios.cooja.MoteInterface; import org.contikios.cooja.MoteInterfaceHandler; import org.contikios.cooja.MoteType; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.Simulation; import org.contikios.cooja.mote.memory.MemoryInterface; import org.contikios.cooja.motes.AbstractWakeupMote; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java index 8ca58f6c1..6d58d2d6a 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java @@ -62,7 +62,7 @@ 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.mote.memory.SectionMoteMemory; import org.contikios.cooja.Simulation; import org.contikios.cooja.dialogs.CompileContiki; import org.contikios.cooja.dialogs.ContikiMoteCompileDialog; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiBeeper.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiBeeper.java index 5fce4e931..01f9c757e 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiBeeper.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiBeeper.java @@ -44,7 +44,7 @@ import org.apache.log4j.Logger; import org.jdom.Element; import org.contikios.cooja.Mote; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.contikimote.ContikiMoteInterface; import org.contikios.cooja.interfaces.Beeper; import org.contikios.cooja.interfaces.PolledAfterActiveTicks; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiClock.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiClock.java index dce0063cb..127a7a3a7 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiClock.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiClock.java @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; import org.jdom.Element; import org.contikios.cooja.Mote; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.Simulation; import org.contikios.cooja.contikimote.ContikiMote; import org.contikios.cooja.contikimote.ContikiMoteInterface; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiPIR.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiPIR.java index c56233d25..cbfb7d66c 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiPIR.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiPIR.java @@ -37,7 +37,7 @@ import javax.swing.JButton; import javax.swing.JPanel; import org.jdom.Element; import org.contikios.cooja.Mote; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.contikimote.ContikiMote; import org.contikios.cooja.contikimote.ContikiMoteInterface; import org.contikios.cooja.interfaces.PIR; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java index be239338b..5502b9a8a 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java @@ -39,7 +39,7 @@ import org.jdom.Element; import org.contikios.cooja.COOJARadioPacket; import org.contikios.cooja.Mote; import org.contikios.cooja.RadioPacket; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.Simulation; import org.contikios.cooja.contikimote.ContikiMote; import org.contikios.cooja.contikimote.ContikiMoteInterface; diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiVib.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiVib.java index f80a1bc63..ba1920715 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiVib.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiVib.java @@ -39,7 +39,7 @@ import org.jdom.Element; import org.contikios.cooja.ClassDescription; import org.contikios.cooja.Mote; import org.contikios.cooja.MoteInterface; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.contikimote.ContikiMote; import org.contikios.cooja.contikimote.ContikiMoteInterface; import org.contikios.cooja.mote.memory.VarMemory; diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java b/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java index 82726f266..0fa575be9 100644 --- a/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java +++ b/tools/cooja/java/org/contikios/cooja/dialogs/ConfigurationWizard.java @@ -66,7 +66,7 @@ import javax.swing.JScrollPane; 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.mote.memory.SectionMoteMemory; import org.contikios.cooja.contikimote.ContikiMoteType; import org.contikios.cooja.mote.memory.VarMemory; diff --git a/tools/cooja/java/org/contikios/cooja/SectionMoteMemory.java b/tools/cooja/java/org/contikios/cooja/mote/memory/SectionMoteMemory.java similarity index 99% rename from tools/cooja/java/org/contikios/cooja/SectionMoteMemory.java rename to tools/cooja/java/org/contikios/cooja/mote/memory/SectionMoteMemory.java index 73f246eb2..75c8d4dfa 100644 --- a/tools/cooja/java/org/contikios/cooja/SectionMoteMemory.java +++ b/tools/cooja/java/org/contikios/cooja/mote/memory/SectionMoteMemory.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.contikios.cooja; +package org.contikios.cooja.mote.memory; import java.util.ArrayList; import java.util.Arrays; diff --git a/tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMote.java b/tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMote.java index e4974ac7b..b8bccaf63 100644 --- a/tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMote.java +++ b/tools/cooja/java/org/contikios/cooja/motes/AbstractApplicationMote.java @@ -41,7 +41,7 @@ import org.contikios.cooja.MoteInterface; import org.contikios.cooja.MoteInterfaceHandler; import org.contikios.cooja.MoteType; import org.contikios.cooja.RadioPacket; -import org.contikios.cooja.SectionMoteMemory; +import org.contikios.cooja.mote.memory.SectionMoteMemory; import org.contikios.cooja.Simulation; import org.contikios.cooja.interfaces.ApplicationRadio; import org.contikios.cooja.interfaces.ApplicationSerialPort;