This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 69993bb92228d98a7791a5e1709e3d7837594165 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 13:03:49 2015 +0200 correction du nom des operations --- .../src/main/java/fr/ird/observe/report/ReportBuilder.java | 8 ++++---- .../src/main/java/fr/ird/observe/report/model/Report.java | 12 ++++++------ .../main/java/fr/ird/observe/report/model/ReportExecute.java | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java b/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java index be21ca6..6eec032 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java +++ b/observe-business/src/main/java/fr/ird/observe/report/ReportBuilder.java @@ -180,7 +180,7 @@ public class ReportBuilder { } } ReportRequest[] requests = getRequests(reportName, dico); - ReportOperation[] operationss = getObjectOperations(reportName, dico); + ReportOperation[] operationss = getOperations(reportName, dico); ReportVariable[] variables = getVariables(reportName, dico); ReportVariable[] repeatVariables = getRepeatVariables(reportName, dico); @@ -324,7 +324,7 @@ public class ReportBuilder { return def; } - protected ReportOperation[] getObjectOperations(String reportName, Map<String, String> dico) { + protected ReportOperation[] getOperations(String reportName, Map<String, String> dico) { Map<Integer, String> requestDico = new TreeMap<Integer, String>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); @@ -355,7 +355,7 @@ public class ReportBuilder { String operationsDef = requestDico.get(id); - ReportOperation def = getObjectOperation(operationsDef); + ReportOperation def = getOperation(operationsDef); if (log.isInfoEnabled()) { log.info("Detects a operations : " + def); } @@ -458,7 +458,7 @@ public class ReportBuilder { return result.toArray(new ReportVariable[result.size()]); } - protected ReportOperation getObjectOperation(String operationsDef) { + protected ReportOperation getOperation(String operationsDef) { // pour le moment, une operations n'a qu'une seule valeur : celle // du lastName de l'opération diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/Report.java b/observe-business/src/main/java/fr/ird/observe/report/model/Report.java index 7cab59a..318d22e 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/Report.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/Report.java @@ -52,7 +52,7 @@ public class Report implements Serializable { protected final ReportRequest[] requests; /** la liste des opérations à jouer. */ - protected final ReportOperation[] objectOperations; + protected final ReportOperation[] operations; /** la liste des variables du report. */ protected final ReportVariable[] variables; @@ -67,7 +67,7 @@ public class Report implements Serializable { String description, String[] rowHeaders, String[] columnHeaders, - ReportOperation[] objectOperations, + ReportOperation[] operations, ReportVariable[] variables, ReportVariable[] repeatVariables, ReportRequest... requests) { @@ -77,13 +77,13 @@ public class Report implements Serializable { this.rowHeaders = rowHeaders; this.columnHeaders = columnHeaders; this.requests = requests; - this.objectOperations = objectOperations; + this.operations = operations; this.variables = variables; this.repeatVariables = repeatVariables; if (log.isDebugEnabled()) { log.debug("New report [" + id + ":" + name + "], nb requests : " + requests.length + ", nb objectOperations : " + - objectOperations.length + ", nb variables : " + + operations.length + ", nb variables : " + variables.length + ", nb repeat variables : " + repeatVariables.length); } @@ -121,8 +121,8 @@ public class Report implements Serializable { return requests; } - public ReportOperation[] getObjectOperations() { - return objectOperations; + public ReportOperation[] getOperations() { + return operations; } public ReportVariable[] getVariables() { diff --git a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java index 83f5983..94500ef 100644 --- a/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java +++ b/observe-business/src/main/java/fr/ird/observe/report/model/ReportExecute.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.report.model; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.report.ReportBuilder; @@ -150,7 +152,7 @@ public class ReportExecute { ); // lancement des opérations supplémentaires - for (ReportOperation objectOperation : report.getObjectOperations()) { + for (ReportOperation objectOperation : report.getOperations()) { DataMatrix tmp = result; if (log.isDebugEnabled()) { @@ -271,7 +273,7 @@ public class ReportExecute { for (ReportVariable variable : report.getRepeatVariables()) { String hql = variable.getRequest(); Object[] objects = ReportRequest.getParams(hql, variables); - List<?> universe = tx.findAll(hql, objects); + List<?> universe = Lists.newArrayList(Sets.newLinkedHashSet(tx.findAll(hql, objects))); repeatVariablesUniverse.put(variable.getName(), universe); } } finally { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.