Revision 7577

View differences:

branches/v10/extensions/extGeoProcessing/src/com/iver/cit/gvsig/geoprocess/impl/merge/gui/GeoProcessingMergePanel.java
575 575
		IndexedShpDriver shpDriver = null;
576 576
		DXFMemoryDriver dxfDriver = null;
577 577
		VectorialFileDriver driver = null;
578
		try {
578
		
579 579
			for(int i = 0; i < inputLayersToAdd.length; i++){
580 580
				String fileName = inputLayersToAdd[i];
581 581
				String fullPath = file.getAbsolutePath() + "/" + fileName;
582 582
				File afile = new File(fullPath);
583
				if(fileName.endsWith("dxf") || fileName.endsWith("DXF")){
584
					dxfDriver = new DXFMemoryDriver();
585
					dxfDriver.open(afile);
586
					dxfDriver.initialize();
587
					driver = dxfDriver;
588
				}else if (fileName.endsWith("shp") || fileName.endsWith("SHP")){
589
					shpDriver = new IndexedShpDriver();
590
					shpDriver.open(afile);
591
					shpDriver.initialize();
592
					driver = shpDriver;
593
				}else if (fileName.endsWith("dgn") || fileName.endsWith("DGN")){
594
					dgnDriver = new DgnMemoryDriver();
595
					dgnDriver.open(afile);
596
					dgnDriver.initialize();
597
					driver = dxfDriver;
583
				try {
584
					if(fileName.endsWith("dxf") || fileName.endsWith("DXF")){
585
						dxfDriver = new DXFMemoryDriver();
586
						dxfDriver.open(afile);
587
						dxfDriver.initialize();
588
						driver = dxfDriver;
589
					}else if (fileName.endsWith("shp") || fileName.endsWith("SHP")){
590
						shpDriver = new IndexedShpDriver();
591
						shpDriver.open(afile);
592
						shpDriver.initialize();
593
						driver = shpDriver;
594
					}else if (fileName.endsWith("dgn") || fileName.endsWith("DGN")){
595
						dgnDriver = new DgnMemoryDriver();
596
						dgnDriver.open(afile);
597
						dgnDriver.initialize();
598
						driver = dxfDriver;
599
					}
600
					solution[i] = (FLyrVect) LayerFactory.createLayer(fileName,
601
													driver,
602
													afile,
603
													projection);
604
					//TODO Mostrar al usuario errores mas descriptivos
605
				} catch (IOException e) {
606
					// TODO Auto-generated catch block
607
					e.printStackTrace();
608
				} catch (DriverException e) {
609
					// TODO Auto-generated catch block
610
					e.printStackTrace();
598 611
				}
599
				solution[i] = (FLyrVect) LayerFactory.createLayer(fileName,
600
												driver,
601
												afile,
602
												projection);
603 612
				
604 613
			}
605
		} catch (IOException e) {
606
			// TODO Auto-generated catch block
607
			e.printStackTrace();
608
		} catch (DriverException e) {
609
			// TODO Auto-generated catch block
610
			e.printStackTrace();
611
		}
614
		
612 615
		return solution;
613 616
	}
614 617

  
branches/v10/extensions/extGeoProcessing/src/com/iver/cit/gvsig/geoprocess/impl/merge/gui/GeoProcessingMergePanel2.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.1  2006-08-11 16:30:38  azabala
48
 * Revision 1.1.2.1  2006-09-25 17:57:31  azabala
49
 * when "merge layers in directory" finds a corrupt data file, it ignores it and continues looking for cartographic data files.
50
 *
51
 * Revision 1.1  2006/08/11 16:30:38  azabala
49 52
 * *** empty log message ***
50 53
 *
51 54
 *
......
315 318
		IndexedShpDriver shpDriver = null;
316 319
		DXFMemoryDriver dxfDriver = null;
317 320
		VectorialFileDriver driver = null;
318
		try {
321
		
319 322
			for (int i = 0; i < inputLayersToAdd.length; i++) {
320 323
				String fileName = inputLayersToAdd[i];
321 324
				String fullPath = file.getAbsolutePath() + "/" + fileName;
322 325
				File afile = new File(fullPath);
323 326
				
324
				if (fileName.endsWith("dxf") || fileName.endsWith("DXF")) {
325
					dxfDriver = new DXFMemoryDriver();
326
					dxfDriver.open(afile);
327
					dxfDriver.initialize();
328
					driver = dxfDriver;
329
				} else if (fileName.endsWith("shp") || fileName.endsWith("SHP")) {
330
					shpDriver = new IndexedShpDriver();
331
					shpDriver.open(afile);
332
					shpDriver.initialize();
333
					driver = shpDriver;
334
				} else if (fileName.endsWith("dgn") || fileName.endsWith("DGN")) {
335
					dgnDriver = new DgnMemoryDriver();
336
					dgnDriver.open(afile);
337
					dgnDriver.initialize();
338
					driver = dxfDriver;
327
				try {
328
					if (fileName.endsWith("dxf") || fileName.endsWith("DXF")) {
329
						dxfDriver = new DXFMemoryDriver();
330
						dxfDriver.open(afile);
331
						dxfDriver.initialize();
332
						driver = dxfDriver;
333
					} else if (fileName.endsWith("shp") || fileName.endsWith("SHP")) {
334
						shpDriver = new IndexedShpDriver();
335
						shpDriver.open(afile);
336
						shpDriver.initialize();
337
						driver = shpDriver;
338
					} else if (fileName.endsWith("dgn") || fileName.endsWith("DGN")) {
339
						dgnDriver = new DgnMemoryDriver();
340
						dgnDriver.open(afile);
341
						dgnDriver.initialize();
342
						driver = dxfDriver;
343
					}
344
					newLyrList.add((FLyrVect) LayerFactory.
345
							createLayer(fileName,
346
										driver, 
347
										afile, 
348
										projection));
349
				
350
				} catch(Exception e){
351
					//TODO Estos errores habr?a que notificarlos al usuario
352
					//de forma amigable.
353
					//we catch any possible (and not declared) exception, because we dont know
354
					//the correctness of file layers (for example, shp without dbf, etc)
355
					e.printStackTrace();
339 356
				}
340
				newLyrList.add((FLyrVect) LayerFactory.
341
						createLayer(fileName,
342
									driver, 
343
									afile, 
344
									projection));
345 357

  
346 358
			}
347
		} catch(Exception e){
348
			//we catch any possible (and not declared) exception, because we dont know
349
			//the correctness of file layers (for example, shp without dbf, etc)
350
			e.printStackTrace();
351
		}
359
		
352 360
		solution = new FLyrVect[newLyrList.size()];
353 361
		newLyrList.toArray(solution);
354 362
		return solution;

Also available in: Unified diff