mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Merge branch 'master' into sd90
This commit is contained in:
commit
728e669707
7 changed files with 16 additions and 25 deletions
|
@ -25,8 +25,8 @@ package org.eclipse.cdt.codan.core.model;
|
|||
*/
|
||||
public interface ICodanDisposable {
|
||||
/**
|
||||
* Disposes of the cache. This method has to be called exactly once during
|
||||
* the life cycle of the cache.
|
||||
* Disposes of the object. This method has to be called exactly once during
|
||||
* the life cycle of the object.
|
||||
*/
|
||||
public void dispose();
|
||||
}
|
||||
|
|
|
@ -3224,7 +3224,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
|
|||
*
|
||||
* @since 4.0
|
||||
*/
|
||||
private boolean isSemanticHighlightingEnabled() {
|
||||
protected boolean isSemanticHighlightingEnabled() {
|
||||
return SemanticHighlightings.isEnabled(getPreferenceStore()) && !(isEnableScalablilityMode() && getPreferenceStore().getBoolean(PreferenceConstants.SCALABILITY_SEMANTIC_HIGHLIGHT));
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
|
|||
|
||||
/**
|
||||
* @author Emanuel Graf IFS
|
||||
*
|
||||
*/
|
||||
public abstract class CRefactoringContribution extends RefactoringContribution {
|
||||
|
||||
|
@ -32,9 +31,8 @@ public abstract class CRefactoringContribution extends RefactoringContribution {
|
|||
if (descriptor instanceof CRefactoringDescription) {
|
||||
CRefactoringDescription refDesc = (CRefactoringDescription) descriptor;
|
||||
return refDesc.getParameterMap();
|
||||
}else {
|
||||
} else {
|
||||
return super.retrieveArgumentMap(descriptor);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -19,21 +19,18 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
|
|||
|
||||
/**
|
||||
* @author Emanuel Graf IFS
|
||||
*
|
||||
*/
|
||||
public class ExtractConstantRefactoringContribution extends
|
||||
CRefactoringContribution {
|
||||
public class ExtractConstantRefactoringContribution extends CRefactoringContribution {
|
||||
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
@Override
|
||||
public RefactoringDescriptor createDescriptor(String id, String project,
|
||||
String description, String comment, Map arguments, int flags)
|
||||
throws IllegalArgumentException {
|
||||
if(id.equals(ExtractConstantRefactoring.ID)) {
|
||||
if (id.equals(ExtractConstantRefactoring.ID)) {
|
||||
return new ExtractConstantRefactoringDescription(project, description, comment, arguments);
|
||||
}else {
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
|
|||
|
||||
/**
|
||||
* @author Emanuel Graf IFS
|
||||
*
|
||||
*/
|
||||
public class ExtractFunctionRefactoringContribution extends CRefactoringContribution {
|
||||
|
||||
|
@ -27,11 +26,10 @@ public class ExtractFunctionRefactoringContribution extends CRefactoringContribu
|
|||
@Override
|
||||
public RefactoringDescriptor createDescriptor(String id, String project, String description,
|
||||
String comment, Map arguments, int flags) throws IllegalArgumentException {
|
||||
if(id.equals(ExtractFunctionRefactoring.ID)) {
|
||||
if (id.equals(ExtractFunctionRefactoring.ID)) {
|
||||
return new ExtractFunctionRefactoringDescription(project, description, comment, arguments);
|
||||
}else {
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContribution;
|
|||
|
||||
/**
|
||||
* @author Emanuel Graf IFS
|
||||
*
|
||||
*/
|
||||
public class HideMethodRefactoringContribution extends CRefactoringContribution {
|
||||
|
||||
|
@ -27,11 +26,10 @@ public class HideMethodRefactoringContribution extends CRefactoringContribution
|
|||
@Override
|
||||
public RefactoringDescriptor createDescriptor(String id, String project, String description,
|
||||
String comment, Map arguments, int flags) throws IllegalArgumentException {
|
||||
if(id.equals(HideMethodRefactoring.ID)) {
|
||||
if (id.equals(HideMethodRefactoring.ID)) {
|
||||
return new HideMethodRefactoringDescription(project, description, comment, arguments);
|
||||
}else {
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue