Revision: 5860
http://sourceforge.net/p/jump-pilot/code/5860
Author: michaudm
Date: 2018-06-08 06:25:57 +0000 (Fri, 08 Jun 2018)
Log Message:
-----------
Simplify loops
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
2018-06-08 06:00:39 UTC (rev 5859)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
2018-06-08 06:25:57 UTC (rev 5860)
@@ -541,16 +541,13 @@
for (Iterator<T> i = layerables.iterator(); i.hasNext();) {
T layerable = i.next();
- if (!(layerable instanceof Layer)) {
- continue;
+ if (layerable instanceof Layer) {
+ Layer layer = (Layer) layerable;
+ if (layer.isDrawingLast()) {
+ layersDrawnLast.add((T) layer);
+ i.remove();
+ }
}
-
- Layer layer = (Layer) layerable;
-
- if (layer.isDrawingLast()) {
- layersDrawnLast.add((T)layer);
- i.remove();
- }
}
layerables.addAll(layersDrawnLast);
@@ -690,10 +687,9 @@
for (Category category : categories) {
for (Layerable layerable : new
ArrayList<>(category.getLayerables())) {
- if (!(layerableClass.isInstance(layerable))) {
- continue;
+ if (layerableClass.isInstance(layerable)) {
+ layers.add((T) layerable);
}
- layers.add((T)layerable);
}
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
