From 9ec2df2c3c32d0d5a549cfa4a45ec2961dbb42e7 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 9 Nov 2009 04:12:28 +0000 Subject: [PATCH] Cosmetics. --- .../model/org/eclipse/cdt/core/model/ICProject.java | 3 +-- .../src/org/eclipse/cdt/core/CCorePlugin.java | 6 +----- .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java index 62d523e44c3..d0ca06519c7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICProject.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.model; - import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; @@ -168,7 +167,7 @@ public interface ICProject extends IParent, IOpenable, ICElement { * (key type: String; value type: String) * @see CCorePlugin#getDefaultOptions */ - Map getOptions(boolean inheritCCoreOptions); + Map getOptions(boolean inheritCCoreOptions); /** * Helper method for setting one option value only. Equivalent to Map options = this.getOptions(false); map.put(optionName, optionValue); this.setOptions(map) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index 609f56a8f9a..64158d729e3 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -353,9 +353,7 @@ public class CCorePlugin extends Plugin { * (key type: String; value type: String) * @see #setOptions */ - - public static HashMap getDefaultOptions() - { + public static HashMap getDefaultOptions() { HashMap defaultOptions = new HashMap(10); // see #initializeDefaultPluginPreferences() for changing default settings @@ -378,7 +376,6 @@ public class CCorePlugin extends Plugin { return defaultOptions; } - /** * Helper method for returning one option value only. Equivalent to (String)CCorePlugin.getOptions().get(optionName) * Note that it may answer null if this option does not exist. @@ -414,7 +411,6 @@ public class CCorePlugin extends Plugin { * @see CCorePlugin#getDefaultOptions */ public static HashMap getOptions() { - HashMap options = new HashMap(10); // see #initializeDefaultPluginPreferences() for changing default settings 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 b762e312d75..3f0e84379a3 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 @@ -238,7 +238,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC public void gotoMarker(IMarker marker) { if (fIsUpdatingMarkerViews) return; - + if (getSourceViewer() == null) return;