Revision 41414

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/gui/preferencespage/ViewPage.java
185 185
import org.gvsig.fmap.crs.CRSFactory;
186 186
import org.gvsig.fmap.mapcontext.MapContext;
187 187
import org.gvsig.fmap.mapcontext.MapContextLocator;
188
import org.gvsig.tools.swing.icontheme.IconThemeManager;
188
import org.gvsig.gui.beans.swing.JButton;
189 189
import org.gvsig.utils.StringUtilities;
190 190
import org.gvsig.utils.XMLEntity;
191 191
import org.gvsig.utils.swing.JComboBox;
192
import org.gvsig.gui.beans.swing.JButton;
193 192

  
194 193

  
195 194
/**
......
202 201
 * @author jaume dominguez faus - jaume.dominguez@iver.es
203 202
 */
204 203
public class ViewPage extends AbstractPreferencePage {
205
	
204

  
206 205
	private static final String FACTORY_DEFAULT_PROJECTION =
207 206
	    MapContextLocator.getMapContextManager().getDefaultCRS().getAbrev();
208
	
207

  
209 208
	private static final String ZOOM_IN_FACTOR_KEY_NAME = "ZoomInFactor";
210 209
	private static final String ZOOM_OUT_FACTOR_KEY_NAME = "ZoomOutFactor";
211 210
	public static final String ADD_NEW_LAYERS_IN_INVISIBLE_MODE_KEY_NAME = "NewLayersInInvisibleMode";
......
233 232
	private static int FACTORY_DEFAULT_MAP_UNITS;
234 233
	private static int FACTORY_DEFAULT_DISTANCE_UNITS;
235 234
	private static int FACTORY_DEFAULT_DISTANCE_AREA;
236
	
235

  
237 236
	private JTextField txtZoomInFactor;
238 237
	private JTextField txtZoomOutFactor;
239 238
	protected static String id = ViewPage.class.getName();
......
248 247
	private JComboBox jCmbMapUnits;
249 248
	private JComboBox jCmbDistanceUnits;
250 249
	private JComboBox jCmbDistanceArea;
251
	
250

  
252 251
	CRSSelectPanel jPanelProj = null;
253
	
254
	
252

  
253

  
255 254
	/*
256 255
	 * Locator's background color, for when we let it be possible
257 256
	 * private ColorChooserPanel jccDefaultMapOverViewBackColor;
......
308 307
		});
309 308

  
310 309
		addComponent(PluginServices.getText(this, "default_projection") + ":", lblDefaultProjection );
311
		
310

  
312 311
		IProjection proj = CRSFactory.getCRS(FACTORY_DEFAULT_PROJECTION);
313 312
		if (PluginServices.getMainFrame() != null) {
314 313
			proj = AddLayerDialog.getLastProjection();
......
325 324
				}
326 325
			}
327 326
		});
328
		
329
		
327

  
328

  
330 329
		JPanel aux = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
331 330
		aux.add(btnChangeProjection);
332 331
		addComponent("", aux);
......
394 393
                PluginServices ps = PluginsLocator.getManager().getPlugin(this);
395 394
		XMLEntity xml = ps.getPersistentXML();
396 395

  
397
                projectPreferences.setDefaultProjection(lblDefaultProjection.getText());
396
//                projectPreferences.setDefaultProjection(lblDefaultProjection.getText());
397
        lblDefaultProjection.setText(projectPreferences.getDefaultProjection().getAbrev());
398 398

  
399 399
		// Adding invisible new layers
400 400
		if (xml.contains(ADD_NEW_LAYERS_IN_INVISIBLE_MODE_KEY_NAME)) {
......
491 491
            double zof=1;
492 492
            boolean invisibleNewLayers, keepScaleOnResize;
493 493
            Color selectionColor, viewBackColor;
494
                
494

  
495 495
            ProjectPreferences projectPreferences = ApplicationLocator.getProjectManager().getProjectPreferences();
496 496
            /*
497 497
             * Locator's background color, for when we let it be possible

Also available in: Unified diff