diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeCommonBuildInfo.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeCommonBuildInfo.java index 9047a58abcb..aa632feeca4 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeCommonBuildInfo.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeCommonBuildInfo.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IPath; public interface IMakeCommonBuildInfo { public final static String ARGS_PREFIX = MakeCorePlugin.getUniqueIdentifier(); - + public final static String BUILD_LOCATION = ARGS_PREFIX + ".build.location"; //$NON-NLS-1$ public final static String BUILD_COMMAND = ARGS_PREFIX + ".build.command"; //$NON-NLS-1$ public final static String BUILD_ARGUMENTS = ARGS_PREFIX + ".build.arguments"; //$NON-NLS-1$ @@ -31,8 +31,9 @@ public interface IMakeCommonBuildInfo { /** * @deprecated - use setBuildString(BUILD_LOCATION...) */ + @Deprecated void setBuildLocation(IPath location) throws CoreException; - + boolean isStopOnError(); void setStopOnError(boolean on) throws CoreException; @@ -44,6 +45,7 @@ public interface IMakeCommonBuildInfo { /** * @deprecated - use setBuildString(BUILD_COMMAND...) */ + @Deprecated void setBuildCommand(IPath command) throws CoreException; String getBuildArguments(); @@ -51,16 +53,17 @@ public interface IMakeCommonBuildInfo { /** * @deprecated - use setBuildString(BUILD_ARGUMENTS...) */ + @Deprecated void setBuildArguments(String args) throws CoreException; String[] getErrorParsers(); void setErrorParsers(String[] parsers) throws CoreException; - Map getExpandedEnvironment() throws CoreException; + Map getExpandedEnvironment() throws CoreException; + + Map getEnvironment(); + void setEnvironment(Map env) throws CoreException; - Map getEnvironment(); - void setEnvironment(Map env) throws CoreException; - boolean appendEnvironment(); void setAppendEnvironment(boolean append) throws CoreException; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeTargetEvent.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeTargetEvent.java index 44c05958f26..21c03e7fe2e 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeTargetEvent.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeTargetEvent.java @@ -15,6 +15,8 @@ import java.util.EventObject; import org.eclipse.core.resources.IProject; public class MakeTargetEvent extends EventObject { + private static final long serialVersionUID = 1L; + public static final int TARGET_ADD = 1; public static final int TARGET_CHANGED = 2; public static final int TARGET_REMOVED = 3; @@ -39,7 +41,7 @@ public class MakeTargetEvent extends EventObject { this.type = type; this.project = project; } - + public int getType() { return type; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java index f47e70373eb..0c4af187ed5 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java @@ -33,7 +33,7 @@ public class MakeProject implements ICOwner { if (extensionID.equals(CCorePlugin.BINARY_PARSER_UNIQ_ID)) { updateBinaryParsers(cDescriptor); } - + if (extensionID.equals(CCorePlugin.INDEXER_UNIQ_ID)) { updateIndexers(cDescriptor); } @@ -42,35 +42,33 @@ public class MakeProject implements ICOwner { private void updateBinaryParsers(ICDescriptor cDescriptor) throws CoreException { cDescriptor.remove(CCorePlugin.BINARY_PARSER_UNIQ_ID); Preferences makePrefs = MakeCorePlugin.getDefault().getPluginPreferences(); - String id = makePrefs.getString(CCorePlugin.PREF_BINARY_PARSER); - if (id != null && id.length() != 0) { - String[] ids = parseStringToArray(id); - for (int i = 0; i < ids.length; i++) { - cDescriptor.create(CCorePlugin.BINARY_PARSER_UNIQ_ID, ids[i]); + String ids = makePrefs.getString(CCorePlugin.PREF_BINARY_PARSER); + if (ids != null && ids.length() != 0) { + for (String id : parseStringToArray(ids)) { + cDescriptor.create(CCorePlugin.BINARY_PARSER_UNIQ_ID, id); } } } - + private void updateIndexers(ICDescriptor cDescriptor) throws CoreException { cDescriptor.remove(CCorePlugin.INDEXER_UNIQ_ID); Preferences corePrefs = CCorePlugin.getDefault().getPluginPreferences(); - String id = corePrefs.getString(CCorePlugin.PREF_INDEXER); - if (id != null && id.length() != 0) { - String[] ids = parseStringToArray(id); - for (int i = 0; i < ids.length; i++) { - cDescriptor.create(CCorePlugin.INDEXER_UNIQ_ID, ids[i]); + String ids = corePrefs.getString(CCorePlugin.PREF_INDEXER); + if (ids != null && ids.length() != 0) { + for (String id : parseStringToArray(ids)) { + cDescriptor.create(CCorePlugin.INDEXER_UNIQ_ID, id); } } } - + private String[] parseStringToArray(String syms) { if (syms != null && syms.length() > 0) { StringTokenizer tok = new StringTokenizer(syms, ";"); //$NON-NLS-1$ - ArrayList list = new ArrayList(tok.countTokens()); + ArrayList list = new ArrayList(tok.countTokens()); while (tok.hasMoreElements()) { list.add(tok.nextToken()); } - return (String[]) list.toArray(new String[list.size()]); + return list.toArray(new String[list.size()]); } return new String[0]; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeRecon.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeRecon.java index 36238f9cec5..1c299ee9524 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeRecon.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeRecon.java @@ -32,7 +32,9 @@ public class MakeRecon extends OutputStream { MyList log; StringBuffer currentLine; - class MyList extends ArrayList { + class MyList extends ArrayList { + private static final long serialVersionUID = 1L; + public void removeInterval (int start, int len) { removeRange(start, len); } @@ -108,6 +110,7 @@ public class MakeRecon extends OutputStream { /** * @see java.io.OutputStream#close() */ + @Override public void close() throws IOException { if (console != null) { console.close(); @@ -118,6 +121,7 @@ public class MakeRecon extends OutputStream { /** * @see java.io.OutputStream#flush() */ + @Override public void flush() throws IOException { if (console != null) { console.flush(); @@ -127,6 +131,7 @@ public class MakeRecon extends OutputStream { /** * @see java.io.OutputStream#write(int) */ + @Override public synchronized void write(int b) throws IOException { currentLine.append((char) b); checkProgress(false); @@ -138,6 +143,7 @@ public class MakeRecon extends OutputStream { /** * @see java.io.OutputStream#write(...) */ + @Override public synchronized void write(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); @@ -174,7 +180,7 @@ public class MakeRecon extends OutputStream { private void processLine(String line) { int found = -1; for (int i = 0; i < log.size(); i++) { - String s = (String)log.get(i); + String s = log.get(i); if (s.startsWith(line)) { found = i; break; @@ -182,13 +188,13 @@ public class MakeRecon extends OutputStream { } if (found != -1) { - String show = (String)log.get(found); + String show = log.get(found); if (show.length() > 50) { show = show.substring(0, 50); } monitor.subTask(show); monitor.worked(found + 1); log.removeInterval(0, found + 1); - } + } } } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java index 511701febda..04919ed1308 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java @@ -12,8 +12,8 @@ package org.eclipse.cdt.make.internal.core; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.cdt.make.core.IMakeBuilderInfo; import org.eclipse.cdt.make.core.IMakeCommonBuildInfo; @@ -44,16 +44,16 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { private boolean isDefaultBuildCmd; private boolean isStopOnError; boolean runAllBuidlers = true; - private String targetBuilderID; + private final String targetBuilderID; private IContainer container; private int appendEnvironment = USE_PROJECT_ENV_SETTING; private boolean appendProjectEnvironment = true; - private Map buildEnvironment = new HashMap(); - private Map targetAttributes = new HashMap(); + private Map buildEnvironment = new HashMap(); + private final Map targetAttributes = new HashMap(); MakeTarget(MakeTargetManager manager, IProject project, String targetBuilderID, String name) throws CoreException { this.manager = manager; - this.project = project; + this.project = project; this.targetBuilderID = targetBuilderID; this.name = name; IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(project, manager.getBuilderID(targetBuilderID)); @@ -66,7 +66,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { public IProject getProject() { return project; } - + public void setContainer(IContainer container) { this.container = container; } @@ -74,8 +74,8 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { void setName(String name) { this.name = name; } - - Map getAttributeMap() { + + Map getAttributeMap() { return targetAttributes; } @@ -138,7 +138,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { public void setBuildArguments(String arguments) throws CoreException { setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, arguments); } - + public void setBuildTarget(String target) throws CoreException { setBuildAttribute(IMakeTarget.BUILD_TARGET, target); } @@ -149,7 +149,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { result = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(result, false); } catch (CoreException e) { } - return result; + return result; } public void setRunAllBuilders(boolean runAllBuilders) throws CoreException { @@ -167,7 +167,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { } public String getBuildAttribute(String name, String defaultValue) { - String value = (String)targetAttributes.get(name); + String value = targetAttributes.get(name); return value != null ? value : defaultValue; } @@ -193,8 +193,8 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { throw new UnsupportedOperationException(); } - public Map getExpandedEnvironment() throws CoreException { - Map env = null; + public Map getExpandedEnvironment() throws CoreException { + Map env = null; if (appendProjectEnvironment()) { IMakeBuilderInfo projectInfo; projectInfo = MakeCorePlugin.createBuildInfo(getProject(), manager.getBuilderID(targetBuilderID)); @@ -205,18 +205,17 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { } else { env.putAll(getEnvironment()); } - HashMap envMap = new HashMap(env.entrySet().size()); - Iterator iter = env.entrySet().iterator(); + + HashMap envMap = new HashMap(env.entrySet().size()); boolean win32 = Platform.getOS().equals(Constants.OS_WIN32); - while (iter.hasNext()) { - Map.Entry entry = (Map.Entry)iter.next(); - String key = (String)entry.getKey(); + for (Entry entry : env.entrySet()) { + String key = entry.getKey(); if (win32) { // Win32 vars are case insensitive. Uppercase everything so // that (for example) "pAtH" will correctly replace "PATH" key = key.toUpperCase(); } - String value = (String)entry.getValue(); + String value = entry.getValue(); // translate any string substitution variables String translated = value; translated = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(value, false); @@ -224,33 +223,33 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { } return envMap; } - + public boolean appendProjectEnvironment() { return appendProjectEnvironment; } public void setAppendProjectEnvironment(boolean append) { appendProjectEnvironment = append; - } + } - public Map getEnvironment() { + public Map getEnvironment() { return buildEnvironment; } - public void setEnvironment(Map env) throws CoreException { - buildEnvironment = new HashMap(env); + public void setEnvironment(Map env) throws CoreException { + buildEnvironment = new HashMap(env); manager.updateTarget(this); } - public void setAppendEnvironment(boolean append) throws CoreException { + public void setAppendEnvironment(boolean append) throws CoreException { appendEnvironment = append ? 1 : 0; manager.updateTarget(this); - } + } public boolean appendEnvironment() { return appendEnvironment == USE_PROJECT_ENV_SETTING ? getProjectEnvSetting(): appendEnvironment == 1; } - + private boolean getProjectEnvSetting() { IMakeBuilderInfo projectInfo; try { @@ -265,6 +264,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { return container; } + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -275,13 +275,14 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { return false; } + @Override public int hashCode() { return container.hashCode() * 17 + name != null ? name.hashCode(): 0; } public void build(IProgressMonitor monitor) throws CoreException { final String builderID = manager.getBuilderID(targetBuilderID); - final HashMap infoMap = new HashMap(); + final HashMap infoMap = new HashMap(); IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(infoMap, builderID); info.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$ @@ -302,19 +303,19 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { /* * (non-Javadoc) - * + * * @see org.eclipse.core.resources.IWorkspaceRunnable#run(org.eclipse.core.runtime.IProgressMonitor) */ public void run(IProgressMonitor monitor) throws CoreException { if (runAllBuidlers) { ICommand[] commands = project.getDescription().getBuildSpec(); monitor.beginTask("", commands.length); //$NON-NLS-1$ - for (int i = 0; i < commands.length; i++) { - if (commands[i].getBuilderName().equals(builderID)) { + for (ICommand command : commands) { + if (command.getBuilderName().equals(builderID)) { project.build(IncrementalProjectBuilder.FULL_BUILD, builderID, infoMap, new SubProgressMonitor(monitor, 1)); } else { - project.build(IncrementalProjectBuilder.FULL_BUILD, commands[i].getBuilderName(), - commands[i].getArguments(), new SubProgressMonitor(monitor, 1)); + project.build(IncrementalProjectBuilder.FULL_BUILD, command.getBuilderName(), + command.getArguments(), new SubProgressMonitor(monitor, 1)); } } monitor.done(); @@ -330,6 +331,8 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { } } + @SuppressWarnings("unchecked") + @Override public Object getAdapter(Class adapter) { if (adapter.equals(IProject.class)) { return getProject(); diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java index fcb05e955fa..e881dbc36c9 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.make.internal.core; import java.io.File; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Vector; import java.util.Map.Entry; @@ -47,10 +46,10 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis private static String TARGETS_EXT = "targets"; //$NON-NLS-1$ - private ListenerList listeners = new ListenerList(); - Map projectMap = new HashMap(); - private HashMap builderMap; - protected Vector fProjects = new Vector(); + private final ListenerList listeners = new ListenerList(); + private final Map projectMap = new HashMap(); + private HashMap builderMap; + protected Vector fProjects = new Vector(); public MakeTargetManager() { } @@ -62,12 +61,12 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis public void addTarget(IMakeTarget target) throws CoreException { addTarget(null, target); } - + public void addTarget(IContainer container, IMakeTarget target) throws CoreException { if (container instanceof IWorkspaceRoot) { throw new CoreException(new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, MakeMessages.getString("MakeTargetManager.add_to_workspace_root"), null)); //$NON-NLS-1$ } - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(target.getProject()); + ProjectTargets projectTargets = projectMap.get(target.getProject()); if (projectTargets == null) { projectTargets = readTargets(target.getProject()); } @@ -83,15 +82,15 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public boolean targetExists(IMakeTarget target) { - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(target.getProject()); + ProjectTargets projectTargets = projectMap.get(target.getProject()); if (projectTargets == null) { projectTargets = readTargets(target.getProject()); } return projectTargets.contains((MakeTarget) target); } - + public void removeTarget(IMakeTarget target) throws CoreException { - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(target.getProject()); + ProjectTargets projectTargets = projectMap.get(target.getProject()); if (projectTargets == null) { projectTargets = readTargets(target.getProject()); } @@ -107,7 +106,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public void renameTarget(IMakeTarget target, String name) throws CoreException { - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(target.getProject()); + ProjectTargets projectTargets = projectMap.get(target.getProject()); if (projectTargets == null) { projectTargets = readTargets(target.getProject()); } @@ -119,7 +118,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public IMakeTarget[] getTargets(IContainer container) throws CoreException { - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(container.getProject()); + ProjectTargets projectTargets = projectMap.get(container.getProject()); if (projectTargets == null) { projectTargets = readTargets(container.getProject()); } @@ -127,7 +126,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public IMakeTarget findTarget(IContainer container, String name) throws CoreException { - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(container.getProject()); + ProjectTargets projectTargets = projectMap.get(container.getProject()); if (projectTargets == null) { projectTargets = readTargets(container.getProject()); } @@ -135,25 +134,23 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public IProject[] getTargetBuilderProjects() { - return (IProject[])fProjects.toArray(new IProject[fProjects.size()]); + return fProjects.toArray(new IProject[fProjects.size()]); } public String[] getTargetBuilders(IProject project) { if (fProjects.contains(project) || hasTargetBuilder(project)) { try { - Vector ids = new Vector(); + Vector ids = new Vector(); IProjectDescription description = project.getDescription(); - ICommand builder[] = description.getBuildSpec(); - for (int i = 0; i < builder.length; i++) { - Iterator entries = builderMap.entrySet().iterator(); - while (entries.hasNext()) { - Map.Entry entry = (Entry)entries.next(); - if (entry.getValue().equals(builder[i].getBuilderName())) { + ICommand commands[] = description.getBuildSpec(); + for (ICommand command : commands) { + for (Entry entry : builderMap.entrySet()) { + if (entry.getValue().equals(command.getBuilderName())) { ids.add(entry.getKey()); } } } - return (String[])ids.toArray(new String[ids.size()]); + return ids.toArray(new String[ids.size()]); } catch (CoreException e) { } } @@ -164,9 +161,9 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis try { if (project.isAccessible()) { IProjectDescription description = project.getDescription(); - ICommand builder[] = description.getBuildSpec(); - for (int j = 0; j < builder.length; j++) { - if (builderMap.containsValue(builder[j].getBuilderName())) { + ICommand commands[] = description.getBuildSpec(); + for (ICommand command : commands) { + if (builderMap.containsValue(command.getBuilderName())) { return true; } } @@ -178,10 +175,10 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis public void startup() { initializeBuilders(); - IProject project[] = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < project.length; i++) { - if (hasTargetBuilder(project[i])) { - fProjects.add(project[i]); + IProject projects[] = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + for (IProject project : projects) { + if (hasTargetBuilder(project)) { + fProjects.add(project); } } ResourcesPlugin.getWorkspace().addResourceChangeListener(this); @@ -256,7 +253,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis protected void updateTarget(MakeTarget target) throws CoreException { if (target.getContainer() != null ) { // target has not been added to manager. - ProjectTargets projectTargets = (ProjectTargets)projectMap.get(target.getProject()); + ProjectTargets projectTargets = projectMap.get(target.getProject()); if (projectTargets == null || !projectTargets.contains(target)) { return; // target has not been added to manager. } @@ -287,15 +284,15 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } protected void initializeBuilders() { - builderMap = new HashMap(); + builderMap = new HashMap(); IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(MakeCorePlugin.PLUGIN_ID, MakeTargetManager.TARGET_BUILD_EXT); - IExtension[] ext = point.getExtensions(); - for (int i = 0; i < ext.length; i++) { - IConfigurationElement[] element = ext[i].getConfigurationElements(); - for (int j = 0; j < element.length; j++) { - if (element[j].getName().equals("builder")) { //$NON-NLS-1$ - String builderID = element[j].getAttribute("builderID"); //$NON-NLS-1$ - String targetID = element[j].getAttribute("id"); //$NON-NLS-1$ + IExtension[] extensions = point.getExtensions(); + for (IExtension extension : extensions) { + IConfigurationElement[] cfgElements = extension.getConfigurationElements(); + for (IConfigurationElement cfgElement : cfgElements) { + if (cfgElement.getName().equals("builder")) { //$NON-NLS-1$ + String builderID = cfgElement.getAttribute("builderID"); //$NON-NLS-1$ + String targetID = cfgElement.getAttribute("id"); //$NON-NLS-1$ builderMap.put(targetID, builderID); } } @@ -303,9 +300,8 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } protected void notifyListeners(MakeTargetEvent event) { - Object[] list = listeners.getListeners(); - for (int i = 0; i < list.length; i++) { - ((IMakeTargetListener)list[i]).targetChanged(event); + for (Object listener : listeners.getListeners()) { + ((IMakeTargetListener)listener).targetChanged(event); } } @@ -318,6 +314,6 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis } public String getBuilderID(String targetBuilderID) { - return (String)builderMap.get(targetBuilderID); + return builderMap.get(targetBuilderID); } }