Revision 10776

View differences:

trunk/extensions/extWFS2/src/com/iver/cit/gvsig/gui/dialogs/WFSPropsDialog.java
88 88
 *
89 89
 * $Id$
90 90
 * $Log$
91
 * Revision 1.34  2007-03-06 16:55:54  caballero
91
 * Revision 1.35  2007-03-15 13:32:22  ppiqueras
92
 * Corregido bug de excepci?n que se lanzaba cuando se filtraba y no se pod?a cargar la capa.
93
 *
94
 * Revision 1.34  2007/03/06 16:55:54  caballero
92 95
 * Exceptions
93 96
 *
94 97
 * Revision 1.33  2007/03/01 13:11:27  ppiqueras
......
240 243

  
241 244
			public void error(Exception e) {
242 245
			}
246
        });
243 247

  
244
        })  ;
245 248
        //wfsParamsTabbedPane.disableDisagregatedLayers();
246 249
        this.add(wfsParamsTabbedPane);
247 250
        this.add(getButtonsPanel(), null);
......
468 471
					applied = true;
469 472
					getBtnApply().setEnabled(!applied);
470 473
					refreshLayouts();
471
					// If we load another layer, or the same but we've selected others fields -> notify it to he WFSFilter panel
474
					
475
					// Restores the private attribute of the area panel: hasUserDefinedAnArea
476
					wfsParamsTabbedPane.setUserHasntDefinedAnArea();
477

  
478
					// If we load another layer, or the same but we've selected others fields -> notify it to the WFSFilter panel
472 479
					if (getWFSFilterPanelIsAsTabForWFSLayersLoad() || (wfsParamsTabbedPane.getFieldsSelectedOfSameLayerHasChanged())) {
473 480
						setWFSFilterPanelIsAsTabForWFSLayersLoad(false);
474 481
						wfsParamsTabbedPane.resetFieldsSelectedOfSameLayerHasChanged(); // reset that field
475 482
				 	}
476 483

  
477
					
478 484
					// Update values associated to the current selected field
479 485
					wfsParamsTabbedPane.updateWFSFilterFieldValues();
480 486
				}
......
494 500
								mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
495 501
								mapCtrl.getMapContext().invalidate();
496 502
								refreshLayouts();
503

  
504
								// Restores the private attribute of the area panel: hasUserDefinedAnArea
505
								wfsParamsTabbedPane.setUserHasntDefinedAnArea();
497 506
							}
498 507
						}
499 508
					}
......
505 514

  
506 515
			}
507 516
			} catch (ConnectionErrorLayerException e1) {
508
				// TODO Auto-generated catch block
509 517
				e1.printStackTrace();
510 518
			} catch (DriverLayerException e1) {
511
				// TODO Auto-generated catch block
512 519
				e1.printStackTrace();
513 520
			} catch (LegendLayerException e1) {
514
				// TODO Auto-generated catch block
515 521
				e1.printStackTrace();
516 522
			} catch (NameLayerException e1) {
517
				// TODO Auto-generated catch block
518 523
				e1.printStackTrace();
519 524
			} catch (ProjectionLayerException e1) {
520
				// TODO Auto-generated catch block
521 525
				e1.printStackTrace();
522 526
			} catch (TypeLayerException e1) {
523
				// TODO Auto-generated catch block
524 527
				e1.printStackTrace();
525 528
			} catch (UnsupportedVersionLayerException e1) {
526
				// TODO Auto-generated catch block
527 529
				e1.printStackTrace();
528 530
			} catch (URLLayerException e1) {
529
				// TODO Auto-generated catch block
530 531
				e1.printStackTrace();
531 532
			} catch (XMLLayerException e1) {
532
				// TODO Auto-generated catch block
533 533
				e1.printStackTrace();
534 534
			} catch (WFSLayerException e1) {
535
				// TODO Auto-generated catch block
536 535
				e1.printStackTrace();
537 536
			} catch (LoadLayerException e1) {
538
				// TODO Auto-generated catch block
539 537
				e1.printStackTrace();
540 538
			}
541

  
542 539
		}
