diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java index c03df3a65..f70ec5dba 100644 --- a/tools/cooja/java/se/sics/cooja/GUI.java +++ b/tools/cooja/java/se/sics/cooja/GUI.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: GUI.java,v 1.13 2007/01/09 10:27:53 fros4943 Exp $ + * $Id: GUI.java,v 1.14 2007/01/10 09:03:02 fros4943 Exp $ */ package se.sics.cooja; @@ -773,7 +773,7 @@ public class GUI { Class radioMediumClass = gui.tryLoadClass(gui, RadioMedium.class, radioMediumClassName); - RadioMedium radioMedium = RadioMedium.generateInterface(radioMediumClass, simulation); + RadioMedium radioMedium = RadioMedium.generateRadioMedium(radioMediumClass, simulation); simulation.setRadioMedium(radioMedium); } catch (Exception e) { logger.fatal(">> Failed to load radio medium, aborting: " diff --git a/tools/cooja/java/se/sics/cooja/RadioMedium.java b/tools/cooja/java/se/sics/cooja/RadioMedium.java index b2a3e422e..d75e88371 100644 --- a/tools/cooja/java/se/sics/cooja/RadioMedium.java +++ b/tools/cooja/java/se/sics/cooja/RadioMedium.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: RadioMedium.java,v 1.2 2007/01/09 10:18:08 fros4943 Exp $ + * $Id: RadioMedium.java,v 1.3 2007/01/10 09:02:17 fros4943 Exp $ */ package se.sics.cooja; @@ -190,7 +190,7 @@ public abstract class RadioMedium { * * @return Radio medium instance */ - public static final RadioMedium generateInterface( + public static final RadioMedium generateRadioMedium( Class radioMediumClass, Simulation simulation) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException { diff --git a/tools/cooja/java/se/sics/cooja/Simulation.java b/tools/cooja/java/se/sics/cooja/Simulation.java index 454201b33..b2cc376bd 100644 --- a/tools/cooja/java/se/sics/cooja/Simulation.java +++ b/tools/cooja/java/se/sics/cooja/Simulation.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Simulation.java,v 1.7 2007/01/09 10:21:08 fros4943 Exp $ + * $Id: Simulation.java,v 1.8 2007/01/10 09:02:38 fros4943 Exp $ */ package se.sics.cooja; @@ -342,7 +342,7 @@ public class Simulation extends Observable implements Runnable { if (radioMediumClass != null) { // Create radio medium specified in config try { - currentRadioMedium = RadioMedium.generateInterface(radioMediumClass, this); + currentRadioMedium = RadioMedium.generateRadioMedium(radioMediumClass, this); } catch (Exception e) { currentRadioMedium = null; logger.warn("Could not load radio medium class: " diff --git a/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java b/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java index 1d4b4bd78..108975a36 100644 --- a/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java +++ b/tools/cooja/java/se/sics/cooja/dialogs/CreateSimDialog.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: CreateSimDialog.java,v 1.2 2007/01/09 10:03:51 fros4943 Exp $ + * $Id: CreateSimDialog.java,v 1.3 2007/01/10 09:04:01 fros4943 Exp $ */ package se.sics.cooja.dialogs; @@ -319,7 +319,7 @@ public class CreateSimDialog extends JDialog { if (currentRadioMediumDescription.equals(radioMediumDescription)) { try { - RadioMedium radioMedium = RadioMedium.generateInterface(radioMediumClass, mySimulation); + RadioMedium radioMedium = RadioMedium.generateRadioMedium(radioMediumClass, mySimulation); mySimulation.setRadioMedium(radioMedium); } catch (Exception ex) { logger.fatal("Exception when creating radio medium: " + ex);