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

Layers: API improvements

Browse Source
This commit is contained in:
Emux 2023-04-11 10:32:47 +03:00
parent 25d28ad9e2
commit 0471682f13
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vtm/src/org/oscim/map/Layers.java
View File

@ -69,6 +69,10 @@ public final class Layers extends AbstractList<Layer> {
return mLayerList.get(index); return mLayerList.get(index);
} }
public synchronized List<Integer> getGroups() {
return mGroupList;
}
@Override @Override
public synchronized int size() { public synchronized int size() {
return mLayerList.size(); return mLayerList.size();
@ -76,8 +80,10 @@ public final class Layers extends AbstractList<Layer> {
@Override @Override
public synchronized void add(int index, Layer layer) { public synchronized void add(int index, Layer layer) {
if (mLayerList.contains(layer)) if (mLayerList.contains(layer)) {
throw new IllegalArgumentException("layer added twice"); log.warn("layer already exists");
return;
}
// bind added layer // bind added layer
if (layer instanceof UpdateListener) if (layer instanceof UpdateListener)
@ -110,11 +116,15 @@ public final class Layers extends AbstractList<Layer> {
* Add using layer groups. * Add using layer groups.
*/ */
public synchronized void add(Layer layer, int group) { public synchronized void add(Layer layer, int group) {
if (mLayerList.contains(layer)) {
log.warn("layer already exists");
return;
}
int index = mGroupList.indexOf(group); int index = mGroupList.indexOf(group);
if (index < 0) if (index < 0) {
throw new IllegalArgumentException("unknown layer group"); log.warn("unknown / adding layer group" + group);
if (mLayerList.contains(layer)) addGroup(group);
throw new IllegalArgumentException("layer added twice"); }
index++; index++;
if (index == mGroupList.size()) if (index == mGroupList.size())
@ -169,8 +179,10 @@ public final class Layers extends AbstractList<Layer> {
@Override @Override
public synchronized Layer set(int index, Layer layer) { public synchronized Layer set(int index, Layer layer) {
if (mLayerList.contains(layer)) if (mLayerList.contains(layer)) {
throw new IllegalArgumentException("layer added twice"); log.warn("layer already exists");
return layer;
}
mDirtyLayers = true; mDirtyLayers = true;
Layer remove = mLayerList.set(index, layer); Layer remove = mLayerList.set(index, layer);
@ -202,8 +214,10 @@ public final class Layers extends AbstractList<Layer> {
} }
public synchronized void addGroup(int group) { public synchronized void addGroup(int group) {
if (mGroupList.contains(group)) if (mGroupList.contains(group)) {
throw new IllegalArgumentException("group added twice"); log.warn("group " + group + " already exists");
return;
}
mGroupList.add(group); mGroupList.add(group);
mGroupIndex.put(group, mLayerList.size()); mGroupIndex.put(group, mLayerList.size());