changed method name
This commit is contained in:
parent
30e0584ec5
commit
b2516a09ef
4 changed files with 8 additions and 8 deletions
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* 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;
|
package se.sics.cooja;
|
||||||
|
@ -773,7 +773,7 @@ public class GUI {
|
||||||
Class<? extends RadioMedium> radioMediumClass = gui.tryLoadClass(gui,
|
Class<? extends RadioMedium> radioMediumClass = gui.tryLoadClass(gui,
|
||||||
RadioMedium.class, radioMediumClassName);
|
RadioMedium.class, radioMediumClassName);
|
||||||
|
|
||||||
RadioMedium radioMedium = RadioMedium.generateInterface(radioMediumClass, simulation);
|
RadioMedium radioMedium = RadioMedium.generateRadioMedium(radioMediumClass, simulation);
|
||||||
simulation.setRadioMedium(radioMedium);
|
simulation.setRadioMedium(radioMedium);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.fatal(">> Failed to load radio medium, aborting: "
|
logger.fatal(">> Failed to load radio medium, aborting: "
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* 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;
|
package se.sics.cooja;
|
||||||
|
@ -190,7 +190,7 @@ public abstract class RadioMedium {
|
||||||
*
|
*
|
||||||
* @return Radio medium instance
|
* @return Radio medium instance
|
||||||
*/
|
*/
|
||||||
public static final RadioMedium generateInterface(
|
public static final RadioMedium generateRadioMedium(
|
||||||
Class<? extends RadioMedium> radioMediumClass, Simulation simulation)
|
Class<? extends RadioMedium> radioMediumClass, Simulation simulation)
|
||||||
throws NoSuchMethodException, InvocationTargetException,
|
throws NoSuchMethodException, InvocationTargetException,
|
||||||
IllegalAccessException, InstantiationException {
|
IllegalAccessException, InstantiationException {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* 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;
|
package se.sics.cooja;
|
||||||
|
@ -342,7 +342,7 @@ public class Simulation extends Observable implements Runnable {
|
||||||
if (radioMediumClass != null) {
|
if (radioMediumClass != null) {
|
||||||
// Create radio medium specified in config
|
// Create radio medium specified in config
|
||||||
try {
|
try {
|
||||||
currentRadioMedium = RadioMedium.generateInterface(radioMediumClass, this);
|
currentRadioMedium = RadioMedium.generateRadioMedium(radioMediumClass, this);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
currentRadioMedium = null;
|
currentRadioMedium = null;
|
||||||
logger.warn("Could not load radio medium class: "
|
logger.warn("Could not load radio medium class: "
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* 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;
|
package se.sics.cooja.dialogs;
|
||||||
|
@ -319,7 +319,7 @@ public class CreateSimDialog extends JDialog {
|
||||||
|
|
||||||
if (currentRadioMediumDescription.equals(radioMediumDescription)) {
|
if (currentRadioMediumDescription.equals(radioMediumDescription)) {
|
||||||
try {
|
try {
|
||||||
RadioMedium radioMedium = RadioMedium.generateInterface(radioMediumClass, mySimulation);
|
RadioMedium radioMedium = RadioMedium.generateRadioMedium(radioMediumClass, mySimulation);
|
||||||
mySimulation.setRadioMedium(radioMedium);
|
mySimulation.setRadioMedium(radioMedium);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
logger.fatal("Exception when creating radio medium: " + ex);
|
logger.fatal("Exception when creating radio medium: " + ex);
|
||||||
|
|
Loading…
Reference in a new issue