This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 9cfdbf543a8a41d2641d9f17fe6c36844e98c90f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 31 14:55:31 2015 +0200 add optionalId in DataModel API + nice method to get child --- .../tutti/persistence/model/CruiseDataModel.java | 14 ++++++++++++++ .../tutti/persistence/model/DataModelSupport.java | 19 +++++++++++++++++++ .../tutti/persistence/model/ProgramDataModel.java | 14 ++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java index 2414aa6..ba44aa6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java @@ -36,4 +36,18 @@ public class CruiseDataModel extends DataModelSupport implements Iterable<Operat return operations.size(); } + public OperationDataModel getOperation(String id) { + + OperationDataModel result = null; + for (OperationDataModel operation : this) { + + if (id.equals(operation.getId())) { + result = operation; + break; + } + } + return result; + + } + } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java index d596bf5..2fee663 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java @@ -12,10 +12,21 @@ public abstract class DataModelSupport implements Serializable { private static final long serialVersionUID = 1L; + /** + * Id representing the data. + */ private final String id; + /** + * Label of the data. + */ private final String label; + /** + * Optional id (used for example to link an id in a db to the same data in another db. + */ + private String optionalId; + public DataModelSupport(String id, String label) { this.id = id; this.label = label; @@ -29,6 +40,14 @@ public abstract class DataModelSupport implements Serializable { return label; } + public String getOptionalId() { + return optionalId; + } + + public void setOptionalId(String optionalId) { + this.optionalId = optionalId; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java index 1743002..5616868 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java @@ -36,4 +36,18 @@ public class ProgramDataModel extends DataModelSupport implements Iterable<Cruis return cruises.iterator(); } + public CruiseDataModel getCruise(String id) { + + CruiseDataModel result = null; + for (CruiseDataModel cruise : this) { + + if (id.equals(cruise.getId())) { + result = cruise; + break; + } + } + return result; + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.