mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Merge branch 'master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2011-07-21 10:03:07 -04:00
commit 728e669707
7 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICodanDisposable.java
View file

@ -25,8 +25,8 @@ package org.eclipse.cdt.codan.core.model;
*/ */
public interface ICodanDisposable { public interface ICodanDisposable {
/** /**
* Disposes of the cache. This method has to be called exactly once during * Disposes of the object. This method has to be called exactly once during
* the life cycle of the cache. * the life cycle of the object.
*/ */
public void dispose(); public void dispose();
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -3224,7 +3224,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
* *
* @since 4.0 * @since 4.0
*/ */
private boolean isSemanticHighlightingEnabled() { protected boolean isSemanticHighlightingEnabled() {
return SemanticHighlightings.isEnabled(getPreferenceStore()) && !(isEnableScalablilityMode() && getPreferenceStore().getBoolean(PreferenceConstants.SCALABILITY_SEMANTIC_HIGHLIGHT)); return SemanticHighlightings.isEnabled(getPreferenceStore()) && !(isEnableScalablilityMode() && getPreferenceStore().getBoolean(PreferenceConstants.SCALABILITY_SEMANTIC_HIGHLIGHT));
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoringContribution.java
View file

@ -18,7 +18,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
/** /**
* @author Emanuel Graf IFS * @author Emanuel Graf IFS
*
*/ */
public abstract class CRefactoringContribution extends RefactoringContribution { public abstract class CRefactoringContribution extends RefactoringContribution {
@ -36,5 +35,4 @@ public abstract class CRefactoringContribution extends RefactoringContribution {
return super.retrieveArgumentMap(descriptor); return super.retrieveArgumentMap(descriptor);
} }
} }
} }

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringContribution.java
View file

@ -19,10 +19,8 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
/** /**
* @author Emanuel Graf IFS * @author Emanuel Graf IFS
*
*/ */
public class ExtractConstantRefactoringContribution extends public class ExtractConstantRefactoringContribution extends CRefactoringContribution {
CRefactoringContribution {
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
@Override @Override
@ -35,5 +33,4 @@ public class ExtractConstantRefactoringContribution extends
return null; return null;
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringContribution.java
View file

@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
/** /**
* @author Emanuel Graf IFS * @author Emanuel Graf IFS
*
*/ */
public class ExtractFunctionRefactoringContribution extends CRefactoringContribution { public class ExtractFunctionRefactoringContribution extends CRefactoringContribution {
@ -33,5 +32,4 @@ public class ExtractFunctionRefactoringContribution extends CRefactoringContribu
return null; return null;
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringContribution.java
View file

@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
/** /**
* @author Emanuel Graf IFS * @author Emanuel Graf IFS
*
*/ */
public class HideMethodRefactoringContribution extends CRefactoringContribution { public class HideMethodRefactoringContribution extends CRefactoringContribution {
@ -33,5 +32,4 @@ public class HideMethodRefactoringContribution extends CRefactoringContribution
return null; return null;
} }
} }
} }