Revision 30960

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/addlayer/AddLayerDialog.java
93 93
			jTabbedPane.addChangeListener(new ChangeListener() {
94 94
				public void stateChanged(ChangeEvent e) {
95 95
					JTabbedPane tabs = (JTabbedPane) e.getSource();
96
					getJPanel().setOkButtonEnabled(false);
96 97
//					getJPanel().setOkButtonEnabled(!(tabs.getSelectedComponent() instanceof WizardPanel));
97 98
				}
98 99
			});
trunk/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/WMSParamsPanel.java
888 888
			rect = dataSource.getBoundingBox(layerNames, latLonID);
889 889
			if (rect == null) {
890 890
				rect = dataSource.getBoundingBox(layerNames, "CRS:84");
891
				if(rect == null)
892
					return null;
891 893
			}
892

  
894
			
895
			if(getSRS() == null)
896
				throw new ProjectionLayerException(getName(),null);
897
			
893 898
			IProjection reqProj = CRSFactory.getCRS(getSRS());
894 899
			IProjection latLonProj = CRSFactory.getCRS(latLonID);
895 900
			if ((reqProj != null) && (latLonProj != null)) {
......
1397 1402
		if (getDisagregatedLayers()) {
1398 1403
			return getLayerTree();
1399 1404
		} else {
1405
			if(dataSource == null) 
1406
				return null;
1400 1407
			return getLayerPlain();
1401 1408
		}
1402 1409
	}

Also available in: Unified diff