xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-09 12:18:13 +01:00
parent 0e96747939
commit 52a7518db9
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/oscim/database/MapDatabaseFactory.java
View File

@ -23,29 +23,11 @@ import android.util.AttributeSet;
public final class MapDatabaseFactory { public final class MapDatabaseFactory {
private static final String MAP_DATABASE_ATTRIBUTE_NAME = "mapDatabase"; private static final String MAP_DATABASE_ATTRIBUTE_NAME = "mapDatabase";
/**
* @param attributeSet
* A collection of attributes which includes the desired
* MapDatabase.
* @return a new MapDatabase instance.
*/
public static IMapDatabase createMapDatabase(AttributeSet attributeSet) {
String mapDatabaseName = attributeSet.getAttributeValue(null,
MAP_DATABASE_ATTRIBUTE_NAME);
if (mapDatabaseName == null) {
return new org.oscim.database.postgis.MapDatabase();
}
MapDatabases mapDatabaseInternal = MapDatabases.valueOf(mapDatabaseName);
return MapDatabaseFactory.createMapDatabase(mapDatabaseInternal);
}
public static MapDatabases getMapDatabase(AttributeSet attributeSet) { public static MapDatabases getMapDatabase(AttributeSet attributeSet) {
String mapDatabaseName = attributeSet.getAttributeValue(null, String mapDatabaseName = attributeSet.getAttributeValue(null,
MAP_DATABASE_ATTRIBUTE_NAME); MAP_DATABASE_ATTRIBUTE_NAME);
if (mapDatabaseName == null) { if (mapDatabaseName == null) {
return MapDatabases.PBMAP_READER; return MapDatabases.OSCIMAP_READER;
} }
return MapDatabases.valueOf(mapDatabaseName); return MapDatabases.valueOf(mapDatabaseName);
@ -68,7 +50,6 @@ public final class MapDatabaseFactory {
return new org.oscim.database.pbmap.MapDatabase(); return new org.oscim.database.pbmap.MapDatabase();
case OSCIMAP_READER: case OSCIMAP_READER:
return new org.oscim.database.oscimap.MapDatabase(); return new org.oscim.database.oscimap.MapDatabase();
} }
throw new IllegalArgumentException("unknown enum value: " + mapDatabase); throw new IllegalArgumentException("unknown enum value: " + mapDatabase);

5
src/org/oscim/database/MapDatabases.java
View File

@ -41,9 +41,4 @@ public enum MapDatabases {
* ... * ...
*/ */
OSCIMAP_READER, OSCIMAP_READER,
/**
* ...
*/
OSCIMAP_READER_TEST,
} }