543 540

  
544 541
		/**
......
559 556
			 		URL host = new URL(wfsParamsTabbedPane.getData().getHost());
560 557
			 		String onlineResource = wfsParamsTabbedPane.getData().getOnlineResource();
561 558
			 		fLayer = new FLyrWFSFactory().getFLyrWFS(fLayer,host,onlineResource,driver,true);
562
		 			((FLyrWFS)fLayer).setLegend(legend);
563

  
564
		 			 // Update all fields and values known about the current layer loaded (and selected)
565
		 			((FLyrWFS)fLayer).setAllFieldsAndValuesKnown(wfsParamsTabbedPane.getAllFieldsAndValuesKnownOfCurrentLayer());
566

  
567
		 			return fLayer.getName();
559
			 		if (fLayer != null) {
560
			 			((FLyrWFS)fLayer).setLegend(legend);
561
	
562
			 			 // Update all fields and values known about the current layer loaded (and selected)
563
			 			((FLyrWFS)fLayer).setAllFieldsAndValuesKnown(wfsParamsTabbedPane.getAllFieldsAndValuesKnownOfCurrentLayer());
564
	
565
			 			return fLayer.getName();
566
			 		}
568 567
		 		}
569 568
			} catch (MalformedURLException e1) {
570 569
				e1.printStackTrace();
571 570
			} catch (LegendLayerException e) {
572
				// TODO Auto-generated catch block
573 571
				e.printStackTrace();
574 572
			}
575 573

  
trunk/extensions/extWFS2/src/com/iver/cit/gvsig/gui/panels/WFSParamsPanel.java
67 67
 *
68 68
 * $Id$
69 69
 * $Log$
70
 * Revision 1.38  2007-03-05 13:49:42  ppiqueras
70
 * Revision 1.39  2007-03-15 13:33:44  ppiqueras
71
 * Corregido bug de excepci?n que se lanzaba cuando se filtraba y no se pod?a cargar la capa.
72
 *
73
 * Revision 1.38  2007/03/05 13:49:42  ppiqueras
71 74
 * Si una capa WFS no tiene campos (y por tanto no tiene un campo obligatorio de tipo geometr?a), que avise al usuario y no permita que se intente cargar dicha capa.
72 75
 *
73 76
 * Revision 1.37  2007/03/01 13:12:09  ppiqueras
......
421 424
	 * @return boolean
422 425
	 */
423 426
	public boolean isCorretlyConfigured() {
424
		if (featurePanel.getSelectedFeature()!= null){
427
		if ((featurePanel.getSelectedFeature() != null) && (fieldsPanel.getSelectedFields().length > 0)) {
425 428
			return true;
426 429
		}else{
427 430
			return false;
......
613 616
		}
614 617

  
615 618
		layer.setBbox(bbox);
616
		layer.setBboxPropertyName(getFieldsPanel().getGeometryFieldName());
619
		String BboxPropertyName = getFieldsPanel().getGeometryFieldName();
617 620
		
621
		layer.setBboxPropertyName(BboxPropertyName);
622
		
618 623
		// Set the filter subconsultation that layer is
619 624
		layer.setFieldsQuery(getLayerNode().getFilter());
620 625
		layer.setVisualFilterQuery(getFilterPanel().getFilterExpressionFromInterface());
......
623 628
	}
624 629

  
625 630
	/**
631
	 * Returns true if there is a field of geometry type selected in this layer
626 632
	 * 
633
	 * @return A boolean value
634
	 */
635
	public boolean isThereAGeometryFieldSelected() {
636
		return (getFieldsPanel().getSelectedFields().length > 0);
637
	}
638
	
639
	/**
640
	 * 
627 641
	 * @return
628 642
	 */
629 643
	private WFSLayerNode getLayerNode(){
......
762 776
	public String getFilterQuery() {
763 777
		return this.getFilterPanel().getQuery();
764 778
	}
779
	
780
	/**
781
	 * @see WFSAreaPanel#setUserHasntDefineAnArea()
782
	 */
783
	public void setUserHasntDefinedAnArea() {
784
		this.getAreaPanel().setUserHasntDefineAnArea();
785
	}
765 786
}

Also available in: Unified diff