| author | Michael Lindo | 2012-03-01 16:34:21 (EST) |
|---|---|---|
| committer | Vivian Kong | 2012-03-01 16:34:21 (EST) |
| commit | dddeb4dbcc4188e024db1f32d939775bccb9fa40 (patch) (side-by-side diff) | |
| tree | 7b1372c15f5a6ae3784ae5a7f4b97c328fdd6fab | |
| parent | 9ecb8e0c6e8fd33b4b0ed5d37826ea44bbd951e5 (diff) | |
| download | org.eclipse.cdt-dddeb4dbcc4188e024db1f32d939775bccb9fa40.zip org.eclipse.cdt-dddeb4dbcc4188e024db1f32d939775bccb9fa40.tar.gz org.eclipse.cdt-dddeb4dbcc4188e024db1f32d939775bccb9fa40.tar.bz2 | |
Bug 372899 - A few changes needed to CEditor in order to implement
remote code folding in the Remote C Editor in ptp
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 6ab5dc1..cd4398c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2012 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 @@ -2202,6 +2202,13 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC return CCorePlugin.SPACE.equals(option); } + protected void uninstallProjectionModelUpdater() { + if (fProjectionModelUpdater != null) { + fProjectionModelUpdater.uninstall(); + fProjectionModelUpdater = null; + } + } + /** * @see org.eclipse.ui.IWorkbenchPart#dispose() */ @@ -2214,10 +2221,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC if (sourceViewer instanceof ITextViewerExtension) ((ITextViewerExtension) sourceViewer).removeVerifyKeyListener(fBracketInserter); - if (fProjectionModelUpdater != null) { - fProjectionModelUpdater.uninstall(); - fProjectionModelUpdater = null; - } + uninstallProjectionModelUpdater(); if (fProjectionSupport != null) { fProjectionSupport.dispose(); @@ -2564,7 +2568,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC * Determines if folding is enabled. * @return <code>true</code> if folding is enabled, <code>false</code> otherwise. */ - boolean isFoldingEnabled() { + protected boolean isFoldingEnabled() { return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_FOLDING_ENABLED); } |

