# HG changeset patch # User Raimund Renkert # Date 1436262996 -7200 # Node ID 46bb231ff9b9e0256520287a1fe00bd0be24d196 # Parent 6441bb4a90f0132ed92a216bf3a3a43a791ad138 Documentation. diff -r 6441bb4a90f0 -r 46bb231ff9b9 src/main/java/de/intevation/lada/factory/ProbeFactory.java --- a/src/main/java/de/intevation/lada/factory/ProbeFactory.java Wed Jul 01 15:28:57 2015 +0200 +++ b/src/main/java/de/intevation/lada/factory/ProbeFactory.java Tue Jul 07 11:56:36 2015 +0200 @@ -1,3 +1,10 @@ +/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU GPL (v>=3) + * and comes with ABSOLUTELY NO WARRANTY! Check out + * the documentation coming with IMIS-Labordaten-Application for details. + */ package de.intevation.lada.factory; import java.math.BigInteger; @@ -25,12 +32,30 @@ import de.intevation.lada.util.data.RepositoryType; import de.intevation.lada.util.rest.Response; +/** + * This factory creates probe objects and its children using a messprogramm + * as template. + * + * @author Raimund Renkert + */ public class ProbeFactory { + /** + * The data repository + */ @Inject @RepositoryConfig(type = RepositoryType.RW) private Repository repository; + /** + * Create a list of probe objects + * + * @param id Messprogramm id + * @param from The start date + * @param to The end date + * + * @return List of probe objects. + */ public List create(String id, Long from, Long to) { QueryBuilder builder = new QueryBuilder( @@ -49,13 +74,9 @@ start.setTime(new Date(from)); Calendar end = Calendar.getInstance(); end.setTime(new Date (to)); - // benutzereingabe + gültigVon/Bis - // kann mehrere Intervalle enthalten, wenn nutzereingabe über mehrere - // Jahre. Date[][] intervals = calculateIntervals(start, end, messprogramm); List proben = new ArrayList(); for (Date[] interval : intervals) { - //erzeuge proben für einen intervall(gültigkeitsbereich) createProben(interval, messprogramm, proben); } return proben; diff -r 6441bb4a90f0 -r 46bb231ff9b9 src/main/resources/META-INF/persistence.xml --- a/src/main/resources/META-INF/persistence.xml Wed Jul 01 15:28:57 2015 +0200 +++ b/src/main/resources/META-INF/persistence.xml Tue Jul 07 11:56:36 2015 +0200 @@ -2,34 +2,45 @@ + + java:/jboss/lada-bund false + + + - + java:/jboss/lada-land false + + + + - + java:/jboss/lada-stamm + - + +