From 73ea2efa7dcce93602da202b40e111f4c3b52821 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 14 Jul 2010 14:02:35 +0000 Subject: [PATCH] bug 319769: Unnecessary type casts patch from Petri Tuononen --- .../core/tests/ManagedBuildCoreTests.java | 14 +++++++------- ...anagedBuildCoreTests_SharedToolOptions.java | 2 +- .../core/ManagedCProjectNature.java | 2 +- .../core/ManagedOptionValueHandler.java | 2 +- .../internal/buildmodel/BuildCommand.java | 4 ++-- .../managedbuilder/internal/core/Builder.java | 18 +++++++++--------- .../internal/core/Configuration.java | 12 ++++++------ .../internal/core/ModificationStatus.java | 8 ++++---- .../internal/core/ProjectType.java | 4 ++-- .../internal/core/ResourceConfiguration.java | 6 +++--- .../core/ToolChainModificationHelper.java | 2 +- .../dataprovider/ProjectConverter.java | 2 +- .../internal/macros/MbsMacroSupplier.java | 8 ++++---- .../internal/tcmodification/CollectionMap.java | 2 +- .../internal/tcmodification/ObjectSetList.java | 4 ++-- .../tcmodification/ObjectTypeBasedStorage.java | 4 ++-- .../tcmodification/ToolListModification.java | 6 +++--- .../extension/MatchObjectElement.java | 2 +- .../extension/MatchObjectList.java | 2 +- .../tcmodification/extension/RulesManager.java | 2 +- .../makegen/gnu/GnuLinkOutputNameProvider.java | 4 ++-- .../ui/properties/BuildStepsTab.java | 2 +- .../ui/properties/NewCfgDialog.java | 2 +- .../ui/wizards/MBSCustomPageManager.java | 2 +- .../debug/internal/core/model/CVariable.java | 2 +- .../internal/core/model/CVariableFactory.java | 2 +- .../mi/internal/ui/SolibSearchPathBlock.java | 2 +- .../adapters/CDebugElementProxyFactory.java | 2 +- .../ui/launch/CApplicationLaunchShortcut.java | 2 +- .../ui/launching/SolibSearchPathBlock.java | 2 +- 30 files changed, 64 insertions(+), 64 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java index fb6572603f7..b0ea2bc79dc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java @@ -146,7 +146,7 @@ public class ManagedBuildCoreTests extends TestCase { for (i = 0; i < expectedOSListTokens.length; ++i) { expectedOSListarr.add(expectedOSListTokens[i].trim()); } - assertTrue(Arrays.equals(platform.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList]))); + assertTrue(Arrays.equals(platform.getOSList(), expectedOSListarr.toArray(new String[expectedSizeOSList]))); assertTrue(Arrays.equals(platform.getArchList(), expectedArchList)); String[] binaryParsers = platform.getBinaryParserList(); assertEquals(binaryParsers.length, 2); @@ -214,7 +214,7 @@ public class ManagedBuildCoreTests extends TestCase { for (i = 0; i < expectedEnumList1Tokens.length; ++i) { expectedEnumList1arr.add(expectedEnumList1Tokens[i].trim()); } - assertTrue(Arrays.equals(option.getApplicableValues(), (String[]) expectedEnumList1arr.toArray(new String[expectedSizeEnumList1]))); + assertTrue(Arrays.equals(option.getApplicableValues(), expectedEnumList1arr.toArray(new String[expectedSizeEnumList1]))); // Fetch the debug other option and verify // @@ -324,14 +324,14 @@ public class ManagedBuildCoreTests extends TestCase { expectedOSListarr.add(expectedOSListTokens[i].trim()); } assertEquals(expectedParserId, configs[iconfig].getErrorParserIds()); - assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList]))); + assertTrue(Arrays.equals(toolChain.getOSList(), expectedOSListarr.toArray(new String[expectedSizeOSList]))); assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList)); assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId()); // Fetch and check platform // ITargetPlatform platform = toolChain.getTargetPlatform(); - assertTrue(Arrays.equals(platform.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList]))); + assertTrue(Arrays.equals(platform.getOSList(), expectedOSListarr.toArray(new String[expectedSizeOSList]))); assertTrue(Arrays.equals(platform.getArchList(), expectedArchList)); String[] binaryParsers = platform.getBinaryParserList(); assertEquals(binaryParsers.length, 1); @@ -518,14 +518,14 @@ public class ManagedBuildCoreTests extends TestCase { expectedOSListarr.add(expectedOSListTokens[i].trim()); } assertEquals(expectedParserId, configs[iconfig].getErrorParserIds()); - assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList]))); + assertTrue(Arrays.equals(toolChain.getOSList(), expectedOSListarr.toArray(new String[expectedSizeOSList]))); assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList)); assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId()); // Fetch and check platform // ITargetPlatform platform = toolChain.getTargetPlatform(); - assertTrue(Arrays.equals(platform.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList]))); + assertTrue(Arrays.equals(platform.getOSList(), expectedOSListarr.toArray(new String[expectedSizeOSList]))); assertTrue(Arrays.equals(platform.getArchList(), expectedArchList)); String[] binaryParsers = platform.getBinaryParserList(); assertEquals(binaryParsers.length, 1); @@ -587,7 +587,7 @@ public class ManagedBuildCoreTests extends TestCase { for (i = 0; i < expectedEnumList1Tokens.length; ++i) { expectedEnumList1arr.add(expectedEnumList1Tokens[i].trim()); } - assertTrue(Arrays.equals(option.getApplicableValues(), (String[]) expectedEnumList1arr.toArray(new String[expectedSizeEnumList1]))); + assertTrue(Arrays.equals(option.getApplicableValues(), expectedEnumList1arr.toArray(new String[expectedSizeEnumList1]))); // Fetch the other flags option and verify // diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java index df5517d5647..a302eb8715d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java @@ -366,7 +366,7 @@ public class ManagedBuildCoreTests_SharedToolOptions extends TestCase { sizeCategoryTop = testCategoryTop.length; for (i=0; i < sizeCategoryTop; i++, categoryNo++) { - String ID = ((IOptionCategory)testCategoryTop[i]).getId(); + String ID = testCategoryTop[i].getId(); // Categories are always extension elements, so check // for an identical match assertEquals(ID, topCategoryIDs+categoryNo); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedCProjectNature.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedCProjectNature.java index 84943ec7e43..fe00bec6336 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedCProjectNature.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedCProjectNature.java @@ -154,7 +154,7 @@ public class ManagedCProjectNature implements IProjectNature { * Get the correct builderID */ public static String getBuilderID() { - Plugin plugin = (Plugin)ManagedBuilderCorePlugin.getDefault(); + Plugin plugin = ManagedBuilderCorePlugin.getDefault(); if (Platform.getExtensionRegistry().getExtension(BUILDER_NAME) != null) { return ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java index 05f5e07bb12..18ec6953b56 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedOptionValueHandler.java @@ -109,7 +109,7 @@ public class ManagedOptionValueHandler implements // Figure out which type the option is and implement default behaviour for it. switch (option.getValueType()) { case IOption.STRING: - if (option.getStringValue().equals((String)defaultValue)) { + if (option.getStringValue().equals(defaultValue)) { return true; } break; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java index 4c3795b3dda..8b690cfc3cb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java @@ -29,7 +29,7 @@ public class BuildCommand implements IBuildCommand { public BuildCommand(IPath cmd, String args[], Map env, IPath cwd, BuildStep step){ fCmd = cmd; if(args != null) - fArgs = (String[])args.clone(); + fArgs = args.clone(); if(env != null) fEnv = new HashMap(env); @@ -50,7 +50,7 @@ public class BuildCommand implements IBuildCommand { */ public String[] getArgs() { if(fArgs != null) - return (String[])fArgs.clone(); + return fArgs.clone(); return null; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java index 431a144e486..b9ee83827e7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java @@ -278,7 +278,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, keepEnvVarInBuildfile = builder.keepEnvVarInBuildfile; supportsManagedBuild = builder.supportsManagedBuild; if(builder.customizedErrorParserIds != null) - customizedErrorParserIds = (String[])builder.customizedErrorParserIds.clone(); + customizedErrorParserIds = builder.customizedErrorParserIds.clone(); if(builder.customizedEnvironment != null) customizedEnvironment = (HashMap)builder.customizedEnvironment.clone(); appendEnvironment = builder.appendEnvironment; @@ -301,7 +301,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, isVariableCaseSensitive = new Boolean(builder.isVariableCaseSensitive.booleanValue()); if(builder.reservedMacroNames != null) - reservedMacroNames = (String[])builder.reservedMacroNames.clone(); + reservedMacroNames = builder.reservedMacroNames.clone(); reservedMacroNameSupplierElement = builder.reservedMacroNameSupplierElement; reservedMacroNameSupplier = builder.reservedMacroNameSupplier; @@ -315,7 +315,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, parallelBuildOn = builder.parallelBuildOn; if(builder.outputEntries != null){ - outputEntries = (ICOutputEntry[])builder.outputEntries.clone(); + outputEntries = builder.outputEntries.clone(); } if(copyIds){ @@ -383,7 +383,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, } if(builder.customizedErrorParserIds != null) - customizedErrorParserIds = (String[])builder.customizedErrorParserIds.clone(); + customizedErrorParserIds = builder.customizedErrorParserIds.clone(); if(builder.customizedEnvironment != null) customizedEnvironment = (HashMap)builder.customizedEnvironment.clone(); appendEnvironment = builder.appendEnvironment; @@ -1463,7 +1463,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, // If 'superClass' is null, then there is no builder available in // plugin manifest file with the same 'id' & version. // Look for the 'versionsSupported' attribute - String high = (String) ManagedBuildManager + String high = ManagedBuildManager .getExtensionBuilderMap().lastKey(); SortedMap subMap = null; @@ -1653,7 +1653,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, public String[] getErrorParsers() { if(isCustomBuilder() && customizedErrorParserIds != null) - return (String[])customizedErrorParserIds.clone(); + return customizedErrorParserIds.clone(); IToolChain parent = getParent(); IConfiguration parentConfig = parent.getParent(); @@ -1662,7 +1662,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, public String[] getCustomizedErrorParserIds(){ if(customizedErrorParserIds != null) - return (String[])customizedErrorParserIds.clone(); + return customizedErrorParserIds.clone(); return null; } @@ -2669,12 +2669,12 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, return null; } - return (ICOutputEntry[])outputEntries.clone(); + return outputEntries.clone(); } public void setOutputEntries(ICOutputEntry[] entries){ if(entries != null) - outputEntries = (ICOutputEntry[])entries.clone(); + outputEntries = entries.clone(); else outputEntries = null; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java index a3f21251c15..7282940d3f2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java @@ -512,7 +512,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild postannouncebuildStep = baseCfg.postannouncebuildStep; if(baseCfg.sourceEntries != null) - sourceEntries = (ICSourceEntry[])baseCfg.sourceEntries.clone(); + sourceEntries = baseCfg.sourceEntries.clone(); // enableInternalBuilder(baseCfg.isInternalBuilderEnabled()); // setInternalBuilderIgnoreErr(baseCfg.getInternalBuilderIgnoreErr()); @@ -668,7 +668,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild postannouncebuildStep = new String(cloneConfig.postannouncebuildStep); } if(cloneConfig.sourceEntries != null) - sourceEntries = (ICSourceEntry[])cloneConfig.sourceEntries.clone(); + sourceEntries = cloneConfig.sourceEntries.clone(); // enableInternalBuilder(cloneConfig.isInternalBuilderEnabled()); // setInternalBuilderIgnoreErr(cloneConfig.getInternalBuilderIgnoreErr()); @@ -990,14 +990,14 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild * @see org.eclipse.cdt.core.build.managed.IConfiguration#getProjectType() */ public IProjectType getProjectType() { - return (IProjectType)projectType; + return projectType; } /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.IConfiguration#getManagedProject() */ public IManagedProject getManagedProject() { - return (IManagedProject)managedProject; + return managedProject; } /* (non-Javadoc) @@ -2323,7 +2323,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild return new ICSourceEntry[]{new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED)}; //$NON-NLS-1$ } - return (ICSourceEntry[])sourceEntries.clone(); + return sourceEntries.clone(); } public void setSourceEntries(ICSourceEntry[] entries) { @@ -2389,7 +2389,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild oldSet = new LinkedHashSet(); oldSet.removeAll(set); - setErrorParserAttribute((String[])oldSet.toArray(new String[oldSet.size()])); + setErrorParserAttribute(oldSet.toArray(new String[oldSet.size()])); IResourceInfo rcInfos[] = getResourceInfos(); for(int i = 0; i < rcInfos.length; i++){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java index f31fd1180ee..8c619e95c15 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java @@ -77,7 +77,7 @@ public class ModificationStatus extends Status implements IModificationStatus { if(conflicts != null && conflicts.length != 0){ fToolConflicts = new ITool[conflicts.length][]; for(int i = 0; i < conflicts.length; i++){ - fToolConflicts[i] = (ITool[])conflicts[i].clone(); + fToolConflicts[i] = conflicts[i].clone(); } flags |= TOOLS_CONFLICT; if(severity == IStatus.OK) @@ -87,7 +87,7 @@ public class ModificationStatus extends Status implements IModificationStatus { } if(nonMbsTools != null && nonMbsTools.length != 0){ - fNonManagedBuildTools = (ITool[])nonMbsTools.clone();; + fNonManagedBuildTools = nonMbsTools.clone();; flags |= TOOLS_DONT_SUPPORT_MANAGED_BUILD; severity = IStatus.ERROR; } else { @@ -119,12 +119,12 @@ public class ModificationStatus extends Status implements IModificationStatus { public ITool[][] getToolsConflicts(){ ITool[][] copy = new ITool[fToolConflicts.length][]; for(int i = 0; i < fToolConflicts.length; i++){ - copy[i] = (ITool[])fToolConflicts[i].clone(); + copy[i] = fToolConflicts[i].clone(); } return copy; } public ITool[] getNonManagedBuildTools(){ - return (ITool[])fNonManagedBuildTools.clone(); + return fNonManagedBuildTools.clone(); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java index d18ac1a58ee..8e69af018d4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java @@ -228,7 +228,7 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp public IConfiguration createConfiguration(IConfiguration parent, String id, String name) { Configuration config = new Configuration(this, parent, id, name); // ManagedBuildManager.performValueHandlerEvent(config, IManagedOptionValueHandler.EVENT_OPEN); - return (IConfiguration)config; + return config; } /* (non-Javadoc) @@ -247,7 +247,7 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp int i = 0; while (iter.hasNext()) { Configuration config = (Configuration)iter.next(); - configs[i++] = (IConfiguration)config; + configs[i++] = config; } return configs; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java index 73dc56a2143..a35f0151699 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java @@ -117,7 +117,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { for (int i = 0; i < configElements.length; ++i) { ICStorageElement configElement = configElements[i]; if (configElement.getName().equals(ITool.TOOL_ELEMENT_NAME)) { - Tool tool = new Tool((IBuildObject)this, configElement, getManagedBuildRevision()); + Tool tool = new Tool(this, configElement, getManagedBuildRevision()); addTool(tool); } } @@ -470,7 +470,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { */ public ITool getTool(String id) { Tool tool = (Tool)getToolMap().get(id); - return (ITool)tool; + return tool; } /* (non-Javadoc) @@ -789,7 +789,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { Tool tool = new Tool(this, superClass, id, name, isExtensionElement); addTool(tool); setDirty(true); - return (ITool)tool; + return tool; } public void reset() { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java index 68a7efb720e..8343c741104 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java @@ -51,7 +51,7 @@ public class ToolChainModificationHelper { for(Iterator iter = ceSet2.iterator(); iter.hasNext(); ){ CollectionEntry entry = (CollectionEntry)iter.next(); - Collection c1 = (Collection)m2.get(entry.getKey(), false); + Collection c1 = m2.get(entry.getKey(), false); if(c1 != null){ Collection c2 = entry.getValue(); int i = c2.size(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java index fb882ae3e7c..0d227e57868 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java @@ -441,7 +441,7 @@ public class ProjectConverter implements ICProjectConverter { if(builder.getCommand() != null && builder.getCommand().length() != 0){ String[] errParserIds = builder.getCustomizedErrorParserIds(); builder.setCustomizedErrorParserIds(null); - ((ToolChain)cfg.getToolChain()).setBuilder((Builder)builder); + ((ToolChain)cfg.getToolChain()).setBuilder(builder); if(errParserIds != null && errParserIds.length != 0){ cfg.setErrorParserList(errParserIds); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java index fec86947d3c..d98cd32a62a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java @@ -459,12 +459,12 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase { config = (IConfiguration) toolParent; else if (toolParent instanceof IToolChain) { // must be a toolchain - config = (IConfiguration) ((IToolChain) toolParent) + config = ((IToolChain) toolParent) .getParent(); } else if (toolParent instanceof IResourceConfiguration) { - config = (IConfiguration) ((IResourceConfiguration) toolParent) + config = ((IResourceConfiguration) toolParent) .getParent(); } @@ -519,12 +519,12 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase { config = (IConfiguration) toolParent; else if (toolParent instanceof IToolChain) { // must be a toolchain - config = (IConfiguration) ((IToolChain) toolParent) + config = ((IToolChain) toolParent) .getParent(); } else if (toolParent instanceof IResourceConfiguration) { - config = (IConfiguration) ((IResourceConfiguration) toolParent) + config = ((IResourceConfiguration) toolParent) .getParent(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java index c8d32dd5d7f..3932b7bf12a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java @@ -157,7 +157,7 @@ public class CollectionMap { } public Collection getValues(){ - return (Collection)valuesToCollection(null); + return valuesToCollection(null); } public Object[] getValuesArray(Class clazz){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSetList.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSetList.java index 4ed5ca05b4d..f5d230b8d50 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSetList.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSetList.java @@ -20,11 +20,11 @@ public class ObjectSetList { ObjectSetList(IObjectSet[] objects, boolean copy){ if(copy) - objects = (IObjectSet[])objects.clone(); + objects = objects.clone(); fObjectSets = objects; } public IObjectSet[] getObjectSets(){ - return (IObjectSet[])fObjectSets.clone(); + return fObjectSets.clone(); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java index 54894a27e05..086a1827c26 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java @@ -29,7 +29,7 @@ public final class ObjectTypeBasedStorage implements Cloneable { private Object fStorage[] = new Object[SIZE]; public static int[] getSupportedObjectTypes(){ - return (int[])OBJECT_TYPES.clone(); + return OBJECT_TYPES.clone(); } private int getIndex(int type){ @@ -77,7 +77,7 @@ public final class ObjectTypeBasedStorage implements Cloneable { public Object clone(){ try { ObjectTypeBasedStorage clone = (ObjectTypeBasedStorage)super.clone(); - clone.fStorage = (Object[])fStorage.clone(); + clone.fStorage = fStorage.clone(); return clone; } catch (CloneNotSupportedException e) { e.printStackTrace(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java index dfa6482187e..46aa3a3b475 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java @@ -242,7 +242,7 @@ public abstract class ToolListModification implements fOperations = (ModificationOperation[])opList.toArray(new ModificationOperation[opList.size()]); } } - return (IModificationOperation[])fOperations.clone(); + return fOperations.clone(); } public ITool getTool() { @@ -342,7 +342,7 @@ public abstract class ToolListModification implements } public IModificationOperation[] getSupportedOperations() { - return (IModificationOperation[])getSupportedOperationsArray().clone(); + return getSupportedOperationsArray().clone(); } public ITool getTool() { @@ -407,7 +407,7 @@ public abstract class ToolListModification implements // private LinkedHashMap fProjCompInfoMap = new LinkedHashMap(); // private HashMap fSysCompInfoMap = new HashMap(); if(base.fAllSysTools != null) - fAllSysTools = (Tool[])base.fAllSysTools.clone(); + fAllSysTools = base.fAllSysTools.clone(); if(base.fFilteredOutSysTools != null) fFilteredOutSysTools = (HashSet)base.fFilteredOutSysTools.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java index 5d57c8b2600..b3375146b47 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java @@ -276,6 +276,6 @@ public class MatchObjectElement { } public PatternElement[] getPatterns(){ - return (PatternElement[])fPatterns.clone(); + return fPatterns.clone(); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectList.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectList.java index b7ca254935f..5ffa1546aba 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectList.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectList.java @@ -25,7 +25,7 @@ public class MatchObjectList { } public MatchObjectElement[] getMatchObjects(){ - return (MatchObjectElement[])fObjects.clone(); + return fObjects.clone(); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java index e6db53d1922..bf6afd7a9a1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java @@ -275,7 +275,7 @@ public class RulesManager { public ObjectSetListBasedDefinition[] getRules(int ruleType){ checkInitialization(); - return (ConflictDefinition[])fConflictDefinitions.clone(); + return fConflictDefinitions.clone(); } private void checkInitialization(){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuLinkOutputNameProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuLinkOutputNameProvider.java index 9a020627921..b284925efba 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuLinkOutputNameProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuLinkOutputNameProvider.java @@ -106,12 +106,12 @@ public class GnuLinkOutputNameProvider implements IManagedOutputNameProvider { config = (IConfiguration) toolParent; else if (toolParent instanceof IToolChain) { // must be a toolchain - config = (IConfiguration) ((IToolChain) toolParent) + config = ((IToolChain) toolParent) .getParent(); } else if (toolParent instanceof IResourceConfiguration) { - config = (IConfiguration) ((IResourceConfiguration) toolParent) + config = ((IResourceConfiguration) toolParent) .getParent(); } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java index dd2f60fcfae..52fa64ca92d 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java @@ -283,7 +283,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab { } } if(list.size() != 0) { - return (ITool[])list.toArray(new ITool[list.size()]); + return list.toArray(new ITool[list.size()]); } return null; } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java index 0c021ff4948..79da5c7c43e 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java @@ -433,7 +433,7 @@ public class NewCfgDialog implements INewCfgDialog { } } } - rcfgs = (IConfiguration[])lst.toArray(new IConfiguration[lst.size()]); + rcfgs = lst.toArray(new IConfiguration[lst.size()]); } public void setTitle(String _title) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java index bc484333429..0ab68cc339d 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java @@ -457,7 +457,7 @@ public final class MBSCustomPageManager Iterator iterator = pageSet.iterator(); while (iterator.hasNext()) { - if (pageData.equals((MBSCustomPageData)iterator.next())) { + if (pageData.equals(iterator.next())) { IWizardPage nextPage = null; while (iterator.hasNext() && nextPage == null) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index 1f44064d70c..718a7c4c730 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -162,7 +162,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi createOriginal( cdiVariableObject ); } fIsEnabled = !isBookkeepingEnabled(); - setStatus( ICDebugElementStatus.ERROR, MessageFormat.format( CoreModelMessages.getString( "CVariable.1" ), (Object[])new String[]{ errorMessage } ) ); //$NON-NLS-1$ + setStatus( ICDebugElementStatus.ERROR, MessageFormat.format( CoreModelMessages.getString( "CVariable.1" ), new String[]{ errorMessage } ) ); //$NON-NLS-1$ getCDISession().getEventManager().addEventListener( fEventListenerWrapper ); if ( cdiVariableObject != null ) { setInitialFormat(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java index 956648d0732..c5eca96bdc2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java @@ -46,7 +46,7 @@ public class CVariableFactory { } public String toString() { - return MessageFormat.format( "{0}::{1}", (Object[])new String[] { getPath().toOSString(), getName() } ); //$NON-NLS-1$ + return MessageFormat.format( "{0}::{1}", new String[] { getPath().toOSString(), getName() } ); //$NON-NLS-1$ } public boolean equals( Object obj ) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java index 55646ac3852..ccc070b0998 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java @@ -479,7 +479,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu dialog.setInitialElementSelections( Arrays.asList( fAutoSolibs ) ); if ( dialog.open() == Window.OK ) { Object[] result = dialog.getResult(); - fAutoSolibs = (File[])Arrays.asList( result ).toArray( new File[result.length] ); + fAutoSolibs = Arrays.asList( result ).toArray( new File[result.length] ); changed = true; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementProxyFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementProxyFactory.java index 58f33a69fe5..fbfeea4a07d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementProxyFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementProxyFactory.java @@ -47,7 +47,7 @@ public class CDebugElementProxyFactory extends DefaultModelProxyFactory { } else if ( ICDebugUIConstants.ID_DEFAULT_DISASSEMBLY_EDITOR.equals( context.getId() ) ) { if ( element instanceof DisassemblyRetrieval ) { - return new DisassemblyElementProxy( (DisassemblyRetrieval)element ); + return new DisassemblyElementProxy( element ); } } return super.createModelProxy( element, context ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java index 0604189202d..8f5a8aaef2c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java @@ -527,7 +527,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { IStructuredSelection structuredSelection = (IStructuredSelection) selection; for (Iterator iter = structuredSelection.iterator(); iter.hasNext();) { - Object element = (Object) iter.next(); + Object element = iter.next(); if (element != null) { if (element instanceof ICProject) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java index 0c1ffd73dae..fadcd1b9755 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java @@ -505,7 +505,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu dialog.setInitialElementSelections(Arrays.asList(fAutoSolibs)); if (dialog.open() == Window.OK) { Object[] result = dialog.getResult(); - fAutoSolibs = (File[])Arrays.asList(result).toArray(new File[result.length]); + fAutoSolibs = Arrays.asList(result).toArray(new File[result.length]); changed = true; } }