From 86320d74edc89c733c9b45cb8525981b420b3391 Mon Sep 17 00:00:00 2001 From: Sebastian Schinabeck Date: Tue, 21 Jan 2014 14:56:32 +0100 Subject: [PATCH] Stopped to load plugins depending on simulations if there is no simulation --- tools/cooja/java/org/contikios/cooja/Cooja.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cooja/java/org/contikios/cooja/Cooja.java b/tools/cooja/java/org/contikios/cooja/Cooja.java index 997d705dd..c9c2bad7a 100644 --- a/tools/cooja/java/org/contikios/cooja/Cooja.java +++ b/tools/cooja/java/org/contikios/cooja/Cooja.java @@ -963,7 +963,7 @@ public class Cooja extends Observable { tooltip += description + " (" + newPluginClass.getName() + ")"; /* Check if simulation plugin depends on any particular radio medium */ - if (pluginType == PluginType.SIM_PLUGIN || pluginType == PluginType.SIM_STANDARD_PLUGIN) { + if ((pluginType == PluginType.SIM_PLUGIN || pluginType == PluginType.SIM_STANDARD_PLUGIN) && (getSimulation() != null)) { if (newPluginClass.getAnnotation(SupportedArguments.class) != null) { boolean active = false; Class[] radioMediums = newPluginClass.getAnnotation(SupportedArguments.class).radioMediums();