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

Fixed NLS warnings and removed excess semicolon

Browse source 
Signed-off-by: Torbjörn Svensson <azoff@svenskalinuxforeningen.se>
Change-Id: Ife6550a77af5e410fd7b252a239dfa1ae6ae36f5
This commit is contained in:
Torbjörn Svensson 2020-06-29 19:09:02 +02:00 • committed by Jonah Graham
parent 742dc05cb8
commit 803d6cd8ad
27 changed files with 106 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/CToolChecker.java
View file

@ -41,7 +41,7 @@ import org.eclipse.core.runtime.Path;
* *
*/ */
public class CToolChecker extends AbstractCElementChecker { public class CToolChecker extends AbstractCElementChecker {
public final static String ID = "org.eclipse.cdt.codan.examples.checkers.CToolChecker.error"; public final static String ID = "org.eclipse.cdt.codan.examples.checkers.CToolChecker.error"; //$NON-NLS-1$
public static final String MAKE_PLUGIN_ID = "org.eclipse.cdt.make.core"; //$NON-NLS-1$ public static final String MAKE_PLUGIN_ID = "org.eclipse.cdt.make.core"; //$NON-NLS-1$
final ExternalToolInvoker externalToolInvoker = new ExternalToolInvoker(); final ExternalToolInvoker externalToolInvoker = new ExternalToolInvoker();
@ -56,16 +56,16 @@ public class CToolChecker extends AbstractCElementChecker {
public void processUnit(ITranslationUnit unit) { public void processUnit(ITranslationUnit unit) {
IScannerInfo scannerInfo = unit.getScannerInfo(true); IScannerInfo scannerInfo = unit.getScannerInfo(true);
List<String> res = getCompilerOptionsList(scannerInfo); List<String> res = getCompilerOptionsList(scannerInfo);
res.add("-c"); res.add("-c"); //$NON-NLS-1$
res.add("-o/dev/null"); res.add("-o/dev/null"); //$NON-NLS-1$
res.add("-O2"); res.add("-O2"); //$NON-NLS-1$
res.add("-Wall"); res.add("-Wall"); //$NON-NLS-1$
res.add("-Werror"); res.add("-Werror"); //$NON-NLS-1$
res.add(unit.getFile().getLocation().toPortableString()); res.add(unit.getFile().getLocation().toPortableString());
String args[] = res.toArray(new String[res.size()]); String args[] = res.toArray(new String[res.size()]);
try { try {
externalToolInvoker.launchOnBuildConsole(unit.getResource().getProject(), externalToolInvoker.launchOnBuildConsole(unit.getResource().getProject(),
new IConsoleParser[] { getConsoleParser(unit) }, "check", getToolPath(), args, new String[] {}, new IConsoleParser[] { getConsoleParser(unit) }, "check", getToolPath(), args, new String[] {}, //$NON-NLS-1$
getWorkingDirectory(), new NullProgressMonitor()); getWorkingDirectory(), new NullProgressMonitor());
} catch (CoreException | InvocationFailure e) { } catch (CoreException | InvocationFailure e) {
Activator.log(e); Activator.log(e);
@ -76,24 +76,24 @@ public class CToolChecker extends AbstractCElementChecker {
final Map<String, String> symbols = scannerInfo.getDefinedSymbols(); final Map<String, String> symbols = scannerInfo.getDefinedSymbols();
List<String> res = new ArrayList<>(); List<String> res = new ArrayList<>();
for (String macro : symbols.keySet()) { for (String macro : symbols.keySet()) {
if (macro.startsWith("_")) { if (macro.startsWith("_")) { //$NON-NLS-1$
continue; // likely embedded macro continue; // likely embedded macro
} }
String value = symbols.get(macro); String value = symbols.get(macro);
if (value.isEmpty()) { if (value.isEmpty()) {
res.add("-D" + macro); res.add("-D" + macro); //$NON-NLS-1$
} else { } else {
res.add("-D" + macro + "=" + value); res.add("-D" + macro + "=" + value); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }
for (String inc : scannerInfo.getIncludePaths()) { for (String inc : scannerInfo.getIncludePaths()) {
res.add("-I" + inc); res.add("-I" + inc); //$NON-NLS-1$
} }
return res; return res;
} }
protected Path getToolPath() { protected Path getToolPath() {
return new Path("gcc"); return new Path("gcc"); //$NON-NLS-1$
} }
protected IConsoleParser getConsoleParser(ITranslationUnit unit) { protected IConsoleParser getConsoleParser(ITranslationUnit unit) {

4
codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/GrepChecker.java
View file

@ -35,8 +35,8 @@ import org.eclipse.core.runtime.CoreException;
* This checker is parametrized by the search strings * This checker is parametrized by the search strings
*/ */
public class GrepChecker extends AbstractCheckerWithProblemPreferences { public class GrepChecker extends AbstractCheckerWithProblemPreferences {
public final static String ID = "org.eclipse.cdt.codan.examples.checkers.GrepCheckerProblemError"; public final static String ID = "org.eclipse.cdt.codan.examples.checkers.GrepCheckerProblemError"; //$NON-NLS-1$
private static final String PARAM_STRING_LIST = "searchlist"; private static final String PARAM_STRING_LIST = "searchlist"; //$NON-NLS-1$
@Override @Override
public synchronized boolean processResource(IResource resource) { public synchronized boolean processResource(IResource resource) {

6
codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/uicontrib/FlexlintHelpLink.java
View file

@ -17,6 +17,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.eclipse.cdt.codan.ui.AbstractCodanProblemDetailsProvider; import org.eclipse.cdt.codan.ui.AbstractCodanProblemDetailsProvider;
import org.eclipse.osgi.util.NLS;
/** /**
* Example of codan problem details provider for flexlint integration * Example of codan problem details provider for flexlint integration
@ -45,7 +46,8 @@ public class FlexlintHelpLink extends AbstractCodanProblemDetailsProvider {
@Override @Override
public String getStyledProblemDescription() { public String getStyledProblemDescription() {
String helpId = parseHelpId(getProblemMessage()); String helpId = parseHelpId(getProblemMessage());
String url = "http://www.gimpel-online.com/MsgRef.html#" + helpId; return NLS.bind(
return "<a href=\"" + url + "\">" + url + "</a>"; "<a href=\"http://www.gimpel-online.com/MsgRef.html#{0}\">http://www.gimpel-online.com/MsgRef.html#{0}</a>",
helpId);
} }
} }

12
codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/uicontrib/GrepCheckerExamplePreferenceChangeListener.java
View file

@ -68,11 +68,11 @@ public class GrepCheckerExamplePreferenceChangeListener implements INodeChangeLi
if (GrepChecker.ID.equals(event.getKey())) { if (GrepChecker.ID.equals(event.getKey())) {
// severity or enablement has changed // severity or enablement has changed
String val = (String) event.getNewValue(); String val = (String) event.getNewValue();
String fors = (" for " + ((project == null) ? "workspace" : project.getName())); String fors = (" for " + ((project == null) ? "workspace" : project.getName())); //$NON-NLS-1$ //$NON-NLS-2$
if (val != null && !val.startsWith("-")) { if (val != null && !val.startsWith("-")) { //$NON-NLS-1$
trace("grep checker enabled :)" + fors); trace("grep checker enabled :)" + fors); //$NON-NLS-1$
} else { } else {
trace("grep checker disabled :(" + fors); trace("grep checker disabled :(" + fors); //$NON-NLS-1$
} }
} }
@ -86,12 +86,12 @@ public class GrepCheckerExamplePreferenceChangeListener implements INodeChangeLi
@Override @Override
public void added(NodeChangeEvent event) { public void added(NodeChangeEvent event) {
trace("node added " + event); trace("node added " + event); //$NON-NLS-1$
} }
@Override @Override
public void removed(NodeChangeEvent event) { public void removed(NodeChangeEvent event) {
trace("node removed " + event); trace("node removed " + event); //$NON-NLS-1$
} }
/** /**

6
codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/uicontrib/GrepCheckerHelpLink.java
View file

@ -15,6 +15,7 @@ package org.eclipse.cdt.codan.examples.uicontrib;
import org.eclipse.cdt.codan.internal.core.model.CodanProblemMarker; import org.eclipse.cdt.codan.internal.core.model.CodanProblemMarker;
import org.eclipse.cdt.codan.ui.AbstractCodanProblemDetailsProvider; import org.eclipse.cdt.codan.ui.AbstractCodanProblemDetailsProvider;
import org.eclipse.osgi.util.NLS;
/** /**
* Example of codan problem details provider for string search integration * Example of codan problem details provider for string search integration
@ -22,13 +23,12 @@ import org.eclipse.cdt.codan.ui.AbstractCodanProblemDetailsProvider;
public class GrepCheckerHelpLink extends AbstractCodanProblemDetailsProvider { public class GrepCheckerHelpLink extends AbstractCodanProblemDetailsProvider {
@Override @Override
public boolean isApplicable(String id) { public boolean isApplicable(String id) {
return id.startsWith("org.eclipse.cdt.codan.examples.checkers.GrepCheckerProblem"); return id.startsWith("org.eclipse.cdt.codan.examples.checkers.GrepCheckerProblem"); //$NON-NLS-1$
} }
@Override @Override
public String getStyledProblemDescription() { public String getStyledProblemDescription() {
String arg = CodanProblemMarker.getProblemArgument(marker, 0); String arg = CodanProblemMarker.getProblemArgument(marker, 0);
String url = "http://www.google.ca/search?q=" + arg; return NLS.bind("Google <a href=\"http://www.google.ca/search?q={0}\">{0}</a>", arg);
return "Google " + "<a href=\"" + url + "\">" + arg + "</a>";
} }
} }

26
codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java
View file

@ -93,7 +93,7 @@ public class ControlFlowGraphView extends ViewPart {
/** /**
* The ID of the view as specified by the extension. * The ID of the view as specified by the extension.
*/ */
public static final String ID = "org.eclipse.cdt.codan.ui.cfgview.views.ControlFlowGraphView"; public static final String ID = "org.eclipse.cdt.codan.ui.cfgview.views.ControlFlowGraphView"; //$NON-NLS-1$
private TreeViewer viewer; private TreeViewer viewer;
private DrillDownAdapter drillDownAdapter; private DrillDownAdapter drillDownAdapter;
private Action actionSync; private Action actionSync;
@ -188,7 +188,7 @@ public class ControlFlowGraphView extends ViewPart {
public String getText(Object obj) { public String getText(Object obj) {
if (obj == null) if (obj == null)
return null; return null;
String strdata = ""; String strdata = ""; //$NON-NLS-1$
if (obj instanceof ICfgData) { if (obj instanceof ICfgData) {
strdata = ((AbstractBasicBlock) obj).toStringData(); strdata = ((AbstractBasicBlock) obj).toStringData();
} }
@ -205,25 +205,25 @@ public class ControlFlowGraphView extends ViewPart {
* @return * @return
*/ */
protected String blockHexLabel(Object obj) { protected String blockHexLabel(Object obj) {
return "0x" + Integer.toHexString(System.identityHashCode(obj)); return "0x" + Integer.toHexString(System.identityHashCode(obj)); //$NON-NLS-1$
} }
@Override @Override
public Image getImage(Object obj) { public Image getImage(Object obj) {
String imageKey = "task.png"; String imageKey = "task.png"; //$NON-NLS-1$
if (obj instanceof IDecisionNode || obj instanceof IControlFlowGraph) if (obj instanceof IDecisionNode || obj instanceof IControlFlowGraph)
imageKey = "decision.png"; imageKey = "decision.png"; //$NON-NLS-1$
else if (obj instanceof IExitNode) else if (obj instanceof IExitNode)
imageKey = "exit.png"; imageKey = "exit.png"; //$NON-NLS-1$
else if (obj instanceof IStartNode) else if (obj instanceof IStartNode)
imageKey = "start.png"; imageKey = "start.png"; //$NON-NLS-1$
else if (obj instanceof IJumpNode) else if (obj instanceof IJumpNode)
imageKey = "jump.png"; imageKey = "jump.png"; //$NON-NLS-1$
else if (obj instanceof IBranchNode) else if (obj instanceof IBranchNode)
imageKey = "labeled.png"; imageKey = "labeled.png"; //$NON-NLS-1$
else if (obj instanceof IConnectorNode) else if (obj instanceof IConnectorNode)
imageKey = "connector.png"; imageKey = "connector.png"; //$NON-NLS-1$
return ControlFlowGraphPlugin.getDefault().getImage("icons/" + imageKey); return ControlFlowGraphPlugin.getDefault().getImage("icons/" + imageKey); //$NON-NLS-1$
} }
} }
@ -251,7 +251,7 @@ public class ControlFlowGraphView extends ViewPart {
} }
private void hookContextMenu() { private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu"); MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true); menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(manager -> ControlFlowGraphView.this.fillContextMenu(manager)); menuMgr.addMenuListener(manager -> ControlFlowGraphView.this.fillContextMenu(manager));
Menu menu = menuMgr.createContextMenu(viewer.getControl()); Menu menu = menuMgr.createContextMenu(viewer.getControl());
@ -305,7 +305,7 @@ public class ControlFlowGraphView extends ViewPart {
}; };
actionSync.setText("Synchronize"); actionSync.setText("Synchronize");
actionSync.setToolTipText("Synchronize"); actionSync.setToolTipText("Synchronize");
actionSync.setImageDescriptor(ControlFlowGraphPlugin.getDefault().getImageDescriptor("icons/refresh_view.gif")); actionSync.setImageDescriptor(ControlFlowGraphPlugin.getDefault().getImageDescriptor("icons/refresh_view.gif")); //$NON-NLS-1$
} }
protected void processAst(IASTTranslationUnit ast) { protected void processAst(IASTTranslationUnit ast) {

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

@ -401,7 +401,7 @@ public class LineWrappingTabPage extends FormatterTabPage {
private final Category fMessageSendArgumentsCategory = new Category( private final Category fMessageSendArgumentsCategory = new Category(
DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION, DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
"class Other {static void bar(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {}};" //$NON-NLS-1$ "class Other {static void bar(int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {}};" //$NON-NLS-1$
+ "void foo() {Other::bar(100, 200, 300, 400, 500, 600, 700, 800, 900);}", + "void foo() {Other::bar(100, 200, 300, 400, 500, 600, 700, 800, 900);}", //$NON-NLS-1$
FormatterMessages.LineWrappingTabPage_arguments, FormatterMessages.LineWrappingTabPage_arguments_lowercase); FormatterMessages.LineWrappingTabPage_arguments, FormatterMessages.LineWrappingTabPage_arguments_lowercase);
private final Category fMethodThrowsClauseCategory = new Category( private final Category fMethodThrowsClauseCategory = new Category(

4
cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java
View file

@ -53,8 +53,8 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
// Note: The shared defaults keys don't have "cross" in them because we want to keep // Note: The shared defaults keys don't have "cross" in them because we want to keep
// compatibility with defaults that were saved when it used to be a template // compatibility with defaults that were saved when it used to be a template
static final String SHARED_DEFAULTS_PREFIX_KEY = "prefix"; static final String SHARED_DEFAULTS_PREFIX_KEY = "prefix"; //$NON-NLS-1$
static final String SHARED_DEFAULTS_PATH_KEY = "path"; static final String SHARED_DEFAULTS_PATH_KEY = "path"; //$NON-NLS-1$
public SetCrossCommandWizardPage() { public SetCrossCommandWizardPage() {
pageID = PAGE_ID; pageID = PAGE_ID;

3
terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.cdtserial;singleton:=true Bundle-SymbolicName: org.eclipse.tm.terminal.connector.cdtserial;singleton:=true
Bundle-Version: 4.7.0.qualifier Bundle-Version: 4.7.100.qualifier
Bundle-Activator: org.eclipse.tm.terminal.connector.cdtserial.activator.Activator Bundle-Activator: org.eclipse.tm.terminal.connector.cdtserial.activator.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
@ -21,3 +21,4 @@ Export-Package: org.eclipse.tm.terminal.connector.cdtserial.activator;x-internal
org.eclipse.tm.terminal.connector.cdtserial.controls, org.eclipse.tm.terminal.connector.cdtserial.controls,
org.eclipse.tm.terminal.connector.cdtserial.launcher, org.eclipse.tm.terminal.connector.cdtserial.launcher,
org.eclipse.tm.terminal.connector.cdtserial.nls;x-internal:=true org.eclipse.tm.terminal.connector.cdtserial.nls;x-internal:=true
Automatic-Module-Name: org.eclipse.tm.terminal.connector.cdtserial

3
terminal/plugins/org.eclipse.tm.terminal.connector.remote/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.remote;singleton:=true Bundle-SymbolicName: org.eclipse.tm.terminal.connector.remote;singleton:=true
Bundle-Version: 4.6.0.qualifier Bundle-Version: 4.6.100.qualifier
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
@ -28,3 +28,4 @@ Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true Eclipse-LazyStart: true
Import-Package: org.eclipse.core.resources, Import-Package: org.eclipse.core.resources,
org.eclipse.ui.ide org.eclipse.ui.ide
Automatic-Module-Name: org.eclipse.tm.terminal.connector.remote

3
terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.ssh;singleton:=true Bundle-SymbolicName: org.eclipse.tm.terminal.connector.ssh;singleton:=true
Bundle-Version: 4.6.0.qualifier Bundle-Version: 4.6.100.qualifier
Bundle-Activator: org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin Bundle-Activator: org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
@ -22,3 +22,4 @@ Export-Package: org.eclipse.tm.terminal.connector.ssh.activator;x-internal:=true
org.eclipse.tm.terminal.connector.ssh.controls, org.eclipse.tm.terminal.connector.ssh.controls,
org.eclipse.tm.terminal.connector.ssh.launcher, org.eclipse.tm.terminal.connector.ssh.launcher,
org.eclipse.tm.terminal.connector.ssh.nls;x-internal:=true org.eclipse.tm.terminal.connector.ssh.nls;x-internal:=true
Automatic-Module-Name: org.eclipse.tm.terminal.connector.ssh

2
tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateWizard.java
View file

@ -74,7 +74,7 @@ public abstract class TemplateWizard extends BasicNewResourceWizard {
IDE.openEditor(activePage, file); IDE.openEditor(activePage, file);
} }
} catch (PartInitException e) { } catch (PartInitException e) {
log("Failed to open editor", e); log("Failed to open editor", e); //$NON-NLS-1$
} }
} }

2
util/org.eclipse.cdt.util/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.util;singleton:=true Bundle-SymbolicName: org.eclipse.cdt.util;singleton:=true
Bundle-Version: 5.0.200.qualifier Bundle-Version: 5.0.300.qualifier
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.cdt.core, Require-Bundle: org.eclipse.cdt.core,
org.junit, org.junit,

2
util/org.eclipse.cdt.util/src/org/eclipse/cdt/internal/core/parser/util/DOMSearchUtil.java
View file

@ -137,7 +137,7 @@ public class DOMSearchUtil {
IBinding binding = searchName.resolveBinding(); IBinding binding = searchName.resolveBinding();
if (binding instanceof IIndexBinding) { if (binding instanceof IIndexBinding) {
fail("Not implemented"); fail("Not implemented"); //$NON-NLS-1$
// try { // try {
// ArrayList pdomNames = new ArrayList(); // ArrayList pdomNames = new ArrayList();
// IPDOMResolver pdom= ((PDOMBinding) binding).getPDOM(); // IPDOMResolver pdom= ((PDOMBinding) binding).getPDOM();

2
visualizer/org.eclipse.cdt.visualizer.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.cdt.visualizer.core;singleton:=true Bundle-SymbolicName: org.eclipse.cdt.visualizer.core;singleton:=true
Bundle-Version: 1.0.100.qualifier Bundle-Version: 1.0.200.qualifier
Bundle-Activator: org.eclipse.cdt.visualizer.core.plugin.CDTVisualizerCorePlugin Bundle-Activator: org.eclipse.cdt.visualizer.core.plugin.CDTVisualizerCorePlugin
Bundle-Vendor: %provider.name Bundle-Vendor: %provider.name
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,

2
visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/ExtensionElement.java
View file

@ -67,7 +67,7 @@ public class ExtensionElement {
/** Creates and returns instance of implementing class, using class name found in "class" attribute. */ /** Creates and returns instance of implementing class, using class name found in "class" attribute. */
public <T> T getClassAttribute() { public <T> T getClassAttribute() {
return getClassAttribute("class"); return getClassAttribute("class"); //$NON-NLS-1$
} }
/** Creates and returns instance of implementing class, using class name found in specified attribute. */ /** Creates and returns instance of implementing class, using class name found in specified attribute. */

10
visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/ResourceManager.java
View file

@ -56,7 +56,7 @@ public class ResourceManager {
* Assumes string resources are in the file "messages.properties". * Assumes string resources are in the file "messages.properties".
*/ */
public ResourceManager(Plugin plugin) { public ResourceManager(Plugin plugin) {
this(plugin, "messages.properties"); this(plugin, "messages.properties"); //$NON-NLS-1$
} }
/** Constructor */ /** Constructor */
@ -102,7 +102,7 @@ public class ResourceManager {
String filename = m_stringResourceFilename; String filename = m_stringResourceFilename;
// The ".properties" extension is assumed, so we trim it here // The ".properties" extension is assumed, so we trim it here
String propertiesExtension = ".properties"; String propertiesExtension = ".properties"; //$NON-NLS-1$
if (filename.endsWith(propertiesExtension)) { if (filename.endsWith(propertiesExtension)) {
filename = filename.substring(0, filename.length() - propertiesExtension.length()); filename = filename.substring(0, filename.length() - propertiesExtension.length());
} }
@ -116,7 +116,7 @@ public class ResourceManager {
// we'll check for .properties file first // we'll check for .properties file first
// in the same directory as the plugin activator class // in the same directory as the plugin activator class
String propertyFileName1 = m_pluginID + ".plugin." + filename; String propertyFileName1 = m_pluginID + ".plugin." + filename; //$NON-NLS-1$
try { try {
m_stringResources = ResourceBundle.getBundle(propertyFileName1, locale, classLoader); m_stringResources = ResourceBundle.getBundle(propertyFileName1, locale, classLoader);
} catch (MissingResourceException e) { } catch (MissingResourceException e) {
@ -155,7 +155,7 @@ public class ResourceManager {
if (strings == null) { if (strings == null) {
// if we can't get the registry, display the key instead, // if we can't get the registry, display the key instead,
// so we know what's missing (e.g. the .properties file) // so we know what's missing (e.g. the .properties file)
result = "(" + key + ")"; result = "(" + key + ")"; //$NON-NLS-1$ //$NON-NLS-2$
} else { } else {
try { try {
result = strings.getString(key); result = strings.getString(key);
@ -175,7 +175,7 @@ public class ResourceManager {
// if we still fail, display the key instead, // if we still fail, display the key instead,
// so we know what's missing // so we know what's missing
if (result == null) if (result == null)
result = "[" + key + "]"; result = "[" + key + "]"; //$NON-NLS-1$ //$NON-NLS-2$
return result; return result;
} }

2
visualizer/org.eclipse.cdt.visualizer.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.cdt.visualizer.ui;singleton:=true Bundle-SymbolicName: org.eclipse.cdt.visualizer.ui;singleton:=true
Bundle-Version: 1.3.200.qualifier Bundle-Version: 1.3.300.qualifier
Bundle-Activator: org.eclipse.cdt.visualizer.ui.plugin.CDTVisualizerUIPlugin Bundle-Activator: org.eclipse.cdt.visualizer.ui.plugin.CDTVisualizerUIPlugin
Bundle-Vendor: %provider.name Bundle-Vendor: %provider.name
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,

6
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerViewer.java
View file

@ -274,7 +274,7 @@ public class VisualizerViewer extends PageBook
if (visualizers != null) { if (visualizers != null) {
for (Extension e : visualizers) { for (Extension e : visualizers) {
String id = e.getAttribute("id"); String id = e.getAttribute("id"); //$NON-NLS-1$
IVisualizer visualizerInstance = e.getClassAttribute(); IVisualizer visualizerInstance = e.getClassAttribute();
if (id != null && visualizerInstance != null) { if (id != null && visualizerInstance != null) {
// Add visualizer's control to viewer's "pagebook" of controls. // Add visualizer's control to viewer's "pagebook" of controls.
@ -412,8 +412,8 @@ public class VisualizerViewer extends PageBook
public void paint(GC gc) { public void paint(GC gc) {
gc.fillRectangle(getClientArea()); gc.fillRectangle(getClientArea());
if (m_visualizers == null || m_visualizers.size() == 0) { if (m_visualizers == null || m_visualizers.size() == 0) {
String noVisualizersMessage = CDTVisualizerUIPlugin.getString("VisualizerViewer.no.visualizers.defined"); String noVisualizersMessage = CDTVisualizerUIPlugin.getString("VisualizerViewer.no.visualizers.defined"); //$NON-NLS-1$
gc.drawString("(" + noVisualizersMessage + ")", 10, 10); gc.drawString("(" + noVisualizersMessage + ")", 10, 10); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }

3
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/BufferedCanvas.java
View file

@ -165,7 +165,8 @@ public class BufferedCanvas extends Canvas implements PaintListener, ControlList
} catch (Throwable t) { } catch (Throwable t) {
// Throwing an exception in painting code can hang Eclipse, // Throwing an exception in painting code can hang Eclipse,
// so catch any exceptions here. // so catch any exceptions here.
System.err.println("BufferedCanvas: Exception thrown in painting code: \n" + t); System.err.println("BufferedCanvas: Exception thrown in painting code: \n"); //$NON-NLS-1$
t.printStackTrace(System.err);
} }
// then copy image buffer to actual canvas (reduces repaint flickering) // then copy image buffer to actual canvas (reduces repaint flickering)

10
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/VirtualBoundsGraphicObject.java
View file

@ -97,7 +97,7 @@ public class VirtualBoundsGraphicObject extends GraphicObject {
/** Returns string representation. */ /** Returns string representation. */
@Override @Override
public String toString() { public String toString() {
return String.format("Class: %s, Real bounds: %s, Virtual bounds: %s" + ", Draw container bounds: %s ", return String.format("Class: %s, Real bounds: %s, Virtual bounds: %s, Draw container bounds: %s ", //$NON-NLS-1$
this.getClass().getSimpleName(), this.getBounds().toString(), m_virtualBounds.toString(), this.getClass().getSimpleName(), this.getBounds().toString(), m_virtualBounds.toString(),
m_drawContainerBounds); m_drawContainerBounds);
} }
@ -211,16 +211,16 @@ public class VirtualBoundsGraphicObject extends GraphicObject {
/** Performs a sanity check of the virtual bounds of this object */ /** Performs a sanity check of the virtual bounds of this object */
private void checkVirtualBounds() { private void checkVirtualBounds() {
if (m_virtualBounds.x < 0) { if (m_virtualBounds.x < 0) {
throw new IllegalArgumentException("Illegal x: " + m_virtualBounds.x); throw new IllegalArgumentException("Illegal x: " + m_virtualBounds.x); //$NON-NLS-1$
} }
if (m_virtualBounds.y < 0) { if (m_virtualBounds.y < 0) {
throw new IllegalArgumentException("Illegal y: " + m_virtualBounds.y); throw new IllegalArgumentException("Illegal y: " + m_virtualBounds.y); //$NON-NLS-1$
} }
if (m_virtualBounds.width <= 0) { if (m_virtualBounds.width <= 0) {
throw new IllegalArgumentException("Illegal width: " + m_virtualBounds.width); throw new IllegalArgumentException("Illegal width: " + m_virtualBounds.width); //$NON-NLS-1$
} }
if (m_virtualBounds.height <= 0) { if (m_virtualBounds.height <= 0) {
throw new IllegalArgumentException("Illegal height: " + m_virtualBounds.height); throw new IllegalArgumentException("Illegal height: " + m_virtualBounds.height); //$NON-NLS-1$
} }
} }

4
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/events/VisualizerViewerEvent.java
View file

@ -66,10 +66,10 @@ public class VisualizerViewerEvent extends Event {
/** Converts event type to string */ /** Converts event type to string */
@Override @Override
public String typeToString(int type) { public String typeToString(int type) {
String result = ""; String result = ""; //$NON-NLS-1$
switch (type) { switch (type) {
case VISUALIZER_CHANGED: case VISUALIZER_CHANGED:
result = "VISUALIZER_CHANGED"; result = "VISUALIZER_CHANGED"; //$NON-NLS-1$
break; break;
default: default:
result = super.typeToString(type); result = super.typeToString(type);

2
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvas.java
View file

@ -93,7 +93,7 @@ public class TestCanvas extends GraphicCanvas {
/** Draw string, wrapping if there are any newline chars. */ /** Draw string, wrapping if there are any newline chars. */
public static void drawStringWrapNewlines(GC gc, String text, int x, int y, int lineHeight) { public static void drawStringWrapNewlines(GC gc, String text, int x, int y, int lineHeight) {
if (text != null) { if (text != null) {
String[] lines = text.split("\n"); String[] lines = text.split("\n"); //$NON-NLS-1$
for (int i = 0; i < lines.length; i++) { for (int i = 0; i < lines.length; i++) {
gc.drawString(lines[i], x, y, true); // transparent gc.drawString(lines[i], x, y, true); // transparent
y += lineHeight; y += lineHeight;

4
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java
View file

@ -34,7 +34,7 @@ public class TestCanvasVisualizer extends GraphicCanvasVisualizer {
// --- constants --- // --- constants ---
/** Eclipse ID for this visualizer */ /** Eclipse ID for this visualizer */
public static final String ECLIPSE_ID = "org.eclipse.cdt.visualizer.ui.test.TestCanvasVisualizer"; public static final String ECLIPSE_ID = "org.eclipse.cdt.visualizer.ui.test.TestCanvasVisualizer"; //$NON-NLS-1$
// --- members --- // --- members ---
@ -55,7 +55,7 @@ public class TestCanvasVisualizer extends GraphicCanvasVisualizer {
/** Returns non-localized unique name for this visualizer. */ /** Returns non-localized unique name for this visualizer. */
@Override @Override
public String getName() { public String getName() {
return "default"; return "default"; //$NON-NLS-1$
} }
/** Returns localized name to display for this visualizer. */ /** Returns localized name to display for this visualizer. */

10
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Event.java
View file

@ -61,23 +61,23 @@ public class Event {
public String toString() { public String toString() {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
result.append(getClass().getSimpleName()); result.append(getClass().getSimpleName());
result.append("["); result.append("["); //$NON-NLS-1$
if (m_type != UNDEFINED) { if (m_type != UNDEFINED) {
result.append(typeToString(m_type)); result.append(typeToString(m_type));
} }
result.append("]"); result.append("]"); //$NON-NLS-1$
return result.toString(); return result.toString();
} }
/** Converts event type to string */ /** Converts event type to string */
public String typeToString(int type) { public String typeToString(int type) {
String result = ""; String result = ""; //$NON-NLS-1$
switch (type) { switch (type) {
case UNDEFINED: case UNDEFINED:
result = "UNDEFINED"; result = "UNDEFINED"; //$NON-NLS-1$
break; break;
default: default:
result = "OTHER(" + type + ")"; result = "OTHER(" + type + ")"; //$NON-NLS-1$ //$NON-NLS-2$
break; break;
} }
return result; return result;

4
visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/UIResourceManager.java
View file

@ -258,7 +258,7 @@ public class UIResourceManager extends ResourceManager {
/** Gets/creates font with specified properties */ /** Gets/creates font with specified properties */
protected Font getCachedFont(String fontName, int height, int style) { protected Font getCachedFont(String fontName, int height, int style) {
Font result = null; Font result = null;
String fontID = fontName + "," + height + "," + style; String fontID = fontName + "," + height + "," + style; //$NON-NLS-1$ //$NON-NLS-2$
// look for the cached font (this checks the parent manager too) // look for the cached font (this checks the parent manager too)
result = getCachedFont(fontID); result = getCachedFont(fontID);
@ -333,7 +333,7 @@ public class UIResourceManager extends ResourceManager {
/** Gets/creates color with specified properties */ /** Gets/creates color with specified properties */
protected Color getCachedColor(int red, int green, int blue) { protected Color getCachedColor(int red, int green, int blue) {
Color result = null; Color result = null;
String colorID = "Color[R=" + red + ",G=" + green + ",B=" + blue + "]"; String colorID = "Color[R=" + red + ",G=" + green + ",B=" + blue + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
// look for the cached color (this checks the parent manager too) // look for the cached color (this checks the parent manager too)
result = getCachedColor(colorID); result = getCachedColor(colorID);

48
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
View file

@ -50,7 +50,7 @@ public class WinEnvironmentVariableSupplier
@Override @Override
public String getDelimiter() { public String getDelimiter() {
return ";"; return ";"; //$NON-NLS-1$
} }
@Override @Override
@ -98,10 +98,10 @@ public class WinEnvironmentVariableSupplier
} }
private static String getSoftwareKey(WindowsRegistry reg, String subkey, String name) { private static String getSoftwareKey(WindowsRegistry reg, String subkey, String name) {
String value = reg.getLocalMachineValue("SOFTWARE\\" + subkey, name); String value = reg.getLocalMachineValue("SOFTWARE\\" + subkey, name); //$NON-NLS-1$
// Visual Studio is a 32 bit application so on Windows 64 the keys will be in Wow6432Node // Visual Studio is a 32 bit application so on Windows 64 the keys will be in Wow6432Node
if (value == null) { if (value == null) {
value = reg.getLocalMachineValue("SOFTWARE\\Wow6432Node\\" + subkey, name); value = reg.getLocalMachineValue("SOFTWARE\\Wow6432Node\\" + subkey, name); //$NON-NLS-1$
} }
return value; return value;
} }
@ -111,36 +111,36 @@ public class WinEnvironmentVariableSupplier
// or Windows SDK 7.0 with Visual C++ 9.0 // or Windows SDK 7.0 with Visual C++ 9.0
private static String getSDKDir() { private static String getSDKDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
String sdkDir = getSoftwareKey(reg, "Microsoft\\Microsoft SDKs\\Windows\\v8.0", "InstallationFolder"); String sdkDir = getSoftwareKey(reg, "Microsoft\\Microsoft SDKs\\Windows\\v8.0", "InstallationFolder"); //$NON-NLS-1$ //$NON-NLS-2$
if (sdkDir != null) if (sdkDir != null)
return sdkDir; return sdkDir;
sdkDir = getSoftwareKey(reg, "Microsoft\\Microsoft SDKs\\Windows\\v7.1", "InstallationFolder"); sdkDir = getSoftwareKey(reg, "Microsoft\\Microsoft SDKs\\Windows\\v7.1", "InstallationFolder"); //$NON-NLS-1$ //$NON-NLS-2$
if (sdkDir != null) if (sdkDir != null)
return sdkDir; return sdkDir;
return getSoftwareKey(reg, "Microsoft SDKs\\Windows\\v7.0", "InstallationFolder"); return getSoftwareKey(reg, "Microsoft SDKs\\Windows\\v7.0", "InstallationFolder"); //$NON-NLS-1$ //$NON-NLS-2$
} }
private static String getVCDir() { private static String getVCDir() {
WindowsRegistry reg = WindowsRegistry.getRegistry(); WindowsRegistry reg = WindowsRegistry.getRegistry();
String vcDir = getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "11.0"); String vcDir = getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "11.0"); //$NON-NLS-1$ //$NON-NLS-2$
if (vcDir != null) if (vcDir != null)
return vcDir; return vcDir;
vcDir = getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "10.0"); vcDir = getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "10.0"); //$NON-NLS-1$ //$NON-NLS-2$
if (vcDir != null) if (vcDir != null)
return vcDir; return vcDir;
return getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "9.0"); return getSoftwareKey(reg, "Microsoft\\VisualStudio\\SxS\\VC7", "9.0"); //$NON-NLS-1$ //$NON-NLS-2$
} }
public static IPath[] getIncludePath() { public static IPath[] getIncludePath() {
// Include paths // Include paths
List<IPath> includePaths = new ArrayList<>(); List<IPath> includePaths = new ArrayList<>();
if (sdkDir != null) { if (sdkDir != null) {
includePaths.add(new Path(sdkDir.concat("Include"))); includePaths.add(new Path(sdkDir.concat("Include"))); //$NON-NLS-1$
includePaths.add(new Path(sdkDir.concat("Include\\gl"))); includePaths.add(new Path(sdkDir.concat("Include\\gl"))); //$NON-NLS-1$
} }
if (vcDir != null) { if (vcDir != null) {
includePaths.add(new Path(vcDir.concat("Include"))); includePaths.add(new Path(vcDir.concat("Include"))); //$NON-NLS-1$
} }
return includePaths.toArray(new IPath[0]); return includePaths.toArray(new IPath[0]);
} }
@ -168,32 +168,32 @@ public class WinEnvironmentVariableSupplier
for (IPath path : includePaths) { for (IPath path : includePaths) {
buff.append(path.toOSString()).append(';'); buff.append(path.toOSString()).append(';');
} }
addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), //$NON-NLS-1$
IBuildEnvironmentVariable.ENVVAR_PREPEND)); IBuildEnvironmentVariable.ENVVAR_PREPEND));
// LIB // LIB
buff = new StringBuilder(); buff = new StringBuilder();
if (vcDir != null) if (vcDir != null)
buff.append(vcDir).append("Lib;"); buff.append(vcDir).append("Lib;"); //$NON-NLS-1$
if (sdkDir != null) { if (sdkDir != null) {
buff.append(sdkDir).append("Lib;"); buff.append(sdkDir).append("Lib;"); //$NON-NLS-1$
buff.append(sdkDir).append("Lib\\win8\\um\\x86;"); buff.append(sdkDir).append("Lib\\win8\\um\\x86;"); //$NON-NLS-1$
} }
addvar(new WindowsBuildEnvironmentVariable("LIB", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); addvar(new WindowsBuildEnvironmentVariable("LIB", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); //$NON-NLS-1$
// PATH // PATH
buff = new StringBuilder(); buff = new StringBuilder();
if (vcDir != null) { if (vcDir != null) {
buff.append(vcDir).append("..\\Common7\\IDE;"); buff.append(vcDir).append("..\\Common7\\IDE;"); //$NON-NLS-1$
buff.append(vcDir).append("..\\Common7\\Tools;"); buff.append(vcDir).append("..\\Common7\\Tools;"); //$NON-NLS-1$
buff.append(vcDir).append("Bin;"); buff.append(vcDir).append("Bin;"); //$NON-NLS-1$
buff.append(vcDir).append("vcpackages;"); buff.append(vcDir).append("vcpackages;"); //$NON-NLS-1$
} }
if (sdkDir != null) { if (sdkDir != null) {
buff.append(sdkDir).append("Bin;"); buff.append(sdkDir).append("Bin;"); //$NON-NLS-1$
} }
addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND)); //$NON-NLS-1$
} };
} }