# HG changeset patch # User Raimund Renkert # Date 1369315783 -7200 # Node ID 0dd63fcc9581cdc7f9243350ec304af1fd3ad2cc # Parent e0a5477f657eab15bf2e3ea7f6f27911b704a36e Code cleanup. diff -r e0a5477f657e -r 0dd63fcc9581 src/main/java/de/intevation/lada/data/LProbeRepository.java --- a/src/main/java/de/intevation/lada/data/LProbeRepository.java Thu May 23 15:29:13 2013 +0200 +++ b/src/main/java/de/intevation/lada/data/LProbeRepository.java Thu May 23 15:29:43 2013 +0200 @@ -29,7 +29,6 @@ * The entitymanager managing the data. */ @Inject - @PersistenceContext(type=PersistenceContextType.EXTENDED) private EntityManager em; /** diff -r e0a5477f657e -r 0dd63fcc9581 src/main/java/de/intevation/lada/rest/SUmweltRESTService.java --- a/src/main/java/de/intevation/lada/rest/SUmweltRESTService.java Thu May 23 15:29:13 2013 +0200 +++ b/src/main/java/de/intevation/lada/rest/SUmweltRESTService.java Thu May 23 15:29:43 2013 +0200 @@ -41,7 +41,7 @@ */ @GET @Produces("text/json") - public List listAllMembers() { + public List findAll() { final List result = repository.findAll(); return result; } diff -r e0a5477f657e -r 0dd63fcc9581 src/main/java/de/intevation/lada/service/LProbeService.java --- a/src/main/java/de/intevation/lada/service/LProbeService.java Thu May 23 15:29:13 2013 +0200 +++ b/src/main/java/de/intevation/lada/service/LProbeService.java Thu May 23 15:29:43 2013 +0200 @@ -19,14 +19,10 @@ @Inject private EntityManager em; -// @Inject -// private Event memberEventSrc; - @TransactionAttribute(TransactionAttributeType.REQUIRED) public void delete(String id) throws Exception { - LProbe probe = em.find(LProbe.class, id); + LProbe probe = em.find(LProbe.class, id); log.info("Deleting " + probe.getProbeId()); em.remove(probe); - //memberEventSrc.fire(member); } } \ No newline at end of file diff -r e0a5477f657e -r 0dd63fcc9581 src/main/java/de/intevation/lada/utils/Resources.java --- a/src/main/java/de/intevation/lada/utils/Resources.java Thu May 23 15:29:13 2013 +0200 +++ b/src/main/java/de/intevation/lada/utils/Resources.java Thu May 23 15:29:43 2013 +0200 @@ -27,19 +27,9 @@ /** * This class uses CDI to alias Java EE resources, such as the persistence context, to CDI beans - * - *

- * Example injection on a managed bean field: - *

- * - *
- * @Inject
- * private EntityManager em;
- * 
*/ public class Resources { - // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly - @SuppressWarnings("unused") + @Produces @PersistenceContext private EntityManager em; @@ -48,11 +38,4 @@ public Logger produceLog(InjectionPoint injectionPoint) { return Logger.getLogger(injectionPoint.getMember().getDeclaringClass().getName()); } - - @Produces - @RequestScoped - public FacesContext produceFacesContext() { - return FacesContext.getCurrentInstance(); - } - }