12,6 → 12,7 |
import org.tela_botanica.del.client.modeles.Image; |
import org.tela_botanica.del.client.modeles.InformationsRecherche; |
import org.tela_botanica.del.client.modeles.Observation; |
import org.tela_botanica.del.client.modeles.ObservationServiceResultat; |
import org.tela_botanica.del.client.modeles.PropositionDetermination; |
import org.tela_botanica.del.client.modeles.Protocole; |
import org.tela_botanica.del.client.modeles.VoteDetermination; |
23,7 → 24,6 |
import org.tela_botanica.del.client.services.rest.VoteProtocoleService; |
import org.tela_botanica.del.client.services.rest.async.ImagesParTaxonCallback; |
|
|
public class MockDatasource implements ObservationService, ImageService, ProtocoleService, VoteProtocoleService, PropositionDeterminationService { |
|
static MockDatasource instance; |
186,7 → 186,7 |
for (int j = 0; j < nbImagesAssociees; j++) { |
numobs++; |
image = new Image(); |
image.setIdImage("id image " + i); |
image.setIdImage("id image " + i + j); |
image.setUrlFormat("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "%s%.jpg"); |
image.setUrl("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "CRS.jpg"); |
image.setMiniature("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "XS.jpg"); |
241,29 → 241,25 |
* (java.util.HashMap) |
*/ |
@Override |
public List<Observation> getObservations(InformationsRecherche informationsRecherche) { |
if (informationsRecherche == null) { |
return getObservations(); |
} else { |
int nbResultats = (int) Math.round(Math.random() * 20); |
List<Observation> resultatRecherche = new ArrayList<Observation>(); |
for (int i = 0; i < nbResultats; i++) { |
int numeroResultat = (int) Math.round(Math.random() * (observations.size() - 1)); |
resultatRecherche.add(observations.get(numeroResultat)); |
} |
return resultatRecherche; |
} |
} |
public ObservationServiceResultat getObservations(InformationsRecherche informationsRecherche, int debut, int fin) { |
|
/* |
* (non-Javadoc) |
* |
* @see |
* org.tela_botanica.del.client.utils.ObservationService#getObservations() |
*/ |
@Override |
public List<Observation> getObservations() { |
return observations; |
ObservationServiceResultat resultat = new ObservationServiceResultat(); |
resultat.setNbTotalObservationsPourLaRecherche(observations.size()); |
resultat.setObservations(getObservations(debut, fin)); |
return resultat; |
|
// if (informationsRecherche == null) { |
// return getObservations(debut, fin); |
// } else { |
// int nbResultats = fin - debut; |
// List<Observation> resultatRecherche = new ArrayList<Observation>(); |
// for (int i = 0; i < nbResultats; i++) { |
// int numeroResultat = (int) Math.round(Math.random() * |
// (observations.size() - 1)); |
// resultatRecherche.add(observations.get(numeroResultat)); |
// } |
// return resultatRecherche; |
// } |
} |
|
/* |
274,15 → 270,27 |
public List<Image> getImages(int debut, int fin) { |
List<Image> sousListe = new ArrayList<Image>(); |
for (int i = debut; i < fin; i++) { |
if (images.get(i) != null ) { |
if (images.get(i) != null) { |
sousListe.add(images.get(i)); |
} else { |
break; |
} |
} |
return images; |
return sousListe; |
} |
|
public List<Observation> getObservations(int debut, int fin) { |
List<Observation> sousListe = new ArrayList<Observation>(); |
for (int i = debut; i < fin; i++) { |
if (observations.get(i) != null) { |
sousListe.add(observations.get(i)); |
} else { |
break; |
} |
} |
return sousListe; |
} |
|
/* |
* (non-Javadoc) |
* |
384,16 → 392,15 |
} |
|
@Override |
public void getImagesEfloreParTaxon(String nomTaxon, |
ImagesParTaxonCallback callback) { |
public void getImagesEfloreParTaxon(String nomTaxon, ImagesParTaxonCallback callback) { |
// TODO Auto-generated method stub |
|
} |
|
@Override |
public void getImagesParTaxon(InformationsRecherche informationsRecherche, |
int debut, int fin, ImagesParTaxonCallback callback) { |
public void getImagesParTaxon(InformationsRecherche informationsRecherche, int debut, int fin, ImagesParTaxonCallback callback) { |
// TODO Auto-generated method stub |
|
} |
|
} |