View | Details | Raw Unified | Return to bug 123283
Collapse All | Expand All

(-)src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java (-2 / +1 lines)
Lines 953-960 Link Here
953
		}
953
		}
954
954
955
		// Get the Ruler Units properties
955
		// Get the Ruler Units properties
956
		int rulerUnits = ((IPreferenceStore) ((DiagramRootEditPart) getRootEditPart()).getPreferencesHint().getPreferenceStore())
956
		int rulerUnits = getWorkspaceViewerPreferenceStore().getInt(WorkspaceViewerProperties.RULERUNIT);
957
			.getInt(IPreferenceConstants.PREF_RULER_UNITS);
958
957
959
		// Get the Guide Style
958
		// Get the Guide Style
960
		GuideStyle guideStyle = (GuideStyle) getDiagram().getStyle(
959
		GuideStyle guideStyle = (GuideStyle) getDiagram().getStyle(
(-)src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java (+3 lines)
Lines 598-603 Link Here
598
					(! wsPrefStore.contains(WorkspaceViewerProperties.GRIDSPACING))) {
598
					(! wsPrefStore.contains(WorkspaceViewerProperties.GRIDSPACING))) {
599
				IPreferenceStore preferenceStore =
599
				IPreferenceStore preferenceStore =
600
					(IPreferenceStore) getPreferencesHint().getPreferenceStore();			
600
					(IPreferenceStore) getPreferencesHint().getPreferenceStore();			
601
				// Set the ruler unit to 999 in order to force the setting 
602
				// and then change it to the appropriate value
603
				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, 999);						
601
				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS));						
604
				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS));						
602
				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDSPACING, preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING));			
605
				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDSPACING, preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING));			
603
			}
606
			}

Return to bug 123283