Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 657 → Rev 658

/trunk/src/org/tela_botanica/del/client/modeles/Observation.java
4,6 → 4,8
import java.util.ArrayList;
import java.util.List;
 
import org.tela_botanica.del.client.cache.CacheClient;
 
public class Observation implements Serializable {
 
private static final long serialVersionUID = 840032625524143547L;
10,7 → 12,10
private String id, auteur, nomRetenu, famille, localite, idLocalite, dateTransmission, numNomenclatural, nomCommun, lieuDit, milieu, commentaire, dateReleve;
 
private List<String> motsClefs = new ArrayList<String>();
private List<PropositionDetermination> propositionsDetermination = new ArrayList<PropositionDetermination>();
 
// les propositions sont une liste ordonnée qui contient soit des
// proposition de determinations, soit des commentaires
private List<InterventionForum> propositions = new ArrayList<InterventionForum>();
private List<Image> images = new ArrayList<Image>();
 
public String getAuteur() {
32,35 → 37,35
public String getNomCommun() {
return nomCommun;
}
 
public void setNomCommun(String nomCommun) {
this.nomCommun = nomCommun;
}
 
public String getLieuDit() {
return this.lieuDit;
}
 
public void setLieuDit(String lieuDit) {
this.lieuDit = lieuDit;
}
 
public String getMilieu() {
return milieu;
}
 
public void setMilieu(String milieu) {
this.milieu = milieu;
}
 
public String getCommentaire() {
return commentaire;
}
 
public void setCommentaire(String commentaire) {
this.commentaire = commentaire;
}
 
public String getFamille() {
return famille;
}
76,17 → 81,17
public void setIdLocalite(String idlocalite) {
this.idLocalite = idlocalite;
}
 
public String getLocalite() {
return localite;
}
 
public String getLocaliteAvecIdFormatee() {
String localiteFormatee = this.localite;
if(idLocalite != null && idLocalite.length() >= 2) {
localiteFormatee += " ("+idLocalite.substring(0, 2)+")";
if (idLocalite != null && idLocalite.length() >= 2) {
localiteFormatee += " (" + idLocalite.substring(0, 2) + ")";
}
 
return localiteFormatee;
}
 
97,7 → 102,7
public String getDateTransmission() {
return dateTransmission;
}
 
public void setDateTransmission(String date) {
this.dateTransmission = date;
}
105,11 → 110,11
public String getDateReleve() {
return dateReleve;
}
 
public void setDateReleve(String dateReleve) {
this.dateReleve = dateReleve;
}
 
public String getNumNomenclatural() {
return numNomenclatural;
}
118,12 → 123,12
this.numNomenclatural = numNomenclatural;
}
 
public List<PropositionDetermination> getPropositionsDetermination() {
return propositionsDetermination;
public List<InterventionForum> getInterventionsForum() {
return propositions;
}
 
public void setImageCelValidationDatas(List<PropositionDetermination> propositionsDetermination) {
this.propositionsDetermination = propositionsDetermination;
public void setInterventionsForum(List<InterventionForum> propositions) {
this.propositions = propositions;
}
 
public List<String> getMotsClefs() {
133,7 → 138,7
public void setMotsClefs(List<String> motsClefs) {
this.motsClefs = motsClefs;
}
 
public void ajouterMotsClef(String motsClefs) {
if (this.motsClefs == null) {
this.motsClefs = new ArrayList<String>();
142,16 → 147,18
}
 
public void ajouterPropositionDetermination(PropositionDetermination observationValidation) {
propositionsDetermination.add(observationValidation);
propositions.add(observationValidation);
}
 
public ArrayList<String> getPropositionsTaxonsData() {
 
ArrayList<String> propositionsTaxonDatas = new ArrayList<String>();
for (PropositionDetermination observationValidation : propositionsDetermination) {
String espece = observationValidation.getEspece();
if (espece != "" && !propositionsTaxonDatas.contains(espece)) {
propositionsTaxonDatas.add(observationValidation.getEspece());
for (InterventionForum proposition : propositions) {
if (proposition instanceof PropositionDetermination) {
String espece = ((PropositionDetermination) proposition).getEspece();
if (espece != "" && !propositionsTaxonDatas.contains(espece)) {
propositionsTaxonDatas.add(espece);
}
}
}
 
158,6 → 165,16
return propositionsTaxonDatas;
}
 
public List<PropositionDetermination> getPropositionDeterminations() {
List<PropositionDetermination> determinations = new ArrayList<PropositionDetermination>();
for (InterventionForum proposition : CacheClient.getInstance().getObservationCourante().getInterventionsForum()) {
if (proposition instanceof PropositionDetermination) {
determinations.add((PropositionDetermination) proposition);
}
}
return determinations;
}
 
public List<Image> getImages() {
return images;
}