}

	@Override
<<<<<<< HEAD
	public Device create(ScheduledExecutorService executorService, DeviceType deviceType) {
        return create(executorService, deviceType, null);
	}

	@Override
	public Device create(ScheduledExecutorService executorService, String deviceType) {
		return create(executorService, DeviceType.fromString(deviceType), null);
	}

    @Override
    public Device create(ScheduledExecutorService executorService, DeviceType deviceType, Map configuration) {
        Module deviceModule = null;
		switch (deviceType) {
		case ISENSE:
			deviceModule = new JennicModule();
			break;
		case PACEMATE:
			deviceModule = new PacemateModule();
			break;
		case TELOSB:
			deviceModule = new TelosbModule();
			break;
        case SUNSPOT:
            deviceModule = new SunspotModule(configuration);
            break;
		case MOCK:
			deviceModule = new MockModule();
			break;
		default:
			throw new RuntimeException("Unhandled device type \"" + deviceType
					+ "\". Maybe someone forgot to add this (new) device type to " + DeviceFactoryImpl.class.getName()
					+ "?"
			);
		}
		return Guice.createInjector(new DeviceModule(executorService), deviceModule).getInstance(Device.class);
    }

    @Override
    public Device create(ScheduledExecutorService executorService, String deviceType, Map configuration) {
        return create(executorService, DeviceType.fromString(deviceType), configuration);
    }
=======
	public Device create(ExecutorService executorService, String deviceType) {
		return create(executorService, DeviceType.fromString(deviceType), null);
	}

	@Override
	public Device create(final ExecutorService executorService, final DeviceType deviceType,
						 @Nullable final Map configuration) {

		Module deviceModule;

		switch (deviceType) {
			case ISENSE:
				deviceModule = new JennicModule(configuration);
				break;
			case PACEMATE:
				deviceModule = new PacemateModule(configuration);
				break;
			case TELOSB:
				deviceModule = new TelosbModule(configuration);
				break;
			case MOCK:
				deviceModule = new MockModule(configuration);
				break;
                        case TRISOS:
                                deviceModule = new TriSOSModule(configuration);
                                break;
			default:
				throw new RuntimeException("Unknown device type \"" + deviceType + "\". Maybe someone forgot to add"
						+ "this (new) device type to " + DeviceFactoryImpl.class.getName() + "?"
				);
		}

                Injector injector = Guice.createInjector(new DeviceModule(executorService), deviceModule);
                Device device = injector.getInstance(Device.class);
                return device;
		//return Guice.createInjector(new DeviceModule(executorService), deviceModule).getInstance(Device.class);
	}

	@Override
	public Device create(final ExecutorService executorService, final String deviceType,
						 @Nullable final Map configuration) {

		return create(executorService, DeviceType.fromString(deviceType), configuration);
	}
>>>>>>> ba14303d6bc4fdd43dabcdd2fd0f4cbc990669ca

}

	}

	@Override
	public Device create(ExecutorService executorService, String deviceType) {
		return create(executorService, DeviceType.fromString(deviceType), null);
	}

	@Override
	public Device create(final ExecutorService executorService, final DeviceType deviceType,
						 @Nullable final Map configuration) {

		Module deviceModule;

		switch (deviceType) {
			case ISENSE:
				deviceModule = new JennicModule(configuration);
				break;
			case PACEMATE:
				deviceModule = new PacemateModule(configuration);
				break;
			case TELOSB:
				deviceModule = new TelosbModule(configuration);
				break;
			case MOCK:
				deviceModule = new MockModule(configuration);
				break;
			case TRISOS:
				deviceModule = new TriSOSModule(configuration);
				break;
			case SUNSPOT:
				deviceModule = new SunspotModule(configuration);
				break;
			default:
				throw new RuntimeException("Unknown device type \"" + deviceType + "\". Maybe someone forgot to add"
						+ "this (new) device type to " + DeviceFactoryImpl.class.getName() + "?"
				);
		}

		return Guice.createInjector(new DeviceModule(executorService), deviceModule).getInstance(Device.class);
	}

	@Override
	public Device create(final ExecutorService executorService, final String deviceType,
						 @Nullable final Map configuration) {

		return create(executorService, DeviceType.fromString(deviceType), configuration);
	}

}