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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2012-05-14 18:23:34 -07:00
parent 747f41471a
commit 20be45ecfa
10 changed files with 55 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java
View file

@ -33,21 +33,21 @@ public interface IIndexManager extends IPDOMManager {
* projects referenced by the set of input projects should also be added
* to the resulting index.
*/
public final static int ADD_DEPENDENCIES = 0x1;
public static final int ADD_DEPENDENCIES = 0x1;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates
* projects which reference any of the set of input projects should also be
* added to the resulting index.
*/
public final static int ADD_DEPENDENT = 0x2;
public static final int ADD_DEPENDENT = 0x2;
/**
* @deprecated Extension fragments are now used depending on their configuration.
* Use one of the ADD_EXTENSION_XX flags instead.
*/
@Deprecated
public final static int SKIP_PROVIDED = 0x4;
public static final int SKIP_PROVIDED = 0x4;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -56,7 +56,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_NAVIGATION = 0x8;
public static final int ADD_EXTENSION_FRAGMENTS_NAVIGATION = 0x8;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that the each index
@ -65,7 +65,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_CONTENT_ASSIST = 0x10;
public static final int ADD_EXTENSION_FRAGMENTS_CONTENT_ASSIST = 0x10;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -74,7 +74,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_ADD_IMPORT = 0x20;
public static final int ADD_EXTENSION_FRAGMENTS_ADD_IMPORT = 0x20;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -83,7 +83,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_CALL_HIERARCHY = 0x40;
public static final int ADD_EXTENSION_FRAGMENTS_CALL_HIERARCHY = 0x40;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -92,7 +92,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_TYPE_HIERARCHY = 0x80;
public static final int ADD_EXTENSION_FRAGMENTS_TYPE_HIERARCHY = 0x80;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -101,7 +101,7 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_INCLUDE_BROWSER = 0x100;
public static final int ADD_EXTENSION_FRAGMENTS_INCLUDE_BROWSER = 0x100;
/**
* Constant for passing to getIndex methods. This constant, when set, indicates that each index
@ -110,29 +110,29 @@ public interface IIndexManager extends IPDOMManager {
*
* @since 5.4
*/
public final static int ADD_EXTENSION_FRAGMENTS_SEARCH = 0x200;
public static final int ADD_EXTENSION_FRAGMENTS_SEARCH = 0x200;
/**
* Constant for indicating that there is no time out period for joining the indexer job.
* @see IIndexManager#joinIndexer(int, IProgressMonitor)
*/
public final static int FOREVER= -1;
public static final int FOREVER= -1;
/**
* Constant for requesting an update of all translation units.
*/
public final static int UPDATE_ALL= 0x1;
public static final int UPDATE_ALL= 0x1;
/**
* Constant for requesting an update of translation units if theit timestamps have changed.
*/
public final static int UPDATE_CHECK_TIMESTAMPS= 0x2;
public static final int UPDATE_CHECK_TIMESTAMPS= 0x2;
/**
* Constant for requesting an update of translation units if their configurations
* have changed. The flag currently has no effect.
*/
public final static int UPDATE_CHECK_CONFIGURATION= 0x4;
public static final int UPDATE_CHECK_CONFIGURATION= 0x4;
/**
* Constant for requesting to update the external files for a project, also. This flag works
@ -140,7 +140,7 @@ public interface IIndexManager extends IPDOMManager {
* {@link #UPDATE_ALL} or {@link #UPDATE_CHECK_TIMESTAMPS}.
* @since 5.1
*/
public final static int UPDATE_EXTERNAL_FILES_FOR_PROJECT= 0x8;
public static final int UPDATE_EXTERNAL_FILES_FOR_PROJECT= 0x8;
/**
* This flag modifies behavior of UPDATE_CHECK_TIMESTAMPS. Both, the timestamp and the hash
@ -149,7 +149,7 @@ public interface IIndexManager extends IPDOMManager {
* generation since generated files are sometimes recreated with identical contents.
* @since 5.2
*/
public final static int UPDATE_CHECK_CONTENTS_HASH= 0x10;
public static final int UPDATE_CHECK_CONTENTS_HASH= 0x10;
/**
* Include files that are otherwise would be excluded from the index. This flag is sticky
@ -157,7 +157,7 @@ public interface IIndexManager extends IPDOMManager {
* they remain in the index.
* @since 5.3
*/
public final static int FORCE_INDEX_INCLUSION= 0x20;
public static final int FORCE_INDEX_INCLUSION= 0x20;
/**
* Causes files previously included in the index due to FORCE_INDEX_INCLUSION to loose
@ -165,13 +165,13 @@ public interface IIndexManager extends IPDOMManager {
* will be removed from the index.
* @since 5.4
*/
public final static int RESET_INDEX_INCLUSION= 0x40;
public static final int RESET_INDEX_INCLUSION= 0x40;
/**
* Constant for requesting an update of translation units that had unresolved includes.
* @since 5.4
*/
public final static int UPDATE_UNRESOLVED_INCLUDES= 0x80;
public static final int UPDATE_UNRESOLVED_INCLUDES= 0x80;
/**
* Returns the index for the given project.

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayUtils.java
View file

@ -291,7 +291,7 @@ public class CharArrayUtils {
return -1;
}
final static public char[] trim(char[] chars) {
static final public char[] trim(char[] chars) {
if (chars == null)
return null;
@ -308,7 +308,7 @@ public class CharArrayUtils {
return chars;
}
final static public char[] lastSegment(char[] array, char[] separator) {
static final public char[] lastSegment(char[] array, char[] separator) {
int pos = lastIndexOf(separator, array);
if (pos < 0)
return array;

6
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java
View file

@ -33,10 +33,10 @@ import org.eclipse.osgi.util.NLS;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class CConventions {
private final static String scopeResolutionOperator= "::"; //$NON-NLS-1$
private final static char fgDot= '.';
private static final String scopeResolutionOperator= "::"; //$NON-NLS-1$
private static final char fgDot= '.';
private final static String ILLEGAL_FILE_CHARS = "/\\:<>?*|\""; //$NON-NLS-1$
private static final String ILLEGAL_FILE_CHARS = "/\\:<>?*|\""; //$NON-NLS-1$
public static boolean isLegalIdentifier(String name) {
if (name == null) {

36
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
View file

@ -109,11 +109,11 @@ public class CCorePlugin extends Plugin {
public static final String BUILDER_MODEL_ID = PLUGIN_ID + ".CBuildModel"; //$NON-NLS-1$
public static final String BINARY_PARSER_SIMPLE_ID = "BinaryParser"; //$NON-NLS-1$
public final static String BINARY_PARSER_UNIQ_ID = PLUGIN_ID + "." + BINARY_PARSER_SIMPLE_ID; //$NON-NLS-1$
public final static String PREF_BINARY_PARSER = "binaryparser"; //$NON-NLS-1$
public final static String DEFAULT_BINARY_PARSER_SIMPLE_ID = "ELF"; //$NON-NLS-1$
public final static String DEFAULT_BINARY_PARSER_UNIQ_ID = PLUGIN_ID + "." + DEFAULT_BINARY_PARSER_SIMPLE_ID; //$NON-NLS-1$
public final static String PREF_USE_STRUCTURAL_PARSE_MODE = "useStructualParseMode"; //$NON-NLS-1$
public static final String BINARY_PARSER_UNIQ_ID = PLUGIN_ID + "." + BINARY_PARSER_SIMPLE_ID; //$NON-NLS-1$
public static final String PREF_BINARY_PARSER = "binaryparser"; //$NON-NLS-1$
public static final String DEFAULT_BINARY_PARSER_SIMPLE_ID = "ELF"; //$NON-NLS-1$
public static final String DEFAULT_BINARY_PARSER_UNIQ_ID = PLUGIN_ID + "." + DEFAULT_BINARY_PARSER_SIMPLE_ID; //$NON-NLS-1$
public static final String PREF_USE_STRUCTURAL_PARSE_MODE = "useStructualParseMode"; //$NON-NLS-1$
public static final String INDEX_SIMPLE_ID = "CIndex"; //$NON-NLS-1$
public static final String INDEX_UNIQ_ID = PLUGIN_ID + "." + INDEX_SIMPLE_ID; //$NON-NLS-1$
@ -126,23 +126,23 @@ public class CCorePlugin extends Plugin {
/**
* Name of the extension point for contributing an error parser
*/
public final static String ERROR_PARSER_SIMPLE_ID = "ErrorParser"; //$NON-NLS-1$
public static final String ERROR_PARSER_SIMPLE_ID = "ErrorParser"; //$NON-NLS-1$
/**
* Full unique name of the extension point for contributing an error parser
*/
public final static String ERROR_PARSER_UNIQ_ID = PLUGIN_ID + "." + ERROR_PARSER_SIMPLE_ID; //$NON-NLS-1$
public static final String ERROR_PARSER_UNIQ_ID = PLUGIN_ID + "." + ERROR_PARSER_SIMPLE_ID; //$NON-NLS-1$
// default store for pathentry
public final static String DEFAULT_PATHENTRY_STORE_ID = PLUGIN_ID + ".cdtPathEntryStore"; //$NON-NLS-1$
public static final String DEFAULT_PATHENTRY_STORE_ID = PLUGIN_ID + ".cdtPathEntryStore"; //$NON-NLS-1$
// Build Model Interface Discovery
public final static String BUILD_SCANNER_INFO_SIMPLE_ID = "ScannerInfoProvider"; //$NON-NLS-1$
public final static String BUILD_SCANNER_INFO_UNIQ_ID = PLUGIN_ID + "." + BUILD_SCANNER_INFO_SIMPLE_ID; //$NON-NLS-1$
public static final String BUILD_SCANNER_INFO_SIMPLE_ID = "ScannerInfoProvider"; //$NON-NLS-1$
public static final String BUILD_SCANNER_INFO_UNIQ_ID = PLUGIN_ID + "." + BUILD_SCANNER_INFO_SIMPLE_ID; //$NON-NLS-1$
public static final String DEFAULT_PROVIDER_ID = CCorePlugin.PLUGIN_ID + ".defaultConfigDataProvider"; //$NON-NLS-1$
private final static String SCANNER_INFO_PROVIDER2_NAME = "ScannerInfoProvider2"; //$NON-NLS-1$
private final static String SCANNER_INFO_PROVIDER2 = PLUGIN_ID + "." + SCANNER_INFO_PROVIDER2_NAME; //$NON-NLS-1$
private static final String SCANNER_INFO_PROVIDER2_NAME = "ScannerInfoProvider2"; //$NON-NLS-1$
private static final String SCANNER_INFO_PROVIDER2 = PLUGIN_ID + "." + SCANNER_INFO_PROVIDER2_NAME; //$NON-NLS-1$
/**
* Name of the extension point for contributing a source code formatter
@ -158,27 +158,27 @@ public class CCorePlugin extends Plugin {
/**
* IContentType id for C Source Unit
*/
public final static String CONTENT_TYPE_CSOURCE = "org.eclipse.cdt.core.cSource"; //$NON-NLS-1$
public static final String CONTENT_TYPE_CSOURCE = "org.eclipse.cdt.core.cSource"; //$NON-NLS-1$
/**
* IContentType id for C Header Unit
*/
public final static String CONTENT_TYPE_CHEADER = "org.eclipse.cdt.core.cHeader"; //$NON-NLS-1$
public static final String CONTENT_TYPE_CHEADER = "org.eclipse.cdt.core.cHeader"; //$NON-NLS-1$
/**
* IContentType id for C++ Source Unit
*/
public final static String CONTENT_TYPE_CXXSOURCE = "org.eclipse.cdt.core.cxxSource"; //$NON-NLS-1$
public static final String CONTENT_TYPE_CXXSOURCE = "org.eclipse.cdt.core.cxxSource"; //$NON-NLS-1$
/**
* IContentType id for C++ Header Unit
*/
public final static String CONTENT_TYPE_CXXHEADER = "org.eclipse.cdt.core.cxxHeader"; //$NON-NLS-1$
public static final String CONTENT_TYPE_CXXHEADER = "org.eclipse.cdt.core.cxxHeader"; //$NON-NLS-1$
/**
* IContentType id for ASM Unit
*/
public final static String CONTENT_TYPE_ASMSOURCE = "org.eclipse.cdt.core.asmSource"; //$NON-NLS-1$
public static final String CONTENT_TYPE_ASMSOURCE = "org.eclipse.cdt.core.asmSource"; //$NON-NLS-1$
/**
* IContentType id for Binary Files
*/
public final static String CONTENT_TYPE_BINARYFILE = "org.eclipse.cdt.core.binaryFile"; //$NON-NLS-1$
public static final String CONTENT_TYPE_BINARYFILE = "org.eclipse.cdt.core.binaryFile"; //$NON-NLS-1$
/**
* Possible configurable option value.

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java
View file

@ -9,7 +9,6 @@
* QNX Software Systems - Initial API and implementation
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.internal.corext.template.c;
import org.eclipse.jface.text.IDocument;
@ -21,29 +20,21 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
* A context type for C/C++ code.
*/
public class CContextType extends TranslationUnitContextType {
public final static String ID = "org.eclipse.cdt.ui.text.templates.c"; //$NON-NLS-1$
public static final String ID = "org.eclipse.cdt.ui.text.templates.c"; //$NON-NLS-1$
public CContextType() {
super();
}
/*
* @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, int, int, org.eclipse.cdt.core.model.ITranslationUnit)
*/
@Override
public TranslationUnitContext createContext(IDocument document, int offset,
int length, ITranslationUnit translationUnit) {
return new CContext(this, document, offset, length, translationUnit);
}
/*
* @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position, org.eclipse.cdt.core.model.ITranslationUnit)
*/
@Override
public TranslationUnitContext createContext(IDocument document,
Position position, ITranslationUnit translationUnit) {
return new CContext(this, document, position, translationUnit);
}
}

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

@ -690,7 +690,7 @@ public class CDocumentProvider extends TextFileDocumentProvider {
}
/** Preference key for temporary problems */
private final static String HANDLE_TEMPORARY_PROBLEMS= PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS;
private static final String HANDLE_TEMPORARY_PROBLEMS= PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS;
/** Internal property changed listener */
private IPropertyChangeListener fPropertyListener;

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

@ -1336,7 +1336,7 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
private SurroundWithActionGroup fSurroundWithActionGroup;
/** Pairs of brackets, used to match. */
protected final static char[] BRACKETS = { '{', '}', '(', ')', '[', ']', '<', '>' };
protected static final char[] BRACKETS = { '{', '}', '(', ')', '[', ']', '<', '>' };
/** Matches the brackets. */
protected CPairMatcher fBracketMatcher = new CPairMatcher(BRACKETS);
@ -1348,24 +1348,24 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
private CEditorErrorTickUpdater fCEditorErrorTickUpdater;
/** Preference key for sub-word navigation, aka smart caret positioning */
public final static String SUB_WORD_NAVIGATION = "subWordNavigation"; //$NON-NLS-1$
public static final String SUB_WORD_NAVIGATION = "subWordNavigation"; //$NON-NLS-1$
/** Preference key for matching brackets */
public final static String MATCHING_BRACKETS = "matchingBrackets"; //$NON-NLS-1$
public static final String MATCHING_BRACKETS = "matchingBrackets"; //$NON-NLS-1$
/** Preference key for matching brackets color */
public final static String MATCHING_BRACKETS_COLOR = "matchingBracketsColor"; //$NON-NLS-1$
public static final String MATCHING_BRACKETS_COLOR = "matchingBracketsColor"; //$NON-NLS-1$
/** Preference key for inactive code painter enablement */
public static final String INACTIVE_CODE_ENABLE = "inactiveCodeEnable"; //$NON-NLS-1$
/** Preference key for inactive code painter color */
public static final String INACTIVE_CODE_COLOR = "inactiveCodeColor"; //$NON-NLS-1$
/** Preference key for automatically closing strings */
private final static String CLOSE_STRINGS = PreferenceConstants.EDITOR_CLOSE_STRINGS;
private static final String CLOSE_STRINGS = PreferenceConstants.EDITOR_CLOSE_STRINGS;
/** Preference key for automatically closing brackets and parenthesis */
private final static String CLOSE_BRACKETS = PreferenceConstants.EDITOR_CLOSE_BRACKETS;
private static final String CLOSE_BRACKETS = PreferenceConstants.EDITOR_CLOSE_BRACKETS;
/** Preference key for automatically closing angular brackets */
private final static String CLOSE_ANGULAR_BRACKETS = PreferenceConstants.EDITOR_CLOSE_ANGULAR_BRACKETS;
private static final String CLOSE_ANGULAR_BRACKETS = PreferenceConstants.EDITOR_CLOSE_ANGULAR_BRACKETS;
/** Preference key for compiler task tags */
private final static String TODO_TASK_TAGS = CCorePreferenceConstants.TODO_TASK_TAGS;
private static final String TODO_TASK_TAGS = CCorePreferenceConstants.TODO_TASK_TAGS;
/**
* This editor's projection support

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
View file

@ -67,7 +67,7 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock {
/**
* Some C++ source code used for preview.
*/
private final static String PREVIEW=
private static final String PREVIEW=
"/*\n* " + //$NON-NLS-1$
FormatterMessages.CodingStyleConfigurationBlock_preview_title +
"\n*/\n" + //$NON-NLS-1$

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java
View file

@ -151,7 +151,7 @@ public class CBreakIterator extends BreakIterator {
private int fState;
private final static int[][] MATRIX= new int[][] {
private static final int[][] MATRIX= new int[][] {
// K_INVALID, K_LOWER, K_UPPER, K_UNDERSCORE, K_OTHER
{ S_EXIT, S_LOWER, S_ONE_CAP, S_UNDERSCORE, S_LOWER }, // S_INIT
{ S_EXIT, S_LOWER, S_EXIT, S_UNDERSCORE, S_LOWER }, // S_LOWER

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java
View file

@ -262,7 +262,7 @@ public final class CHeuristicScanner implements Symbols {
/* preset stop conditions */
private final StopCondition fNonWSDefaultPart= new NonWhitespaceDefaultPartition();
private final static StopCondition fNonWS= new NonWhitespace();
private static final StopCondition fNonWS= new NonWhitespace();
private final StopCondition fNonIdent= new NonJavaIdentifierPartDefaultPartition();
/**