git-svn-id: https://osmand.googlecode.com/svn/trunk@581 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-10-20 11:57:08 +00:00
parent e66a58adb0
commit bdf96c0470
2 changed files with 7 additions and 7 deletions

View file

@ -1298,7 +1298,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
} else if(item == 5){ } else if(item == 5){
if(gpxLayer.isVisible()){ if(gpxLayer.isVisible()){
gpxLayer.clearCurrentGPX(); gpxLayer.clearCurrentGPX();
favoritesLayer.getFavorites().setFavoritePointsFromGPXFile(null); getFavoritesHelper().setFavoritePointsFromGPXFile(null);
} else { } else {
dialog.dismiss(); dialog.dismiss();
useGPXFileLayer(false, null); useGPXFileLayer(false, null);
@ -1388,7 +1388,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
pt.setName(p.name); pt.setName(p.name);
pts.add(pt); pts.add(pt);
} }
favoritesLayer.getFavorites().setFavoritePointsFromGPXFile(pts); getFavoritesHelper().setFavoritePointsFromGPXFile(pts);
gpxLayer.setTracks(res.locations); gpxLayer.setTracks(res.locations);
} }
mapView.refreshMap(); mapView.refreshMap();
@ -1403,7 +1403,11 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
builder.show(); builder.show();
} }
} }
public FavouritesDbHelper getFavoritesHelper() {
return ((OsmandApplication)getApplication()).getFavorites();
}
private void useGPXRouting(final LatLon endForRouting, final GPXFileResult res) { private void useGPXRouting(final LatLon endForRouting, final GPXFileResult res) {
Builder builder = new AlertDialog.Builder(this); Builder builder = new AlertDialog.Builder(this);

View file

@ -169,10 +169,6 @@ public class FavoritesLayer implements OsmandMapLayer, ContextMenuLayer.IContext
return null; return null;
} }
public FavouritesDbHelper getFavorites() {
return favorites;
}
@Override @Override
public String getObjectDescription(Object o) { public String getObjectDescription(Object o) {