Revision 31496 branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/preferencespage/ViewPage.java

View differences:

ViewPage.java
194 194
import org.gvsig.app.gui.panels.CRSSelectPanel;
195 195
import org.gvsig.app.gui.panels.ColorChooserPanel;
196 196
import org.gvsig.app.gui.panels.crs.ISelectCrsPanel;
197
import org.gvsig.app.project.Project;
198
import org.gvsig.app.project.documents.view.gui.View;
197
import org.gvsig.app.project.DefaultProject;
198
import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
199 199
import org.gvsig.fmap.crs.CRSFactory;
200 200
import org.gvsig.fmap.mapcontext.MapContext;
201 201
import org.gvsig.gui.beans.swing.JButton;
......
410 410
		} else {
411 411
			lblDefaultProjection.setText(FACTORY_DEFAULT_PROJECTION);
412 412
		}
413
		Project.setDefaultProjection( CRSFactory.getCRS(lblDefaultProjection.getText()));
413
		DefaultProject.setDefaultProjection( CRSFactory.getCRS(lblDefaultProjection.getText()));
414 414

  
415 415
		// Adding invisible new layers
416 416
		if (xml.contains(ADD_NEW_LAYERS_IN_INVISIBLE_MODE_KEY_NAME)) {
......
445 445
		MapContext.ZOOMOUTFACTOR = Double.parseDouble(txtZoomOutFactor.getText());;
446 446

  
447 447
		// Default back color
448
		jccDefaultViewBackColor.setColor(View.getDefaultBackColor());
448
		jccDefaultViewBackColor.setColor(DefaultViewPanel.getDefaultBackColor());
449 449
		jccDefaultViewBackColor.setAlpha(255);
450 450
		/*
451 451
		 * Locator's background color, for when we let it be possible
......
455 455
		 */
456 456

  
457 457
		// Default selection color
458
		jccDefaultSelectionColor.setColor(Project.getDefaultSelectionColor());
458
		jccDefaultSelectionColor.setColor(DefaultProject.getDefaultSelectionColor());
459 459
		jccDefaultSelectionColor.setAlpha(255);
460 460
		String[] distanceNames=MapContext.getDistanceNames();
461 461
		// Map units
462
		if (Project.getDefaultMapUnits()<=distanceNames.length && distanceNames.length != jCmbMapUnits.getItemCount()){
462
		if (DefaultProject.getDefaultMapUnits()<=distanceNames.length && distanceNames.length != jCmbMapUnits.getItemCount()){
463 463
			((DefaultComboBoxModel)jCmbMapUnits.getModel()).removeAllElements();
464 464
			//			 default map units
465 465
			for (int i = 0; i < distanceNames.length; i++) {
466 466
				((DefaultComboBoxModel)jCmbMapUnits.getModel()).addElement(PluginServices.getText(this,distanceNames[i]));
467 467
			}
468
			jCmbMapUnits.setSelectedIndex(Project.getDefaultMapUnits());
468
			jCmbMapUnits.setSelectedIndex(DefaultProject.getDefaultMapUnits());
469 469
		}
470 470

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

  
482 482
		// Distance area
483
		if (Project.getDefaultDistanceArea()<=names.length && names.length != jCmbDistanceArea.getItemCount()){
483
		if (DefaultProject.getDefaultDistanceArea()<=names.length && names.length != jCmbDistanceArea.getItemCount()){
484 484
			((DefaultComboBoxModel)jCmbDistanceArea.getModel()).removeAllElements();
485 485
			for (int i = 0; i < names.length; i++) {
486 486
				((DefaultComboBoxModel)jCmbDistanceArea.getModel()).addElement(PluginServices.getText(this,names[i])+MapContext.getOfLinear(i));
487 487
			}
488
			jCmbDistanceArea.setSelectedIndex(Project.getDefaultDistanceArea());
488
			jCmbDistanceArea.setSelectedIndex(DefaultProject.getDefaultDistanceArea());
489 489
		}
490 490
	}
491 491

  
......
523 523
//				//JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),PluginServices.getText(this,"numero_incorrecto")+" = "+ txtZoomInFactor.getText()+ ", "+txtZoomOutFactor.getText());
524 524
//				throw new StoreException(PluginServices.getText(this,"numero_incorrecto")+" = "+ txtZoomInFactor.getText()+ ", "+txtZoomOutFactor.getText());
525 525
//			}
526
			Project.setDefaultProjection( CRSFactory.getCRS(projName));
526
			DefaultProject.setDefaultProjection( CRSFactory.getCRS(projName));
527 527

  
528 528
			selectionColor = jccDefaultSelectionColor.getColor();
529
			Project.setDefaultSelectionColor( selectionColor );
529
			DefaultProject.setDefaultSelectionColor( selectionColor );
530 530

  
531 531
			viewBackColor = jccDefaultViewBackColor.getColor();
532
			View.setDefaultBackColor( viewBackColor );
532
			DefaultViewPanel.setDefaultBackColor( viewBackColor );
533 533
			/*
534 534
			 * Locator's background color, for when we let it be possible
535 535
			 * mapOverViewBackColor = jccDefaultMapOverViewBackColor.getColor();
536 536
			 * View.setDefaultMapOverViewBackColor( mapOverViewBackColor );
537 537
			 */
538 538

  
539
			Project.setDefaultMapUnits(jCmbMapUnits.getSelectedIndex());
540
			Project.setDefaultDistanceUnits(jCmbDistanceUnits.getSelectedIndex());
541
			Project.setDefaultDistanceArea(jCmbDistanceArea.getSelectedIndex());
539
			DefaultProject.setDefaultMapUnits(jCmbMapUnits.getSelectedIndex());
540
			DefaultProject.setDefaultDistanceUnits(jCmbDistanceUnits.getSelectedIndex());
541
			DefaultProject.setDefaultDistanceArea(jCmbDistanceArea.getSelectedIndex());
542 542
			invisibleNewLayers = chkInvisibleNewLayers.isSelected();
543 543
			keepScaleOnResize = chkKeepScaleOnResizing.isSelected();
544 544
		} catch (Exception e) {

Also available in: Unified diff