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

remove old MapOptions

Browse Source
This commit is contained in:
Hannes Janetzek 2013-05-28 08:15:36 +02:00
parent 7f6fe14f60
commit 8db1b83e54
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/org/oscim/tilesource/MapOptions.java
View File

@ -1,43 +0,0 @@
/*
* Copyright 2012 Hannes Janetzek
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.tilesource;
import java.util.HashMap;
public class MapOptions extends HashMap<String, String> {
private static final long serialVersionUID = 1L;
public final TileSources db;
public MapOptions(TileSources db) {
this.db = db;
}
@Override
public boolean equals(Object other) {
if (!(other instanceof MapOptions))
return false;
if (this.db != ((MapOptions) other).db)
return false;
// FIXME test if this is correct!
if (!this.entrySet().equals(((MapOptions) other).entrySet()))
return false;
return true;
}
}

4
src/org/oscim/tilesource/TileSource.java
View File

@ -46,14 +46,14 @@ public abstract class TileSource {
@Override
public boolean equals(Object other) {
if (!(other instanceof MapOptions))
if (!(other instanceof Options))
return false;
//if (this.db != ((MapOptions) other).db)
// return false;
// FIXME test if this is correct!
if (!this.entrySet().equals(((MapOptions) other).entrySet()))
if (!this.entrySet().equals(((Options) other).entrySet()))
return false;
return true;