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 { 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));
} }

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

@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Institute for Software (IFS)- initial API and implementation * Institute for Software (IFS)- initial API and implementation
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring; package org.eclipse.cdt.internal.ui.refactoring;
@ -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 {
@ -32,9 +31,8 @@ public abstract class CRefactoringContribution extends RefactoringContribution {
if (descriptor instanceof CRefactoringDescription) { if (descriptor instanceof CRefactoringDescription) {
CRefactoringDescription refDesc = (CRefactoringDescription) descriptor; CRefactoringDescription refDesc = (CRefactoringDescription) descriptor;
return refDesc.getParameterMap(); return refDesc.getParameterMap();
}else { } else {
return super.retrieveArgumentMap(descriptor); return super.retrieveArgumentMap(descriptor);
} }
} }
} }

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

@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Institute for Software (IFS)- initial API and implementation * Institute for Software (IFS)- initial API and implementation
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.extractconstant; package org.eclipse.cdt.internal.ui.refactoring.extractconstant;
@ -19,21 +19,18 @@ 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
public RefactoringDescriptor createDescriptor(String id, String project, public RefactoringDescriptor createDescriptor(String id, String project,
String description, String comment, Map arguments, int flags) String description, String comment, Map arguments, int flags)
throws IllegalArgumentException { throws IllegalArgumentException {
if(id.equals(ExtractConstantRefactoring.ID)) { if (id.equals(ExtractConstantRefactoring.ID)) {
return new ExtractConstantRefactoringDescription(project, description, comment, arguments); return new ExtractConstantRefactoringDescription(project, description, comment, arguments);
}else { } else {
return null; return null;
} }
} }
} }

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

@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Institute for Software (IFS)- initial API and implementation * Institute for Software (IFS)- initial API and implementation
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.extractfunction; package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
@ -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 {
@ -27,11 +26,10 @@ public class ExtractFunctionRefactoringContribution extends CRefactoringContribu
@Override @Override
public RefactoringDescriptor createDescriptor(String id, String project, String description, public RefactoringDescriptor createDescriptor(String id, String project, String description,
String comment, Map arguments, int flags) throws IllegalArgumentException { 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); return new ExtractFunctionRefactoringDescription(project, description, comment, arguments);
}else { } else {
return null; return null;
} }
} }
} }

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

@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Institute for Software (IFS)- initial API and implementation * Institute for Software (IFS)- initial API and implementation
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable; package org.eclipse.cdt.internal.ui.refactoring.extractlocalvariable;

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

@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Institute for Software (IFS)- initial API and implementation * Institute for Software (IFS)- initial API and implementation
******************************************************************************/ ******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.hidemethod; package org.eclipse.cdt.internal.ui.refactoring.hidemethod;
@ -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 {
@ -27,11 +26,10 @@ public class HideMethodRefactoringContribution extends CRefactoringContribution
@Override @Override
public RefactoringDescriptor createDescriptor(String id, String project, String description, public RefactoringDescriptor createDescriptor(String id, String project, String description,
String comment, Map arguments, int flags) throws IllegalArgumentException { 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); return new HideMethodRefactoringDescription(project, description, comment, arguments);
}else { } else {
return null; return null;
} }
} }
} }