Added CDI to the application

This commit is contained in:
2014-05-23 10:24:33 +02:00
parent 2af2f56ade
commit 615d277359
19 changed files with 239 additions and 177 deletions

View File

@@ -1,85 +0,0 @@
/*
* Copyright (c) 2013, Andreas Billmann <abi@geofroggerfx.de>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package de.geofroggerfx.application;
import de.geofroggerfx.gpx.GPXReader;
import de.geofroggerfx.gpx.GroundspeakGPXReader;
import de.geofroggerfx.plugins.PluginService;
import de.geofroggerfx.plugins.PluginServiceImpl;
import de.geofroggerfx.service.CacheService;
import de.geofroggerfx.service.CacheServiceImpl;
import de.geofroggerfx.sql.DatabaseService;
import de.geofroggerfx.sql.DatabaseServiceImpl;
/**
* @author Andreas
*/
public class ServiceManager {
private static final ServiceManager INSTANCE = new ServiceManager();
private GPXReader gpxReader;
private DatabaseService databaseService;
private CacheService cacheService;
private PluginService pluginService;
private ServiceManager() {
// private for singleton pattern
}
public static ServiceManager getInstance() {
return INSTANCE;
}
public synchronized GPXReader getGPXReader() {
if (gpxReader == null) {
gpxReader = new GroundspeakGPXReader();
}
return gpxReader;
}
public synchronized DatabaseService getDatabaseService() {
if (databaseService == null) {
databaseService = new DatabaseServiceImpl();
}
return databaseService;
}
public synchronized CacheService getCacheService() {
if (cacheService == null) {
cacheService = new CacheServiceImpl();
}
return cacheService;
}
public synchronized PluginService getPluginService() {
if (pluginService == null) {
pluginService = new PluginServiceImpl();
}
return pluginService;
}
}

View File

@@ -25,6 +25,7 @@
*/
package de.geofroggerfx.application;
import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,19 +35,12 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* @author Andreas
*/
@Singleton
public class SessionContext {
private static final SessionContext INSTANCE = new SessionContext();
private final Map<String, Object> map = new ConcurrentHashMap<>();
private final Map<String, List<SessionContextListener>> sessionListeners = new HashMap<>();
private SessionContext() {
}
public static SessionContext getInstance() {
return INSTANCE;
}
public void setData(String key, Object value) {
if (value == null && map.containsKey(key)) {
map.remove(key);