### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.runtime.diagram.ui
Index: src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java
===================================================================
RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java,v
retrieving revision 1.12
diff -u -r1.12 DiagramEditor.java
--- src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java	25 Nov 2005 19:38:13 -0000	1.12
+++ src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java	13 Jan 2006 15:14:36 -0000
@@ -953,8 +953,7 @@
 		}
 
 		// Get the Ruler Units properties
-		int rulerUnits = ((IPreferenceStore) ((DiagramRootEditPart) getRootEditPart()).getPreferencesHint().getPreferenceStore())
-			.getInt(IPreferenceConstants.PREF_RULER_UNITS);
+		int rulerUnits = getWorkspaceViewerPreferenceStore().getInt(WorkspaceViewerProperties.RULERUNIT);
 
 		// Get the Guide Style
 		GuideStyle guideStyle = (GuideStyle) getDiagram().getStyle(
Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java
===================================================================
RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java,v
retrieving revision 1.10
diff -u -r1.10 DiagramRootEditPart.java
--- src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java	3 Jan 2006 20:39:31 -0000	1.10
+++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java	13 Jan 2006 15:14:36 -0000
@@ -598,6 +598,9 @@
 					(! wsPrefStore.contains(WorkspaceViewerProperties.GRIDSPACING))) {
 				IPreferenceStore preferenceStore =
 					(IPreferenceStore) getPreferencesHint().getPreferenceStore();			
+				// Set the ruler unit to 999 in order to force the setting 
+				// and then change it to the appropriate value
+				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, 999);						
 				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS));						
 				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDSPACING, preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING));			
 			}