Revision: 5107
http://sourceforge.net/p/jump-pilot/code/5107
Author: michaudm
Date: 2016-10-26 07:23:08 +0000 (Wed, 26 Oct 2016)
Log Message:
-----------
Generify LayerManager (work in progress)
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
2016-10-26 06:48:55 UTC (rev 5106)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
2016-10-26 07:23:08 UTC (rev 5107)
@@ -64,6 +64,7 @@
* @see Layer
*/
public class LayerManager {
+
private static int layerManagerCount = 0;
private UndoableEditReceiver undoableEditReceiver = new
UndoableEditReceiver();
private CoordinateSystem coordinateSystem = CoordinateSystem.UNSPECIFIED;
@@ -341,8 +342,7 @@
* remove a layer, optionally dispose it and it's features
*/
private void remove(Layerable[] layerables, boolean dispose) {
- for (int i = 0; i < layerables.length; i++) {
- Layerable layerable = layerables[i];
+ for (Layerable layerable : layerables) {
// iterate over cats to find layer
for (Iterator j = categories.iterator(); j.hasNext();) {
Category c = (Category) j.next();
@@ -549,8 +549,8 @@
return layerablesCopy.iterator();
}
- private void moveLayersDrawnLastToEnd(List layerables) {
- ArrayList layersDrawnLast = new ArrayList();
+ private void moveLayersDrawnLastToEnd(List<Layerable> layerables) {
+ ArrayList<Layerable> layersDrawnLast = new ArrayList<>();
for (Iterator i = layerables.iterator(); i.hasNext();) {
Layerable layerable = (Layerable) i.next();
@@ -790,9 +790,7 @@
public Collection<Layer> getEditableLayers() {
ArrayList<Layer> editableLayers = new ArrayList<>();
- for (Iterator i = getLayers().iterator(); i.hasNext();) {
- Layer layer = (Layer) i.next();
-
+ for (Layer layer : getLayers()) {
if (layer.isEditable()) {
editableLayers.add(layer);
}
@@ -805,8 +803,8 @@
return blackboard;
}
- public Collection getLayersWithModifiedFeatureCollections() {
- ArrayList layersWithModifiedFeatureCollections = new ArrayList();
+ public Collection<Layer> getLayersWithModifiedFeatureCollections() {
+ ArrayList<Layer> layersWithModifiedFeatureCollections = new
ArrayList<>();
for (Iterator i = iterator(); i.hasNext();) {
Layer layer = (Layer) i.next();
@@ -838,8 +836,8 @@
return list;
}
- public LinkedList getLayersWithNullDataSource() {
- LinkedList list = new LinkedList();
+ public LinkedList<Layer> getLayersWithNullDataSource() {
+ LinkedList<Layer> list = new LinkedList<>();
for (Iterator i = iterator(); i.hasNext();) {
Layer layer = (Layer) i.next();
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
