+ qques fixes

This commit is contained in:
nicobo 2012-11-10 14:23:13 +01:00
parent 2e1ad141d1
commit f88ebde1f3
22 changed files with 29 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
bin/classes/Musees.json Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
bin/classes/Plages.json Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View file

@ -3,7 +3,7 @@ package bma.groomservice.data;
import android.os.Parcel;
import android.os.Parcelable;
public class Poi implements Parcelable {
public class Poi implements Parcelable, Comparable<Poi> {
/** Ex: "65c6fb5e-aa10-4711-8002-74d1ec31f9d6" */
public String entityid;
@ -42,6 +42,11 @@ public class Poi implements Parcelable {
super();
}
@Override
public int compareTo(Poi another) {
return entityid.compareTo(another.entityid);
}
public Poi(Parcel p) {
this();
entityid = p.readString();

View file

@ -67,11 +67,11 @@ public class DataprovenceManager implements PoiListener {
// false -> lit les données en local (fichiers *.json)
// true -> lit les données depuis le net
public static final boolean online = false;
public boolean online = false;
private class LoadDataTask extends
AsyncTask<DataprovenceHelper, Integer, Long> {
List<Poi> taskPois;
List<Poi> taskPois = new ArrayList<Poi>();
PoiListener listener;
public LoadDataTask(PoiListener listener) {
@ -99,13 +99,14 @@ public class DataprovenceManager implements PoiListener {
}
}
public DataprovenceManager(PoiListener listener) {
public DataprovenceManager(PoiListener listener, boolean online) {
super();
this.listener = listener;
this.online = online;
this.pois = new TreeSet<Poi>();
}
private static Collection<DataprovenceHelper> findHelpers(
Collection<String> tags) {
private Collection<DataprovenceHelper> findHelpers(Collection<String> tags) {
ArrayList<DataprovenceHelper> helpers = new ArrayList<DataprovenceHelper>();
for (String tag : tags) {
String[] datasets = DATASETS.get(tag);
@ -134,7 +135,7 @@ public class DataprovenceManager implements PoiListener {
}
}
public void findAll(Collection<String> tags) throws IOException {
public void findAll(Collection<String> tags) {
synchronized (this) {
count = 0;
@ -153,7 +154,7 @@ public class DataprovenceManager implements PoiListener {
}
}
public void findAll(String[] tags) throws IOException {
public void findAll(String[] tags) {
findAll(Arrays.asList(tags));
}