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

Code streamlining.

Browse source
This commit is contained in:
Sergey Prigogin 2011-04-05 03:33:16 +00:00
parent 0218035839
commit e96f2e9804
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/IdentifierHelper.java
View file

@ -12,11 +12,12 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.utils; package org.eclipse.cdt.internal.ui.refactoring.utils;
import com.ibm.icu.text.MessageFormat;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.eclipse.osgi.util.NLS;
import org.eclipse.cdt.core.parser.KeywordSetKey; import org.eclipse.cdt.core.parser.KeywordSetKey;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
@ -26,7 +27,6 @@ import org.eclipse.cdt.internal.core.parser.token.KeywordSets;
* Class to verify that an identifier meets the C++ rules for valid names. * Class to verify that an identifier meets the C++ rules for valid names.
* *
* @author Thomas Corbat * @author Thomas Corbat
*
*/ */
public class IdentifierHelper { public class IdentifierHelper {
@ -35,28 +35,26 @@ public class IdentifierHelper {
* @return an instance of IdentifierResult that holds the outcome of the validation * @return an instance of IdentifierResult that holds the outcome of the validation
*/ */
public static IdentifierResult checkIdentifierName(String identifier) { public static IdentifierResult checkIdentifierName(String identifier) {
if (identifier == null) { if (identifier == null) {
return null; return null;
} }
if (isCorrect(identifier)) { if (isCorrect(identifier)) {
if (isKeyword(identifier)) { if (isKeyword(identifier)) {
return new IdentifierResult(IdentifierResult.KEYWORD, MessageFormat.format(Messages.IdentifierHelper_isKeyword, new Object[] {identifier})); return new IdentifierResult(IdentifierResult.KEYWORD, NLS.bind(Messages.IdentifierHelper_isKeyword, identifier));
} }
return new IdentifierResult(IdentifierResult.VALID, MessageFormat.format(Messages.IdentifierHelper_isValid, new Object[] {identifier})); return new IdentifierResult(IdentifierResult.VALID, NLS.bind(Messages.IdentifierHelper_isValid, identifier));
} else if (isLeadingADigit(identifier)) { } else if (isLeadingADigit(identifier)) {
return new IdentifierResult(IdentifierResult.DIGIT_FIRST, MessageFormat.format(Messages.IdentifierHelper_leadingDigit, new Object[] {identifier})); return new IdentifierResult(IdentifierResult.DIGIT_FIRST, NLS.bind(Messages.IdentifierHelper_leadingDigit, identifier));
} else if (identifier.length() == 0) { } else if (identifier.length() == 0) {
return new IdentifierResult(IdentifierResult.EMPTY, Messages.IdentifierHelper_emptyIdentifier); return new IdentifierResult(IdentifierResult.EMPTY, Messages.IdentifierHelper_emptyIdentifier);
} else if (hasIllegalCharacters(identifier)) { } else if (hasIllegalCharacters(identifier)) {
return new IdentifierResult(IdentifierResult.ILLEGAL_CHARACTER, MessageFormat.format(Messages.IdentifierHelper_illegalCharacter, new Object[] {identifier})); return new IdentifierResult(IdentifierResult.ILLEGAL_CHARACTER, NLS.bind(Messages.IdentifierHelper_illegalCharacter, identifier));
} }
return new IdentifierResult(IdentifierResult.UNKNOWN, MessageFormat.format(Messages.IdentifierHelper_unidentifiedMistake, new Object[] {identifier})); return new IdentifierResult(IdentifierResult.UNKNOWN, NLS.bind(Messages.IdentifierHelper_unidentifiedMistake, identifier));
} }
private static boolean isKeyword(String identifier) { private static boolean isKeyword(String identifier) {
for (String currentKeyword : getKeywords()) { for (String currentKeyword : getKeywords()) {
if (identifier.equals(currentKeyword)) { if (identifier.equals(currentKeyword)) {
return true; return true;