Attachment 82259 Details for Bug 196715 – Proposed patch

[patch] Proposed patch

196715.txt (text/plain), 2.26 KB, created by Carson Li

on 2007-11-06 15:18:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carson Li

Created: 2007-11-06 15:18:09 EST

Size: 2.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.diagram.ui
>Index: src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java,v
>retrieving revision 1.9
>diff -u -r1.9 RulerGridPreferencePage.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java	3 Oct 2006 15:02:05 -0000	1.9
>+++ src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java	6 Nov 2007 20:15:12 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2003, 2006 IBM Corporation and others.
>+ * Copyright (c) 2002, 2003, 2007 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -14,6 +14,7 @@
> 
> import java.text.ParseException;
> import java.text.ParsePosition;
>+import java.util.Locale;
> 
> import org.eclipse.gef.rulers.RulerProvider;
> import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
>@@ -387,7 +388,14 @@
> 	 */
> 	public static void initDefaults(IPreferenceStore preferenceStore) {
> 		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_RULERS, false);
>-		preferenceStore.setDefault(IPreferenceConstants.PREF_RULER_UNITS, RulerProvider.UNIT_INCHES);
>+		String defaultCountry = Locale.getDefault().getCountry(); 
>+		if (defaultCountry != null && 
>+		   (defaultCountry.equals(Locale.US.getCountry()) || defaultCountry.equals(Locale.CANADA.getCountry()))){
>+				preferenceStore.setDefault(IPreferenceConstants.PREF_RULER_UNITS, RulerProvider.UNIT_INCHES);
>+		}
>+		else{
>+				preferenceStore.setDefault(IPreferenceConstants.PREF_RULER_UNITS, RulerProvider.UNIT_CENTIMETERS);
>+		}
> 		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_GRID, false);
> 		preferenceStore.setDefault(IPreferenceConstants.PREF_SNAP_TO_GRID, true);
> 		preferenceStore.setDefault(IPreferenceConstants.PREF_GRID_SPACING, 0.125);

Actions: View | Diff

Attachments on bug 196715: 82259