From 7c519790372f3f407a6ddc0f1db115fefc208e68 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Thu, 26 Mar 2009 15:51:12 +0000 Subject: [PATCH] Fixes warnings. --- .../tests/ErrorParserEfsFileMatchingTest.java | 2 +- .../src/org/eclipse/cdt/core/CCorePlugin.java | 4 ++- .../browser/typeinfo/TypeSelectionDialog.java | 5 ---- .../cdt/internal/ui/editor/CEditor.java | 24 ++++++++-------- .../ProjectLanguageMappingWidget.java | 4 +-- .../CEditorHoverConfigurationBlock.java | 8 ++---- .../formatter/LineWrappingTabPage.java | 10 +++---- .../ui/text/c/hover/CMacroExpansionInput.java | 6 +--- .../DefaultCFoldingStructureProvider.java | 28 +++++++++---------- .../wizards/dialogfields/ListDialogField.java | 8 ++---- .../dialogfields/TreeListDialogField.java | 6 +--- .../src/org/eclipse/cdt/ui/CUIPlugin.java | 1 + .../eclipse/cdt/ui/dialogs/IndexerBlock.java | 4 --- 13 files changed, 43 insertions(+), 67 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java index 0f548f86e4f..0a3db7374cf 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java @@ -1 +1 @@ -/******************************************************************************* * Copyright (c) 2009 Andrew Gvozdev and others. * 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: * Andrew Gvozdev - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.core.internal.errorparsers.tests; import java.io.ByteArrayInputStream; import java.util.ArrayList; import junit.framework.Assert; import junit.framework.TestCase; import junit.framework.TestSuite; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IErrorParser; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.errorparsers.AbstractErrorParser; import org.eclipse.cdt.core.errorparsers.ErrorPattern; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.internal.registry.ExtensionRegistry; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.ContributorFactoryOSGi; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; /** * The test case includes a few tests checking that {@link AbstractErrorParser}/{@link ErrorPattern} * properly locate and resolve filenames found in build output in case of EFS files/folders. */ public class ErrorParserEfsFileMatchingTest extends TestCase { private final static String testName = "FindMatchingFilesEfsTest"; // Default project gets created once then used by all test cases. private IProject fProject = null; private String mockErrorParserId = null; private ArrayList errorList; private final IMarkerGenerator markerGenerator = new IMarkerGenerator() { // deprecated public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {} public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); } }; /** * Simple error parser parsing line like "file:line:description" */ public static class MockErrorParser extends AbstractErrorParser { /** * Constructor to set the error pattern. */ public MockErrorParser() { super(new ErrorPattern[] { new ErrorPattern("(.*):(.*):(.*)", 1, 2, 3, 0, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) }); } } /** * Constructor. * @param name - name of the test. */ public ErrorParserEfsFileMatchingTest(String name) { super(name); } @Override protected void setUp() throws Exception { if (fProject==null) { fProject = ResourceHelper.createCDTProject(testName); Assert.assertNotNull(fProject); mockErrorParserId = addErrorParserExtension("MockErrorParser", MockErrorParser.class); } errorList = new ArrayList(); } @Override protected void tearDown() { } /** * @return - new TestSuite. */ public static TestSuite suite() { return new TestSuite(ErrorParserEfsFileMatchingTest.class); } /** * main function of the class. * * @param args - arguments */ public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } /** * Adds Error Parser extension to the global repository. * Note that this function will "pollute" the working environment and * the error parser will be seen by other test cases as well. * * @param shortId - last portion of ID with which error parser will be added. * @param cl - Error Parser class * @return - full ID of the error parser (generated by the method). */ private static String addErrorParserExtension(String shortId, Class cl) { String ext = "" + "" + ""; IContributor contributor = ContributorFactoryOSGi.createContributor(CTestPlugin.getDefault().getBundle()); boolean added = Platform.getExtensionRegistry().addContribution(new ByteArrayInputStream(ext.getBytes()), contributor, false, shortId, null, ((ExtensionRegistry) Platform.getExtensionRegistry()).getTemporaryUserToken()); assertTrue("failed to add extension", added); String fullId = "org.eclipse.cdt.core.tests." + shortId; IErrorParser[] errorParser = CCorePlugin.getDefault().getErrorParser(fullId); assertTrue(errorParser.length > 0); return fullId; } /** * Convenience method to let {@link ErrorParserManager} parse one line of output. * This method goes through the whole working cycle every time creating * new {@link ErrorParserManager}. * * @param project - for which project to parse output. * @param buildDir - location of build for {@link ErrorParserManager}. * @param line - one line of output. * @throws Exception */ private void parseOutput(IProject project, IPath buildDir, String line) throws Exception { ErrorParserManager epManager = new ErrorParserManager(project, buildDir, markerGenerator, new String[] { mockErrorParserId }); line = line + '\n'; epManager.write(line.getBytes(), 0, line.length()); epManager.close(); epManager.reportProblems(); } /** * Convenience method to parse one line of output. */ private void parseOutput(IProject project, String buildDir, String line) throws Exception { parseOutput(project, new Path(buildDir), line); } /** * Convenience method to parse one line of output. * Search is done in project location. */ private void parseOutput(IProject project, String line) throws Exception { parseOutput(project, project.getLocation(), line); } /** * Convenience method to parse one line of output. * Search is done for current project in default location. */ private void parseOutput(String line) throws Exception { parseOutput(fProject, fProject.getLocation(), line); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testSingle() throws Exception { ResourceHelper.createEfsFile(fProject, "testSingle.c", "null:/efsTestSingle.c"); parseOutput("efsTestSingle.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/testSingle.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testEfsVsRegular() throws Exception { ResourceHelper.createFile(fProject, "testEfsVsRegular.c"); ResourceHelper.createEfsFile(fProject, "efsTestEfsVsRegular.c", "null:/testEfsVsRegular.c"); parseOutput("testEfsVsRegular.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/testEfsVsRegular.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testFullPath() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testFullPath.c", "null:/EfsFolder/efsTestFullPath.c"); parseOutput("EfsFolder/efsTestFullPath.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testFullPath.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testInNonEfsFolder() throws Exception { ResourceHelper.createFolder(fProject, "NonEfsFolder"); ResourceHelper.createEfsFile(fProject, "NonEfsFolder/testInNonEfsFolder.c", "null:/EfsFolder/efsTestInNonEfsFolder.c"); parseOutput("efsTestInNonEfsFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/NonEfsFolder/testInNonEfsFolder.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testInFolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testInFolder.c", "null:/EfsFolder/efsTestInFolder.c"); parseOutput("efsTestInFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testInFolder.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testDuplicateInRoot() throws Exception { ResourceHelper.createEfsFile(fProject, "testDuplicateInRoot.c", "null:/testDuplicateInRoot.c"); ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testDuplicateInRoot.c", "null:/Folder/testDuplicateInRoot.c"); // Resolved to the file in root folder parseOutput("testDuplicateInRoot.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("L/FindMatchingFilesEfsTest/testDuplicateInRoot.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathFromProjectRoot() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathFromProjectRoot.c", "null:/EfsFolder/testRelativePathFromProjectRoot.c"); parseOutput("EfsFolder/testRelativePathFromProjectRoot.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testRelativePathFromProjectRoot.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathFromSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Subfolder", "null:/Subfolder"); ResourceHelper.createEfsFolder(fProject, "Subfolder/Folder", "null:/Subfolder/Folder"); ResourceHelper.createEfsFile(fProject, "Subfolder/Folder/testRelativePathFromSubfolder.c", "null:/Subfolder/Folder/testRelativePathFromSubfolder.c"); parseOutput("Folder/testRelativePathFromSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Subfolder/Folder/testRelativePathFromSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathNotMatchingFolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathNotMatchingFolder.c", "null:/Folder/testRelativePathNotMatchingFolder.c"); parseOutput("NotMatchingFolder/testRelativePathNotMatchingFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // No match assertEquals("P/FindMatchingFilesEfsTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); assertEquals(new Path("NotMatchingFolder/testRelativePathNotMatchingFolder.c"),problemMarkerInfo.externalPath); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathDuplicate() throws Exception { ResourceHelper.createEfsFolder(fProject, "SubfolderA", "null:/SubfolderA"); ResourceHelper.createEfsFolder(fProject, "SubfolderA/Folder", "null:/SubfolderA/Folder"); ResourceHelper.createEfsFile(fProject, "SubfolderA/Folder/testRelativePathDuplicate.c", "null:/SubfolderA/Folder/testRelativePathDuplicate.c"); ResourceHelper.createEfsFolder(fProject, "SubfolderB", "null:/SubfolderB"); ResourceHelper.createEfsFolder(fProject, "SubfolderB/Folder", "null:/SubfolderB/Folder"); ResourceHelper.createEfsFile(fProject, "SubfolderB/Folder/testRelativePathDuplicate.c", "null:/SubfolderBS/Folder/testRelativePathDuplicate.c"); parseOutput("Folder/testRelativePathDuplicate.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // No match found assertEquals("P/FindMatchingFilesEfsTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); assertEquals(new Path("Folder/testRelativePathDuplicate.c"),problemMarkerInfo.externalPath); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathUpSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathUpSubfolder.c", "null:/Folder/testRelativePathUpSubfolder.c"); parseOutput("../Folder/testRelativePathUpSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testRelativePathUpSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathDotFromSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Subfolder", "null:/Subfolder"); ResourceHelper.createEfsFolder(fProject, "Subfolder/Folder", "null:/Subfolder/Folder"); ResourceHelper.createEfsFile(fProject, "Subfolder/Folder/testRelativePathDotFromSubfolder.c", "null:/Subfolder/Folder/testRelativePathDotFromSubfolder.c"); parseOutput("./Folder/testRelativePathDotFromSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Subfolder/Folder/testRelativePathDotFromSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testBuildDir() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testBuildDir.c", "null:/Folder/testBuildDir.c"); ResourceHelper.createEfsFolder(fProject, "BuildDir", "null:/BuildDir"); ResourceHelper.createEfsFile(fProject, "BuildDir/testBuildDir.c", "null:/BuildDir/testBuildDir.c"); String buildDir = fProject.getLocation().append("BuildDir").toOSString(); parseOutput(fProject, buildDir, "testBuildDir.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/BuildDir/testBuildDir.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } } \ No newline at end of file +/******************************************************************************* * Copyright (c) 2009 Andrew Gvozdev and others. * 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: * Andrew Gvozdev - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.core.internal.errorparsers.tests; import java.io.ByteArrayInputStream; import java.util.ArrayList; import junit.framework.Assert; import junit.framework.TestCase; import junit.framework.TestSuite; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IErrorParser; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.errorparsers.AbstractErrorParser; import org.eclipse.cdt.core.errorparsers.ErrorPattern; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.internal.registry.ExtensionRegistry; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.ContributorFactoryOSGi; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; /** * The test case includes a few tests checking that {@link AbstractErrorParser}/{@link ErrorPattern} * properly locate and resolve filenames found in build output in case of EFS files/folders. */ public class ErrorParserEfsFileMatchingTest extends TestCase { private final static String testName = "FindMatchingFilesEfsTest"; // Default project gets created once then used by all test cases. private IProject fProject = null; private String mockErrorParserId = null; private ArrayList errorList; private final IMarkerGenerator markerGenerator = new IMarkerGenerator() { // deprecated public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {} public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); } }; /** * Simple error parser parsing line like "file:line:description" */ public static class MockErrorParser extends AbstractErrorParser { /** * Constructor to set the error pattern. */ public MockErrorParser() { super(new ErrorPattern[] { new ErrorPattern("(.*):(.*):(.*)", 1, 2, 3, 0, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) }); } } /** * Constructor. * @param name - name of the test. */ public ErrorParserEfsFileMatchingTest(String name) { super(name); } @Override protected void setUp() throws Exception { if (fProject==null) { fProject = ResourceHelper.createCDTProject(testName); Assert.assertNotNull(fProject); mockErrorParserId = addErrorParserExtension("MockErrorParser", MockErrorParser.class); } errorList = new ArrayList(); } @Override protected void tearDown() { } /** * @return - new TestSuite. */ public static TestSuite suite() { return new TestSuite(ErrorParserEfsFileMatchingTest.class); } /** * main function of the class. * * @param args - arguments */ public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } /** * Adds Error Parser extension to the global repository. * Note that this function will "pollute" the working environment and * the error parser will be seen by other test cases as well. * * @param shortId - last portion of ID with which error parser will be added. * @param cl - Error Parser class * @return - full ID of the error parser (generated by the method). */ private static String addErrorParserExtension(String shortId, Class cl) { String ext = "" + "" + ""; IContributor contributor = ContributorFactoryOSGi.createContributor(CTestPlugin.getDefault().getBundle()); boolean added = Platform.getExtensionRegistry().addContribution(new ByteArrayInputStream(ext.getBytes()), contributor, false, shortId, null, ((ExtensionRegistry) Platform.getExtensionRegistry()).getTemporaryUserToken()); assertTrue("failed to add extension", added); String fullId = "org.eclipse.cdt.core.tests." + shortId; IErrorParser[] errorParser = CCorePlugin.getDefault().getErrorParser(fullId); assertTrue(errorParser.length > 0); return fullId; } /** * Convenience method to let {@link ErrorParserManager} parse one line of output. * This method goes through the whole working cycle every time creating * new {@link ErrorParserManager}. * * @param project - for which project to parse output. * @param buildDir - location of build for {@link ErrorParserManager}. * @param line - one line of output. * @throws Exception */ private void parseOutput(IProject project, IPath buildDir, String line) throws Exception { ErrorParserManager epManager = new ErrorParserManager(project, buildDir, markerGenerator, new String[] { mockErrorParserId }); line = line + '\n'; epManager.write(line.getBytes(), 0, line.length()); epManager.close(); epManager.reportProblems(); } /** * Convenience method to parse one line of output. */ private void parseOutput(IProject project, String buildDir, String line) throws Exception { parseOutput(project, new Path(buildDir), line); } // /** // * Convenience method to parse one line of output. // * Search is done in project location. // */ // private void parseOutput(IProject project, String line) throws Exception { // parseOutput(project, project.getLocation(), line); // } /** * Convenience method to parse one line of output. * Search is done for current project in default location. */ private void parseOutput(String line) throws Exception { parseOutput(fProject, fProject.getLocation(), line); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testSingle() throws Exception { ResourceHelper.createEfsFile(fProject, "testSingle.c", "null:/efsTestSingle.c"); parseOutput("efsTestSingle.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/testSingle.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testEfsVsRegular() throws Exception { ResourceHelper.createFile(fProject, "testEfsVsRegular.c"); ResourceHelper.createEfsFile(fProject, "efsTestEfsVsRegular.c", "null:/testEfsVsRegular.c"); parseOutput("testEfsVsRegular.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/testEfsVsRegular.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testFullPath() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testFullPath.c", "null:/EfsFolder/efsTestFullPath.c"); parseOutput("EfsFolder/efsTestFullPath.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testFullPath.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testInNonEfsFolder() throws Exception { ResourceHelper.createFolder(fProject, "NonEfsFolder"); ResourceHelper.createEfsFile(fProject, "NonEfsFolder/testInNonEfsFolder.c", "null:/EfsFolder/efsTestInNonEfsFolder.c"); parseOutput("efsTestInNonEfsFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/NonEfsFolder/testInNonEfsFolder.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testInFolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testInFolder.c", "null:/EfsFolder/efsTestInFolder.c"); parseOutput("efsTestInFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testInFolder.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testDuplicateInRoot() throws Exception { ResourceHelper.createEfsFile(fProject, "testDuplicateInRoot.c", "null:/testDuplicateInRoot.c"); ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testDuplicateInRoot.c", "null:/Folder/testDuplicateInRoot.c"); // Resolved to the file in root folder parseOutput("testDuplicateInRoot.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("L/FindMatchingFilesEfsTest/testDuplicateInRoot.c",problemMarkerInfo.file.toString()); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathFromProjectRoot() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathFromProjectRoot.c", "null:/EfsFolder/testRelativePathFromProjectRoot.c"); parseOutput("EfsFolder/testRelativePathFromProjectRoot.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testRelativePathFromProjectRoot.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathFromSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Subfolder", "null:/Subfolder"); ResourceHelper.createEfsFolder(fProject, "Subfolder/Folder", "null:/Subfolder/Folder"); ResourceHelper.createEfsFile(fProject, "Subfolder/Folder/testRelativePathFromSubfolder.c", "null:/Subfolder/Folder/testRelativePathFromSubfolder.c"); parseOutput("Folder/testRelativePathFromSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Subfolder/Folder/testRelativePathFromSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathNotMatchingFolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathNotMatchingFolder.c", "null:/Folder/testRelativePathNotMatchingFolder.c"); parseOutput("NotMatchingFolder/testRelativePathNotMatchingFolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // No match assertEquals("P/FindMatchingFilesEfsTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); assertEquals(new Path("NotMatchingFolder/testRelativePathNotMatchingFolder.c"),problemMarkerInfo.externalPath); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathDuplicate() throws Exception { ResourceHelper.createEfsFolder(fProject, "SubfolderA", "null:/SubfolderA"); ResourceHelper.createEfsFolder(fProject, "SubfolderA/Folder", "null:/SubfolderA/Folder"); ResourceHelper.createEfsFile(fProject, "SubfolderA/Folder/testRelativePathDuplicate.c", "null:/SubfolderA/Folder/testRelativePathDuplicate.c"); ResourceHelper.createEfsFolder(fProject, "SubfolderB", "null:/SubfolderB"); ResourceHelper.createEfsFolder(fProject, "SubfolderB/Folder", "null:/SubfolderB/Folder"); ResourceHelper.createEfsFile(fProject, "SubfolderB/Folder/testRelativePathDuplicate.c", "null:/SubfolderBS/Folder/testRelativePathDuplicate.c"); parseOutput("Folder/testRelativePathDuplicate.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // No match found assertEquals("P/FindMatchingFilesEfsTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); assertEquals(new Path("Folder/testRelativePathDuplicate.c"),problemMarkerInfo.externalPath); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathUpSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testRelativePathUpSubfolder.c", "null:/Folder/testRelativePathUpSubfolder.c"); parseOutput("../Folder/testRelativePathUpSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Folder/testRelativePathUpSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testRelativePathDotFromSubfolder() throws Exception { ResourceHelper.createEfsFolder(fProject, "Subfolder", "null:/Subfolder"); ResourceHelper.createEfsFolder(fProject, "Subfolder/Folder", "null:/Subfolder/Folder"); ResourceHelper.createEfsFile(fProject, "Subfolder/Folder/testRelativePathDotFromSubfolder.c", "null:/Subfolder/Folder/testRelativePathDotFromSubfolder.c"); parseOutput("./Folder/testRelativePathDotFromSubfolder.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/Subfolder/Folder/testRelativePathDotFromSubfolder.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } /** * Checks if a file from error output can be found. * @throws Exception... */ public void testBuildDir() throws Exception { ResourceHelper.createEfsFolder(fProject, "Folder", "null:/Folder"); ResourceHelper.createEfsFile(fProject, "Folder/testBuildDir.c", "null:/Folder/testBuildDir.c"); ResourceHelper.createEfsFolder(fProject, "BuildDir", "null:/BuildDir"); ResourceHelper.createEfsFile(fProject, "BuildDir/testBuildDir.c", "null:/BuildDir/testBuildDir.c"); String buildDir = fProject.getLocation().append("BuildDir").toOSString(); parseOutput(fProject, buildDir, "testBuildDir.c:1:error"); assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); assertEquals("L/FindMatchingFilesEfsTest/BuildDir/testBuildDir.c",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); assertEquals("error",problemMarkerInfo.description); } } \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index b125309ffd8..78e13cacca1 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.core; import java.io.IOException; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -82,6 +81,8 @@ import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.jobs.Job; import org.osgi.framework.BundleContext; +import com.ibm.icu.text.MessageFormat; + /** * CCorePlugin is the life-cycle owner of the core plug-in, and starting point for access to many core APIs. * @@ -234,6 +235,7 @@ public class CCorePlugin extends Plugin { return MessageFormat.format(getResourceString(key), new Object[] { arg }); } + @SuppressWarnings("cast") // java.text.MessageFormat would require the cast public static String getFormattedString(String key, String[] args) { return MessageFormat.format(getResourceString(key), (Object[])args); } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index e5a18982e29..4c931c06c0b 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -109,11 +109,6 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { fNameMatcher = fSegmentMatchers[fSegmentMatchers.length-1]; } - public void setVisibleTypes(Collection visibleTypes) { - fVisibleTypes.clear(); - fVisibleTypes.addAll(visibleTypes); - } - public Collection getVisibleTypes() { return fVisibleTypes; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index aa6a8290330..f4e6a153a9e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -445,8 +445,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC } private static class BracketLevel { - int fOffset; - int fLength; +// int fOffset; +// int fLength; LinkedModeUI fUI; Position fFirstPosition; Position fSecondPosition; @@ -525,14 +525,14 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC } } - /** - * Returns the position category. - * - * @return the position category - */ - public String getCategory() { - return fCategory; - } +// /** +// * Returns the position category. +// * +// * @return the position category +// */ +// public String getCategory() { +// return fCategory; +// } } private class BracketInserter implements VerifyKeyListener, ILinkedModeListener { @@ -673,8 +673,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC model.addGroup(group); model.forceInstall(); - level.fOffset = offset; - level.fLength = 2; +// level.fOffset = offset; +// level.fLength = 2; // set up position tracking for our magic peers if (fBracketLevelStack.size() == 1) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java index 193278e4087..f5c35b5e067 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2009 IBM Corporation and others. * 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 @@ -269,12 +269,10 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { private static class LanguageTableData { ICConfigurationDescription configuration; String contentTypeId; - String languageId; LanguageTableData(ICConfigurationDescription configuration, String contentTypeId, String languageId) { this.configuration = configuration; this.contentTypeId = contentTypeId; - this.languageId = languageId; } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java index 2e8dd0ab24d..e9f04a6b2ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2007 QNX Software Systems and others. + * Copyright (c) 2002, 2009 QNX Software Systems and others. * 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 @@ -135,11 +135,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB public void dispose() { } - - public boolean isDeleted(Object element) { - return false; - } - + public Object[] getElements(Object element) { return (Object[])element; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java index c1eff50de80..e4768cc3a31 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * 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 @@ -112,10 +112,10 @@ public class LineWrappingTabPage extends FormatterTabPage { } } - public void add(Category category) { - category.index= fIndex++; - fCategoriesList.add(category); - } +// public void add(Category category) { +// category.index= fIndex++; +// fCategoriesList.add(category); +// } public void selectionChanged(SelectionChangedEvent event) { if (event != null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java index 78d634a7bd2..d1122383763 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2009 Wind River Systems, Inc. and others. * 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 @@ -215,10 +215,6 @@ public class CMacroExpansionInput { return null; } - IASTNode getEnclosingNode() { - return fEnclosingNode; - } - MacroExpansionExplorer getMacroExpansionExplorer() { return fExplorer; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java index fac80ca5e82..b6ec781d1f0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * 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 @@ -90,7 +90,7 @@ import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.folding.ICFoldingStructureProvider; -import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor; +import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.model.ASTCache; @@ -237,7 +237,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi if (declaration instanceof IASTFunctionDefinition) { final IASTFunctionDeclarator declarator = ((IASTFunctionDefinition)declaration).getDeclarator(); if (declarator != null) { - fFunction= new String(CVisitor.findInnermostDeclarator(declarator).getName().toCharArray()); + fFunction= new String(ASTQueries.findInnermostDeclarator(declarator).getName().toCharArray()); fLevel= 0; } } @@ -526,17 +526,17 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi return fCategory; } - public void setCategory(int category) { - fCategory = category; - } - - public boolean isComment() { - return fCategory == COMMENT; - } - - public void setIsComment(boolean isComment) { - fCategory= isComment ? COMMENT : 0; - } +// public void setCategory(int category) { +// fCategory = category; +// } +// +// public boolean isComment() { +// return fCategory == COMMENT; +// } +// +// public void setIsComment(boolean isComment) { +// fCategory= isComment ? COMMENT : 0; +// } /* * @see java.lang.Object#toString() */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java index 88614d2ae5e..dc924686ecd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2008 IBM Corporation and others. + * Copyright (c) 2001, 2009 IBM Corporation and others. * 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 @@ -852,11 +852,7 @@ public class ListDialogField extends DialogField { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // will never happen } - - public boolean isDeleted(Object element) { - return false; - } - + public void dispose() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java index 120887f1dd3..40f49840aba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 QNX Software Systems and others. + * Copyright (c) 2004, 2009 QNX Software Systems and others. * 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 @@ -853,10 +853,6 @@ public class TreeListDialogField extends DialogField { // will never happen } - public boolean isDeleted(Object element) { - return false; - } - public void dispose() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index 00a4ab93367..70f42120665 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -273,6 +273,7 @@ public class CUIPlugin extends AbstractUIPlugin { return MessageFormat.format(getResourceString(key), new Object[] {arg}); } + @SuppressWarnings("cast") // java.text.MessageFormat would require the cast public static String getFormattedString(String key, String[] args) { return MessageFormat.format(getResourceString(key), (Object[]) args); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index 08a7bd79b83..56b24702665 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -122,10 +122,6 @@ public class IndexerBlock extends AbstractCOptionPage { return fElement.getAttribute(ATTRIB_NAME); } - public String getIndexerID(){ - return fElement.getAttribute(ATTRIB_INDEXERID); - } - public String getLocalId() { return fElement.getAttribute(ATTRIB_ID); }