mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +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 {
/**
* 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();
}

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
*/
private boolean isSemanticHighlightingEnabled() {
protected boolean isSemanticHighlightingEnabled() {
return SemanticHighlightings.isEnabled(getPreferenceStore()) && !(isEnableScalablilityMode() && getPreferenceStore().getBoolean(PreferenceConstants.SCALABILITY_SEMANTIC_HIGHLIGHT));
}

4
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
*
*/
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);
}
}
}

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

@ -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;
}
}
}

6
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
*
*/
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;
}
}
}

6
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
*
*/
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;
}
}
}