Revision 1055 org.gvsig.geoprocess/branches/refactor-2018/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/core/DefaultInputFactory.java
| DefaultInputFactory.java | ||
|---|---|---|
| 38 | 38 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 39 | 39 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| 40 | 40 |
import org.gvsig.fmap.mapcontext.layers.FLayers; |
| 41 |
import org.gvsig.fmap.mapcontext.layers.LayersIterator; |
|
| 42 | 41 |
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect; |
| 43 | 42 |
import org.gvsig.geoprocess.lib.sextante.dataObjects.FLyrRasterIRasterLayer; |
| 44 | 43 |
import org.gvsig.geoprocess.lib.sextante.dataObjects.FileTools; |
| 45 | 44 |
import org.gvsig.geoprocess.lib.sextante.dataObjects.FlyrVectIVectorLayer; |
| 46 | 45 |
import org.gvsig.geoprocess.lib.sextante.dataObjects.TableDocumentITable; |
| 47 |
import org.gvsig.raster.fmap.layers.FLyrRaster; |
|
| 48 | 46 |
|
| 49 | 47 |
import es.unex.sextante.core.AbstractInputFactory; |
| 50 | 48 |
import es.unex.sextante.core.NamedExtent; |
| 51 | 49 |
import es.unex.sextante.core.Sextante; |
| 52 | 50 |
import es.unex.sextante.dataObjects.I3DRasterLayer; |
| 53 | 51 |
import es.unex.sextante.dataObjects.IDataObject; |
| 52 |
import java.util.Iterator; |
|
| 53 |
import org.gvsig.fmap.mapcontext.raster.api.RasterLayer; |
|
| 54 | 54 |
|
| 55 | 55 |
public class DefaultInputFactory extends AbstractInputFactory {
|
| 56 | 56 |
|
| ... | ... | |
| 67 | 67 |
try {
|
| 68 | 68 |
final DefaultViewDocument view = (DefaultViewDocument) views.get(i); |
| 69 | 69 |
final FLayers layers = view.getMapContext().getLayers(); |
| 70 |
final LayersIterator iter = new LayersIterator(layers);
|
|
| 70 |
Iterator<FLayer> iter = layers.iterator();
|
|
| 71 | 71 |
while (iter.hasNext()) {
|
| 72 | 72 |
try {
|
| 73 |
final FLayer layer = iter.nextLayer();
|
|
| 74 |
if (layer instanceof FLyrRaster) {
|
|
| 73 |
final FLayer layer = iter.next(); |
|
| 74 |
if (layer instanceof RasterLayer) {
|
|
| 75 | 75 |
final FLyrRasterIRasterLayer rasterLayer = |
| 76 | 76 |
new FLyrRasterIRasterLayer(); |
| 77 |
rasterLayer.create((FLyrRaster) layer);
|
|
| 77 |
rasterLayer.create((RasterLayer) layer);
|
|
| 78 | 78 |
list.add(rasterLayer); |
| 79 | 79 |
} else if (layer instanceof FLyrVect) {
|
| 80 | 80 |
final FlyrVectIVectorLayer vectorLayer = new FlyrVectIVectorLayer(); |
| ... | ... | |
| 163 | 163 |
if (object == null) {
|
| 164 | 164 |
return null; |
| 165 | 165 |
} else |
| 166 |
if (object instanceof FLyrRaster) {
|
|
| 166 |
if (object instanceof RasterLayer) {
|
|
| 167 | 167 |
final FLyrRasterIRasterLayer layer = new FLyrRasterIRasterLayer(); |
| 168 |
layer.create((FLyrRaster) object);
|
|
| 168 |
layer.create((RasterLayer) object);
|
|
| 169 | 169 |
return layer; |
| 170 | 170 |
} else |
| 171 | 171 |
if (object instanceof FLyrVect) {
|
| ... | ... | |
| 206 | 206 |
for (int i = 0; i < views.size(); i++) {
|
| 207 | 207 |
final DefaultViewDocument view = (DefaultViewDocument) views.get(i); |
| 208 | 208 |
final FLayers layers = view.getMapContext().getLayers(); |
| 209 |
final LayersIterator iter = new LayersIterator(layers);
|
|
| 209 |
final Iterator<FLayer> iter = layers.iterator();
|
|
| 210 | 210 |
while (iter.hasNext()) {
|
| 211 |
final FLayer layer = iter.nextLayer();
|
|
| 211 |
final FLayer layer = iter.next(); |
|
| 212 | 212 |
if (layer.equals(baseLayer)) {
|
| 213 | 213 |
layers.removeLayer(baseLayer); |
| 214 | 214 |
return; |
Also available in: Unified diff