From 4e0a4b91716641c05f93d0d86f754546ac6c809c Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Fri, 14 May 2010 02:36:33 +0000 Subject: [PATCH] Externalized strings --- .../internal/checkers/CheckersMessages.java | 29 +++++++++++++++++++ .../NamingConventionFunctionChecker.java | 16 +++------- .../internal/checkers/messages.properties | 2 ++ 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java create mode 100644 codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java new file mode 100644 index 00000000000..8c5e99c8ecf --- /dev/null +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CheckersMessages.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2009,2010 Alena Laskavaia + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alena Laskavaia - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.codan.internal.checkers; + +import org.eclipse.osgi.util.NLS; + +/** + * Messages + */ +public class CheckersMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.cdt.codan.internal.checkers.messages"; //$NON-NLS-1$ + public static String NamingConventionFunctionChecker_LabelNamePattern; + public static String ReturnChecker_Param0; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, CheckersMessages.class); + } + + private CheckersMessages() { + } +} diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java index eca4d28e0b0..aa745964d80 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java @@ -11,12 +11,12 @@ package org.eclipse.cdt.codan.internal.checkers; import java.util.regex.Pattern; + import org.eclipse.cdt.codan.core.cxx.model.AbstractIndexAstChecker; -import org.eclipse.cdt.codan.core.model.AbstractProblemParameterInfo; import org.eclipse.cdt.codan.core.model.ICheckerWithParameters; import org.eclipse.cdt.codan.core.model.IProblem; -import org.eclipse.cdt.codan.core.model.IProblemParameterInfo; import org.eclipse.cdt.codan.core.model.IProblemWorkingCopy; +import org.eclipse.cdt.codan.core.param.SingleParameterInfo; import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; @@ -69,16 +69,8 @@ public class NamingConventionFunctionChecker extends AbstractIndexAstChecker * (org.eclipse.cdt.codan.core.model.IProblemWorkingCopy) */ public void initParameters(IProblemWorkingCopy problem) { - IProblemParameterInfo info = new AbstractProblemParameterInfo() { - public String getLabel() { - return "Name Pattern"; - } - - public String getKey() { - return PARAM_KEY; - } - }; - problem.setParameterInfo(info); + problem.setParameterInfo(new SingleParameterInfo(PARAM_KEY, + CheckersMessages.NamingConventionFunctionChecker_LabelNamePattern)); problem.setParameter(PARAM_KEY, DEFAULT_PATTERN); } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties new file mode 100644 index 00000000000..f6f1c85a477 --- /dev/null +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/messages.properties @@ -0,0 +1,2 @@ +NamingConventionFunctionChecker_LabelNamePattern=Name Pattern +ReturnChecker_Param0=Also check functions with implicit return value