From 52a7518db9ae409cbfdcbdae5ef305f96af63613 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 9 Mar 2013 12:18:13 +0100 Subject: [PATCH] cleanups --- .../oscim/database/MapDatabaseFactory.java | 21 +------------------ src/org/oscim/database/MapDatabases.java | 5 ----- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/org/oscim/database/MapDatabaseFactory.java b/src/org/oscim/database/MapDatabaseFactory.java index d8c5b21c..ffa437a0 100644 --- a/src/org/oscim/database/MapDatabaseFactory.java +++ b/src/org/oscim/database/MapDatabaseFactory.java @@ -23,29 +23,11 @@ import android.util.AttributeSet; public final class MapDatabaseFactory { 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) { String mapDatabaseName = attributeSet.getAttributeValue(null, MAP_DATABASE_ATTRIBUTE_NAME); if (mapDatabaseName == null) { - return MapDatabases.PBMAP_READER; + return MapDatabases.OSCIMAP_READER; } return MapDatabases.valueOf(mapDatabaseName); @@ -68,7 +50,6 @@ public final class MapDatabaseFactory { return new org.oscim.database.pbmap.MapDatabase(); case OSCIMAP_READER: return new org.oscim.database.oscimap.MapDatabase(); - } throw new IllegalArgumentException("unknown enum value: " + mapDatabase); diff --git a/src/org/oscim/database/MapDatabases.java b/src/org/oscim/database/MapDatabases.java index ea354628..7e0861a7 100644 --- a/src/org/oscim/database/MapDatabases.java +++ b/src/org/oscim/database/MapDatabases.java @@ -41,9 +41,4 @@ public enum MapDatabases { * ... */ OSCIMAP_READER, - - /** - * ... - */ - OSCIMAP_READER_TEST, }