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

Add missing @Override annotations (#617)

Browse Source
This commit is contained in:
Gustl22
2018-12-12 00:49:00 +01:00
committed by Emux
parent a62d77583b
commit d806d6bcca
52 changed files with 514 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vtm/src/org/oscim/layers/tile/MapTile.java
View File

@@ -155,6 +155,7 @@ public class MapTile extends Tile {
protected abstract void dispose();
@Override
public TileData next() {
return (TileData) next;
}

1
vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java
View File

@@ -62,6 +62,7 @@ public class OsmTileLayer extends VectorTileLayer {
new TagReplacement(Tag.KEY_MIN_HEIGHT)
};
@Override
protected TagSet filterTags(TagSet tagSet) {
Tag[] tags = tagSet.getTags();

1
vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
View File

@@ -97,6 +97,7 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
mLabelPlacer.cleanup();
}
@Override
public synchronized boolean isRunning() {
return mRunning;
}

1
vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java
View File

@@ -659,6 +659,7 @@ public class ExtrusionBucket extends RenderBucket {
}
}
@Override
public ExtrusionBucket next() {
return (ExtrusionBucket) next;
}

1
vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
View File

@@ -101,6 +101,7 @@ public final class LineTexBucket extends LineBucket {
this.evenSegment = true;
}
@Override
public void addLine(GeometryBuffer geom) {
addLine(geom.points, geom.index, -1, false);
}

1
vtm/src/org/oscim/renderer/bucket/MeshBucket.java
View File

@@ -91,6 +91,7 @@ public class MeshBucket extends RenderBucket {
//tess.addContour2D(geom.index, geom.points);
}
@Override
protected void prepare() {
if (tess == null)
return;

1
vtm/src/org/oscim/renderer/bucket/TextureBucket.java
View File

@@ -76,6 +76,7 @@ public class TextureBucket extends RenderBucket {
compileVertexItems(vboData);
}
@Override
protected void clear() {
while (textures != null)
textures = textures.dispose();

1
vtm/src/org/oscim/renderer/bucket/TextureItem.java
View File

@@ -194,6 +194,7 @@ public class TextureItem extends Inlist<TextureItem> {
/**
* Retrieve a TextureItem from pool.
*/
@Override
public synchronized TextureItem get() {
TextureItem t = super.get();

1
vtm/src/org/oscim/theme/ThemeUtils.java
View File

@@ -39,6 +39,7 @@ public final class ThemeUtils {
final AtomicBoolean isMapsforgeTheme = new AtomicBoolean(false);
try {
new XMLReaderAdapter().parse(new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
if (localName.equals("rendertheme")) {
isMapsforgeTheme.set(uri.equals("http://mapsforge.org/renderTheme"));

1
vtm/src/org/oscim/theme/styles/AreaStyle.java
View File

@@ -289,6 +289,7 @@ public class AreaStyle extends RenderStyle<AreaStyle> {
return self();
}
@Override
public AreaStyle build() {
return new AreaStyle(this);
}

1
vtm/src/org/oscim/theme/styles/CircleStyle.java
View File

@@ -106,6 +106,7 @@ public final class CircleStyle extends RenderStyle<CircleStyle> {
return self();
}
@Override
public CircleStyle build() {
return new CircleStyle(this);
}

1
vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
View File

@@ -176,6 +176,7 @@ public class ExtrusionStyle extends RenderStyle<ExtrusionStyle> {
return self();
}
@Override
public ExtrusionStyle build() {
return new ExtrusionStyle(this);
}

1
vtm/src/org/oscim/theme/styles/LineStyle.java
View File

@@ -334,6 +334,7 @@ public final class LineStyle extends RenderStyle<LineStyle> {
return self();
}
@Override
public LineStyle build() {
return new LineStyle(this);
}

1
vtm/src/org/oscim/theme/styles/SymbolStyle.java
View File

@@ -206,6 +206,7 @@ public final class SymbolStyle extends RenderStyle<SymbolStyle> {
return self();
}
@Override
public SymbolStyle build() {
return new SymbolStyle(this);
}

1
vtm/src/org/oscim/theme/styles/TextStyle.java
View File

@@ -74,6 +74,7 @@ public final class TextStyle extends RenderStyle<TextStyle> {
reset();
}
@Override
public TextStyle build() {
TextStyle t = new TextStyle(this);
t.fontHeight = t.paint.getFontHeight();

1
vtm/src/org/oscim/tiling/source/LwHttp.java
View File

@@ -255,6 +255,7 @@ public class LwHttp implements HttpEngine {
throw new IOException("No Socket");
}
@Override
public synchronized InputStream read() throws IOException {
checkSocket();

1
vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
View File

@@ -41,6 +41,7 @@ public class BitmapTileSource extends UrlTileSource {
super(null, "/{Z}/{X}/{Y}.png");
}
@Override
public BitmapTileSource build() {
return new BitmapTileSource(this);
}

1
vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
View File

@@ -34,6 +34,7 @@ public class OSciMap4TileSource extends UrlTileSource {
overZoom(17);
}
@Override
public OSciMap4TileSource build() {
return new OSciMap4TileSource(this);
}

6
vtm/src/org/oscim/utils/BitmapPacker.java
View File

@@ -129,9 +129,11 @@ public class BitmapPacker {
public static class GuillotineStrategy implements PackStrategy {
Comparator<Bitmap> comparator;
@Override
public void sort(ArrayList<Bitmap> Bitmaps) {
if (comparator == null) {
comparator = new Comparator<Bitmap>() {
@Override
public int compare(Bitmap o1, Bitmap o2) {
return Math.max(o1.getWidth(), o1.getHeight()) - Math.max(o2.getWidth(), o2.getHeight());
}
@@ -140,6 +142,7 @@ public class BitmapPacker {
Collections.sort(Bitmaps, comparator);
}
@Override
public PackerAtlasItem pack(BitmapPacker packer, Object key, Rect rect) {
GuillotineAtlasItem atlasItem;
if (packer.packerAtlasItems.size() == 0) {
@@ -236,9 +239,11 @@ public class BitmapPacker {
public static class SkylineStrategy implements PackStrategy {
Comparator<Bitmap> comparator;
@Override
public void sort(ArrayList<Bitmap> images) {
if (comparator == null) {
comparator = new Comparator<Bitmap>() {
@Override
public int compare(Bitmap o1, Bitmap o2) {
return o1.getHeight() - o2.getHeight();
}
@@ -247,6 +252,7 @@ public class BitmapPacker {
Collections.sort(images, comparator);
}
@Override
public PackerAtlasItem pack(BitmapPacker packer, Object key, Rect rect) {
int padding = packer.padding;
int atlasWidth = packer.atlasWidth - padding * 2, atlasHeight = packer.atlasHeight - padding * 2;

8
vtm/src/org/oscim/utils/RTree.java
View File

@@ -290,6 +290,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
releaseRect(r);
}
@Override
public void insert(Box box, T item) {
Rect r = getRect();
r.set(box);
@@ -312,6 +313,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return removed;
}
@Override
public boolean remove(Box box, T item) {
Rect r = getRect();
r.set(box);
@@ -342,6 +344,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return true;
}
@Override
public boolean search(Box bbox, SearchCb<T> cb, Object context) {
Rect r = getRect();
r.set(bbox);
@@ -352,6 +355,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return true;
}
@Override
public List<T> search(Box bbox, List<T> results) {
if (results == null)
results = new ArrayList<T>(16);
@@ -370,6 +374,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
* Count the data elements in this container. This is slow as no internal
* counter is maintained.
*/
@Override
public int size() {
int[] count = {0};
countRec(mRoot, count);
@@ -393,6 +398,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
/**
* Remove all entries from tree.
*/
@Override
public void clear() {
/* Delete all existing nodes */
reset();
@@ -913,6 +919,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return new Stack();
}
@Override
protected boolean clearItem(Stack item) {
if (item.tos != 0) {
item.tos = 0;
@@ -1007,6 +1014,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
/* Find the next data element */
@SuppressWarnings("unchecked")
@Override
public T next() {
assert (isNotNull());
StackElement curTos = stack[tos - 1];

1
vtm/src/org/oscim/utils/async/AsyncTask.java
View File

@@ -48,6 +48,7 @@ public abstract class AsyncTask extends Task {
*
* @return Task.DONE on success, Task.ERROR otherwise
*/
@Override
public abstract int go(boolean canceled);
/**

2
vtm/src/org/oscim/utils/quadtree/BoxTree.java
View File

@@ -186,6 +186,7 @@ public class BoxTree<T extends BoxItem<E>, E> extends TileIndex<BoxNode<T>, T> {
return new Stack<BoxNode<T>>();
}
@Override
protected boolean clearItem(Stack<BoxNode<T>> item) {
if (item.tos != 0) {
item.tos = 0;
@@ -678,6 +679,7 @@ public class BoxTree<T extends BoxItem<E>, E> extends TileIndex<BoxNode<T>, T> {
root.refs = 0;
}
@Override
public int size() {
return root.refs;
}