Revision 30507

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/Project.java
1840 1840
					}
1841 1841
				}
1842 1842
			}
1843
			if (defaultMapUnits == -1)
1843
			if (defaultMapUnits == -1 || defaultMapUnits >= MapContext.getDistanceNames().length)
1844 1844
				defaultMapUnits = MapContext.getDistancePosition("Metros");
1845 1845
		}
1846 1846
		return defaultMapUnits;
......
1870 1870
					}
1871 1871
				}
1872 1872
			}
1873
			if (defaultDistanceUnits == -1)
1873
			if (defaultDistanceUnits == -1 || defaultDistanceUnits >= MapContext.getDistanceNames().length)
1874 1874
				defaultDistanceUnits = MapContext.getDistancePosition("Metros");
1875 1875
		}
1876 1876
		return defaultDistanceUnits;
......
1899 1899
					}
1900 1900
				}
1901 1901
			}
1902
			if (defaultDistanceArea == -1){
1902
			if (defaultDistanceArea == -1 || defaultDistanceArea >= MapContext.getAreaNames().length){
1903 1903
				defaultDistanceArea=getDefaultDistanceUnits();
1904 1904
			}
1905 1905
		}
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/preferencespage/ViewPage.java
259 259
	private JComboBox jCmbMapUnits;
260 260
	private JComboBox jCmbDistanceUnits;
261 261
	private JComboBox jCmbDistanceArea;
262
	
262

  
263 263
	CRSSelectPanel jPanelProj = null;
264
	
265
	
264

  
265

  
266 266
	/*
267 267
	 * Locator's background color, for when we let it be possible
268 268
	 * private ColorChooserPanel jccDefaultMapOverViewBackColor;
......
319 319
		});
320 320

  
321 321
		addComponent(PluginServices.getText(this, "default_projection") + ":", lblDefaultProjection );
322
		
322

  
323 323
		IProjection proj = CRSFactory.getCRS("EPSG:23030");
324 324
		if (PluginServices.getMainFrame() != null) {
325 325
			proj = AddLayerDialog.getLastProjection();
......
336 336
				}
337 337
			}
338 338
		});
339
		
340
		
339

  
340

  
341 341
		JPanel aux = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
342 342
		aux.add(btnChangeProjection);
343 343
		addComponent("", aux);
......
461 461
		String[] distanceNames=MapContext.getDistanceNames();
462 462
		// Map units
463 463
		if (Project.getDefaultMapUnits()<=distanceNames.length && distanceNames.length != jCmbMapUnits.getItemCount()){
464
			((DefaultComboBoxModel)jCmbMapUnits.getModel()).removeAllElements();
464 465
//			 default map units
465 466
			for (int i = 0; i < distanceNames.length; i++) {
466 467
				((DefaultComboBoxModel)jCmbMapUnits.getModel()).addElement(PluginServices.getText(this,distanceNames[i]));
......
470 471

  
471 472
		// Distance units
472 473
		if (Project.getDefaultDistanceUnits()<=distanceNames.length&& distanceNames.length != jCmbDistanceUnits.getItemCount()){
474
			((DefaultComboBoxModel)jCmbDistanceUnits.getModel()).removeAllElements();
473 475
			// default distance units
474 476
			for (int i = 0; i < distanceNames.length; i++) {
475 477
				((DefaultComboBoxModel)jCmbDistanceUnits.getModel()).addElement(PluginServices.getText(this,distanceNames[i]));
......
480 482

  
481 483
		// Distance area
482 484
		if (Project.getDefaultDistanceArea()<=names.length && names.length != jCmbDistanceArea.getItemCount()){
485
			((DefaultComboBoxModel)jCmbDistanceArea.getModel()).removeAllElements();
483 486
			for (int i = 0; i < names.length; i++) {
484

  
485 487
				((DefaultComboBoxModel)jCmbDistanceArea.getModel()).addElement(PluginServices.getText(this,names[i])+MapContext.getOfLinear(i));
486 488
			}
487 489
			jCmbDistanceArea.setSelectedIndex(Project.getDefaultDistanceArea());

Also available in: Unified diff