Repository: ant-ivyde Updated Branches: refs/heads/master 37347e53a -> f6952d90f
foreach loops that need no generics, more final fields; other code simplifications Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/f6952d90 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/f6952d90 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/f6952d90 Branch: refs/heads/master Commit: f6952d90fa8cabddf286b1cea5a00f3aeccdf94a Parents: 37347e5 Author: Gintas Grigelionis <[email protected]> Authored: Sun Nov 5 20:34:21 2017 +0100 Committer: Gintas Grigelionis <[email protected]> Committed: Sun Nov 5 20:34:21 2017 +0100 ---------------------------------------------------------------------- .../resolvevisualizer/IvyNodeLabelProvider.java | 2 +- .../completion/IvyCodeCompletionProcessor.java | 13 ++--- .../common/ivysettings/IvySettingsModel.java | 6 +- .../org/apache/ivyde/common/model/IvyTag.java | 9 ++- .../ivyde/eclipse/IvyDEsecurityHelper.java | 9 +-- .../eclipse/cp/IvyClasspathContainerHelper.java | 25 +++------ .../ivyde/internal/eclipse/CachedIvy.java | 7 +-- .../internal/eclipse/IvyMarkerManager.java | 6 +- .../ivyde/internal/eclipse/IvyPlugin.java | 2 +- .../IvyClasspathContainerConfAdapter.java | 6 +- .../IvyClasspathContainerMapper.java | 15 +++-- .../IvyClasspathContainerSerializer.java | 24 ++++---- .../eclipse/cpcontainer/IvyClasspathUtil.java | 12 ++-- .../eclipse/handlers/AbstractIvyDEHandler.java | 1 - .../internal/eclipse/resolve/IvyResolver.java | 26 ++++----- .../internal/eclipse/resolve/ResolveResult.java | 4 +- .../eclipse/revdepexplorer/IvyUtil.java | 7 +-- .../internal/eclipse/ui/console/IvyConsole.java | 10 +--- .../eclipse/ui/console/IvyConsoleFactory.java | 5 +- .../ui/editors/IvyModuleDescriptorEditor.java | 21 +++---- .../eclipse/ui/editors/IvySettingsEditor.java | 7 +-- .../ui/views/ReverseDependencyExplorerView.java | 9 +-- .../workspaceresolver/WorkspaceResolver.java | 58 +++++++++----------- .../WorkspaceResourceChangeListener.java | 6 +- 24 files changed, 118 insertions(+), 172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java b/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java index 6417df9..f2d8c92 100644 --- a/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java +++ b/org.apache.ivyde.eclipse.resolvevisualizer/src/org/apache/ivyde/eclipse/resolvevisualizer/IvyNodeLabelProvider.java @@ -57,7 +57,7 @@ public class IvyNodeLabelProvider implements ILabelProvider, IConnectionStylePro private Map/* <IvyNodeElement, Color> */highlightedDependencies = new HashMap/* <IvyNodeElement, Color> */(); private Color disabledColor = null; private IvyNodeElement pinnedNode = null; - private GraphViewer viewer; + private final GraphViewer viewer; private ILabelDecoratorAlgorithm autoSelectDecorator = new ShortestRootPathAlgorithm(); private final DirectDependenciesAlgorithm rootDirectDependenciesDecorator = new DirectDependenciesAlgorithm(); http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java index 0a6b8e7..958f144 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java @@ -129,14 +129,12 @@ public class IvyCodeCompletionProcessor { } IvyTag ivyTag = model.getIvyTag(tag, parent); if (ivyTag != null) { - String[] values = ivyTag.getPossibleValuesForAttribute(ivyfile.getAttributeName(), - ivyfile); + String[] values = ivyTag.getPossibleValuesForAttribute(ivyfile.getAttributeName(), ivyfile); if (values != null) { String qualifier = ivyfile.getAttributeValueQualifier(); int qlen = qualifier == null ? 0 : qualifier.length(); Arrays.sort(values); - for (int i = 0; i < values.length; i++) { - String val = values[i]; + for (String val : values) { CodeCompletionProposal proposal = null; String doc = ivyTag.getPossibleDocForValue(val, ivyfile); if (doc == null) { @@ -206,12 +204,11 @@ public class IvyCodeCompletionProcessor { // Check if proposal matches qualifier if (child.getStartTag().startsWith(qualifier)) { - Proposal[] props = child.getProposals(); - for (int i = 0; i < props.length; i++) { + for (Proposal prop : child.getProposals()) { // Construct proposal and add to result list propList.add(new CodeCompletionProposal( - props[i].getProposal(), ivyfile.getOffset() - qlen, qlen + caretOffset, - props[i].getCursor(), null, props[i].getDoc())); + prop.getProposal(), ivyfile.getOffset() - qlen, qlen + caretOffset, + prop.getCursor(), null, prop.getDoc())); } } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java index ebe8155..b2baa53 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java @@ -257,9 +257,7 @@ public class IvySettingsModel extends IvyModel { private void init() { if (!init) { try { - Method[] methods = clazz.getMethods(); - for (int i = 0; i < methods.length; i++) { - Method m = methods[i]; + for (Method m : clazz.getMethods()) { if (m.getName().startsWith("create") && m.getParameterTypes().length == 0 && isSupportedChildType(m.getReturnType())) { @@ -335,7 +333,7 @@ public class IvySettingsModel extends IvyModel { return true; } try { - type.getConstructor(new Class[] {String.class}); + type.getConstructor(String.class); return true; } catch (Exception e) { return false; http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java index 9ceb33a..1a79d2d 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java @@ -159,9 +159,9 @@ public class IvyTag { String[] values = provider.getValuesfor(ivyTagAttribute, ivyfile); if (values != null) { Set ret = new HashSet(values.length); - for (int i = 0; i < values.length; i++) { - if (values[i].startsWith(qualifier)) { - ret.add(values[i]); + for (String value : values) { + if (value.startsWith(qualifier)) { + ret.add(value); } } return (String[]) ret.toArray(new String[ret.size()]); @@ -182,8 +182,7 @@ public class IvyTag { } IValueProvider provider = ivyTagAttribute.getValueProvider(); if (provider != null && (provider instanceof IDocumentedValueProvider)) { - String doc = ((IDocumentedValueProvider) provider).getDocForValue(value, ivyfile); - return doc; + return ((IDocumentedValueProvider) provider).getDocForValue(value, ivyfile); } return null; } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java index 4c6d208..08debaf 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEsecurityHelper.java @@ -52,8 +52,7 @@ public final class IvyDEsecurityHelper { } public static void cpyCredentialsFromSecureToIvyStorage() { - List<SecuritySetup> credentials = getCredentialsFromSecureStore(); - for (SecuritySetup entry : credentials) { + for (SecuritySetup entry : getCredentialsFromSecureStore()) { addCredentialsToIvyCredentialStorage(entry); IvyPlugin.logInfo("Credentials " + entry.toString() + " from eclipse secure storage copied to ivyDE credential store"); @@ -84,11 +83,9 @@ public final class IvyDEsecurityHelper { List<SecuritySetup> setupValues = new ArrayList<>(); if (preferences.nodeExists(IVY_DE_CREDENTIALS_BASE_NODE)) { ISecurePreferences node = preferences.node(IVY_DE_CREDENTIALS_BASE_NODE); - String[] childNames = node.childrenNames(); - for (String childName : childNames) { + for (String childName : node.childrenNames()) { ISecurePreferences childNode = node.node(childName); - String[] childChildNames = childNode.childrenNames(); - for (String childChildName : childChildNames) { + for (String childChildName : childNode.childrenNames()) { ISecurePreferences childChildNode = childNode.node(childChildName); try { SecuritySetup toAdd = new SecuritySetup( http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java index e6ffd48..5f07f24 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cp/IvyClasspathContainerHelper.java @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.apache.ivyde.eclipse.IvyDEException; import org.apache.ivyde.internal.eclipse.IvyPlugin; import org.apache.ivyde.internal.eclipse.cpcontainer.IvyClasspathContainerImpl; import org.apache.ivyde.internal.eclipse.cpcontainer.IvyClasspathUtil; @@ -91,9 +90,7 @@ public final class IvyClasspathContainerHelper { return containers; } try { - IClasspathEntry[] entries = javaProject.getRawClasspath(); - for (int i = 0; i < entries.length; i++) { - IClasspathEntry entry = entries[i]; + for (IClasspathEntry entry : javaProject.getRawClasspath()) { if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { IPath path = entry.getPath(); if (isIvyClasspathContainer(path)) { @@ -118,9 +115,7 @@ public final class IvyClasspathContainerHelper { return containers; } try { - IClasspathEntry[] entries = javaProject.getRawClasspath(); - for (int i = 0; i < entries.length; i++) { - IClasspathEntry entry = entries[i]; + for (IClasspathEntry entry : javaProject.getRawClasspath()) { if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { IPath path = entry.getPath(); if (isIvyClasspathContainer(path)) { @@ -149,9 +144,7 @@ public final class IvyClasspathContainerHelper { return containers; } try { - IClasspathEntry[] entries = javaProject.getRawClasspath(); - for (int i = 0; i < entries.length; i++) { - IClasspathEntry entry = entries[i]; + for (IClasspathEntry entry : javaProject.getRawClasspath()) { if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { IPath path = entry.getPath(); if (isIvyClasspathContainer(path)) { @@ -205,9 +198,7 @@ public final class IvyClasspathContainerHelper { return null; } try { - IClasspathEntry[] entries = javaProject.getRawClasspath(); - for (int i = 0; i < entries.length; i++) { - IClasspathEntry entry = entries[i]; + for (IClasspathEntry entry : javaProject.getRawClasspath()) { if (entry != null && entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) { if (containerPath.equals(entry.getPath())) { return entry; @@ -237,11 +228,9 @@ public final class IvyClasspathContainerHelper { public static IProject[] getIvyProjectsInWorkspace() { Collection<IProject> ivyProjects = new HashSet<>(); - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - - for (int i = 0; i < projects.length; i++) { - if (projects[i].isOpen() && getContainers(projects[i]).size() > 0) { - ivyProjects.add(projects[i]); + for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { + if (project.isOpen() && getContainers(project).size() > 0) { + ivyProjects.add(project); } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java index eb6216e..5d2ab2e 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/CachedIvy.java @@ -287,11 +287,8 @@ public abstract class CachedIvy { // don't care } - Iterator keys = props.keySet().iterator(); - while (keys.hasNext()) { - String key = (String) keys.next(); - String value = props.getProperty(key); - ivySettings.setVariable(key, value); + for (String key : props.stringPropertyNames()) { + ivySettings.setVariable(key, props.getProperty(key)); } } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyMarkerManager.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyMarkerManager.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyMarkerManager.java index 82a6506..4dd59d8 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyMarkerManager.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyMarkerManager.java @@ -22,7 +22,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; public class IvyMarkerManager { @@ -65,9 +64,8 @@ public class IvyMarkerManager { return; } if (status.isMultiStatus()) { - IStatus[] allStatus = status.getChildren(); - for (int i = 0; i < allStatus.length; i++) { - addMarker(r, allStatus[i]); + for (IStatus childStatus : status.getChildren()) { + addMarker(r, childStatus); } } else { addMarker(r, status); http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyPlugin.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyPlugin.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyPlugin.java index a96df64..ea5dce0 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyPlugin.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/IvyPlugin.java @@ -223,7 +223,7 @@ public class IvyPlugin extends AbstractUIPlugin { osgiAvailable = true; try { Class.forName("org.apache.ivy.osgi.core.BundleInfo") - .getDeclaredMethod("getClasspath", new Class[] {}); + .getDeclaredMethod("getClasspath"); osgiClasspathAvailable = true; } catch (Exception e) { osgiClasspathAvailable = false; http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java index 295c3e0..8ec1d60 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java @@ -110,8 +110,6 @@ public final class IvyClasspathContainerConfAdapter { MappingSetup mappingSetup = conf.getMappingSetup(); AdvancedSetup advancedSetup = conf.getAdvancedSetup(); - String url = path.segment(1).substring(1); - String[] parameters = url.split("&"); conf.setAdvancedProjectSpecific(false); conf.setSettingsProjectSpecific(false); @@ -120,8 +118,8 @@ public final class IvyClasspathContainerConfAdapter { boolean isRetrieveProjectSpecific = false; RetrieveSetup standaloneRetrieveSetup = new RetrieveSetup(); - for (int i = 0; i < parameters.length; i++) { - String[] parameter = parameters[i].split("="); + for (String keyValue : path.segment(1).substring(1).split("&")) { + String[] parameter = keyValue.split("="); if (parameter == null || parameter.length == 0) { continue; } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java index 08b3da8..7e9ceb6 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerMapper.java @@ -263,10 +263,10 @@ public class IvyClasspathContainerMapper { Artifact artifact = adr.getArtifact(); monitor.subTask("searching " + matcher.getName() + " for " + artifact); for (ArtifactDownloadReport otherAdr : all) { - Artifact a = otherAdr.getArtifact(); - if (otherAdr.getLocalFile() != null && matcher.matchName(artifact, a.getName()) - && a.getModuleRevisionId().equals(artifact.getModuleRevisionId()) - && matcher.match(a)) { + Artifact otherArtifact = otherAdr.getArtifact(); + if (otherAdr.getLocalFile() != null && matcher.matchName(artifact, otherArtifact.getName()) + && otherArtifact.getModuleRevisionId().equals(artifact.getModuleRevisionId()) + && matcher.match(otherArtifact)) { return getArtifactPath(otherAdr, innerPath); } } @@ -277,8 +277,7 @@ public class IvyClasspathContainerMapper { if (artifacts != null) { Artifact foundArtifact = null; int nbFound = 0; - for (int i = 0; i < artifacts.length; i++) { - Artifact metaArtifact = artifacts[i]; + for (Artifact metaArtifact : artifacts) { if (matcher.match(metaArtifact)) { if (matcher.matchName(artifact, metaArtifact.getName())) { // we've found a matching artifact, let's provision it @@ -311,7 +310,7 @@ public class IvyClasspathContainerMapper { return null; } - private ArtifactMatcher sourceArtifactMatcher = new ArtifactMatcher() { + private final ArtifactMatcher sourceArtifactMatcher = new ArtifactMatcher() { public boolean matchName(Artifact artifact, String source) { return isArtifactName(artifact, source, mapping.getSourceSuffixes(), "source"); } @@ -325,7 +324,7 @@ public class IvyClasspathContainerMapper { } }; - private ArtifactMatcher javadocArtifactMatcher = new ArtifactMatcher() { + private final ArtifactMatcher javadocArtifactMatcher = new ArtifactMatcher() { public boolean matchName(Artifact artifact, String javadoc) { return isArtifactName(artifact, javadoc, mapping.getJavadocSuffixes(), "javadoc"); } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java index c504d9d..45bbd17 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathContainerSerializer.java @@ -207,30 +207,30 @@ public class IvyClasspathContainerSerializer { Node cpEntriesNode = document.createElement(CPENTRIES); node.appendChild(cpEntriesNode); - for (int i = 0; i < classpathEntries.length; i++) { + for (IClasspathEntry classpathEntry : classpathEntries) { Node cpEntryNode = document.createElement(CPENTRY); cpEntriesNode.appendChild(cpEntryNode); - int kind = classpathEntries[i].getEntryKind(); + int kind = classpathEntry.getEntryKind(); NamedNodeMap attributes = cpEntryNode.getAttributes(); Attr attr = document.createAttribute(KIND); attr.setValue(Integer.toString(kind)); attributes.setNamedItem(attr); attr = document.createAttribute(PATH); - attr.setValue(classpathEntries[i].getPath().toString()); + attr.setValue(classpathEntry.getPath().toString()); attributes.setNamedItem(attr); - IPath source = classpathEntries[i].getSourceAttachmentPath(); + IPath source = classpathEntry.getSourceAttachmentPath(); if (source != null) { attr = document.createAttribute(SOURCE); attr.setValue(source.toString()); attributes.setNamedItem(attr); } - writeAccessRules(ivycp, document, cpEntryNode, classpathEntries[i].getAccessRules()); + writeAccessRules(ivycp, document, cpEntryNode, classpathEntry.getAccessRules()); - writeCpAttr(ivycp, document, cpEntryNode, classpathEntries[i].getExtraAttributes()); + writeCpAttr(ivycp, document, cpEntryNode, classpathEntry.getExtraAttributes()); } } @@ -242,17 +242,17 @@ public class IvyClasspathContainerSerializer { Node accessRulesNode = document.createElement(ACCESS_RULES); cpEntryNode.appendChild(accessRulesNode); - for (int i = 0; i < accessRules.length; i++) { + for (IAccessRule accessRule : accessRules) { Node accessRuleNode = document.createElement(RULE); accessRulesNode.appendChild(accessRuleNode); NamedNodeMap attributes = accessRuleNode.getAttributes(); Attr attr = document.createAttribute(PATTERN); - attr.setValue(accessRules[i].getPattern().toString()); + attr.setValue(accessRule.getPattern().toString()); attributes.setNamedItem(attr); attr = document.createAttribute(KIND); - attr.setValue(Integer.toString(accessRules[i].getKind())); + attr.setValue(Integer.toString(accessRule.getKind())); attributes.setNamedItem(attr); } @@ -266,17 +266,17 @@ public class IvyClasspathContainerSerializer { Node cpAttrsNode = document.createElement(CPATTRS); node.appendChild(cpAttrsNode); - for (int i = 0; i < attrs.length; i++) { + for (IClasspathAttribute attribute : attrs) { Node attrNode = document.createElement(ATTR); cpAttrsNode.appendChild(attrNode); NamedNodeMap attributes = attrNode.getAttributes(); Attr attr = document.createAttribute(NAME); - attr.setValue(attrs[i].getName()); + attr.setValue(attribute.getName()); attributes.setNamedItem(attr); attr = document.createAttribute(VALUE); - attr.setValue(attrs[i].getValue()); + attr.setValue(attribute.getValue()); attributes.setNamedItem(attr); } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathUtil.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathUtil.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathUtil.java index 4e668e3..19aae09 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathUtil.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/cpcontainer/IvyClasspathUtil.java @@ -115,9 +115,7 @@ public final class IvyClasspathUtil { "Entry must be of kind CPE_LIBRARY or " + "CPE_VARIABLE"); //$NON-NLS-1$ } - IClasspathAttribute[] extraAttributes = entry.getExtraAttributes(); - for (int i = 0; i < extraAttributes.length; i++) { - IClasspathAttribute attrib = extraAttributes[i]; + for (IClasspathAttribute attrib : entry.getExtraAttributes()) { if (IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME.equals(attrib.getName())) { try { return new URL(attrib.getValue()); @@ -133,21 +131,21 @@ public final class IvyClasspathUtil { * Rewrites the module descriptor back to project's ivy file. * * @param descriptor ModuleDescriptor - * @param container IvyClasspathContainerImpl + * @param ivycp IvyClasspathContainerImpl * @throws IOException when access problems occur * @throws ParseException when parser problems occur * @throws IvyDEException when other problems occur */ - public static void toIvyFile(ModuleDescriptor descriptor, IvyClasspathContainerImpl container) + public static void toIvyFile(ModuleDescriptor descriptor, IvyClasspathContainerImpl ivycp) throws ParseException, IOException, IvyDEException { - IvyClasspathContainerConfiguration conf = container.getConf(); + IvyClasspathContainerConfiguration conf = ivycp.getConf(); // TODO the ivy file might not be in the workspace or may be an absolute path // in a such case the Eclipse API will state the file a read only IFile ivyFile = conf.getJavaProject().getProject().getFile(conf.getIvyXmlPath()); IStatus writable = ivyFile.getWorkspace().validateEdit(new IFile[] {ivyFile}, IWorkspace.VALIDATE_PROMPT); if (writable.isOK()) { - descriptor.toIvyFile(container.getState().getIvyFile()); + descriptor.toIvyFile(ivycp.getState().getIvyFile()); } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AbstractIvyDEHandler.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AbstractIvyDEHandler.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AbstractIvyDEHandler.java index b4fe717..e755add 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AbstractIvyDEHandler.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/handlers/AbstractIvyDEHandler.java @@ -87,7 +87,6 @@ public abstract class AbstractIvyDEHandler extends AbstractHandler { addElement(projects, element); } } - return projects; } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java index 34920cc..6f96bcf 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/IvyResolver.java @@ -214,14 +214,14 @@ public class IvyResolver { ResolveResult result = new ResolveResult(); // we check if all required configurations have been resolved - for (int i = 0; i < confs.length; i++) { - IvyDEMessage.verbose("Fetching the resolve report for configuration " + confs[i]); + for (String conf : confs) { + IvyDEMessage.verbose("Fetching the resolve report for configuration " + conf); File report = ivy.getResolutionCacheManager().getConfigurationResolveReportInCache( - IvyClasspathUtil.buildResolveId(useExtendedResolveId, md), confs[i]); + IvyClasspathUtil.buildResolveId(useExtendedResolveId, md), conf); IvyDEMessage.debug("Checking resolve report at " + report); if (!report.exists()) { - IvyDEMessage.info("The resolve report for the configuration " + confs[i] + IvyDEMessage.info("The resolve report for the configuration " + conf + " was not found. Falling back by doing a resolve again."); return doResolve(ivy, md); } else { @@ -296,26 +296,26 @@ public class IvyResolver { */ private void findAllArtifactOnRefresh(Ivy ivy, XmlReportParser parser, ResolveResult result) throws ParseException { - ModuleRevisionId[] dependencyMrdis = parser.getDependencyRevisionIds(); + ModuleRevisionId[] dependencyMrids = parser.getDependencyRevisionIds(); IvyDEMessage.verbose("Resolve report parsed. Fetching artifacts of " - + dependencyMrdis.length + " dependencie(s)"); - for (int iDep = 0; iDep < dependencyMrdis.length; iDep++) { - DependencyResolver depResolver = ivy.getSettings().getResolver(dependencyMrdis[iDep]); + + dependencyMrids.length + " dependencie(s)"); + for (ModuleRevisionId dependencyMrid : dependencyMrids) { + DependencyResolver depResolver = ivy.getSettings().getResolver(dependencyMrid); DefaultDependencyDescriptor depDescriptor = new DefaultDependencyDescriptor( - dependencyMrdis[iDep], false); + dependencyMrid, false); ResolveOptions options = new ResolveOptions(); options.setRefresh(true); options.setUseCacheOnly(true); - IvyDEMessage.debug("Fetching dependency " + dependencyMrdis[iDep]); + IvyDEMessage.debug("Fetching dependency " + dependencyMrid); ResolvedModuleRevision dependency = depResolver.getDependency(depDescriptor, new ResolveData(ivy.getResolveEngine(), options)); if (dependency != null) { Artifact[] artifacts = dependency.getDescriptor().getAllArtifacts(); - IvyDEMessage.debug("Dependency " + dependencyMrdis[iDep] + " found: " + IvyDEMessage.debug("Dependency " + dependencyMrid + " found: " + artifacts.length + " artifact(s) found"); - result.putArtifactsForDep(dependencyMrdis[iDep], artifacts); + result.putArtifactsForDep(dependencyMrid, artifacts); } else { - IvyDEMessage.debug("Dependency " + dependencyMrdis[iDep] + " not found"); + IvyDEMessage.debug("Dependency " + dependencyMrid + " not found"); } } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/ResolveResult.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/ResolveResult.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/ResolveResult.java index ef95512..3305c78 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/ResolveResult.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/resolve/ResolveResult.java @@ -36,13 +36,13 @@ public class ResolveResult { private final boolean previousUsed; - private Set<ArtifactDownloadReport> artifactReports = new LinkedHashSet<>(); + private final Set<ArtifactDownloadReport> artifactReports = new LinkedHashSet<>(); private Set<String> problemMessages = new HashSet<>(); private final ResolveReport report; - private Map<ModuleRevisionId, Artifact[]> artifactsByDependency = new HashMap<>(); + private final Map<ModuleRevisionId, Artifact[]> artifactsByDependency = new HashMap<>(); /** * Mapping of resolved artifact to their retrieved path, <code>null</code> if there were no http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/IvyUtil.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/IvyUtil.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/IvyUtil.java index 572d7b9..0e9497c 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/IvyUtil.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/revdepexplorer/IvyUtil.java @@ -52,11 +52,8 @@ public final class IvyUtil { if (md == null) { continue; } - DependencyDescriptor[] descriptors = md.getDependencies(); - for (int j = 0; j < descriptors.length; j++) { - DependencyDescriptor descriptor = descriptors[j]; - MultiRevDependencyDescriptor syncabledd = (MultiRevDependencyDescriptor) mdMap - .get(descriptor.getDependencyId()); + for (DependencyDescriptor descriptor : md.getDependencies()) { + MultiRevDependencyDescriptor syncabledd = mdMap.get(descriptor.getDependencyId()); if (syncabledd == null) { syncabledd = new MultiRevDependencyDescriptor( http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java index 6c32111..4db8f90 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsole.java @@ -118,8 +118,7 @@ public class IvyConsole extends MessageConsole implements MessageLogger { */ public class MyLifecycle implements org.eclipse.ui.console.IConsoleListener { public void consolesAdded(IConsole[] consoles) { - for (int i = 0; i < consoles.length; i++) { - IConsole console = consoles[i]; + for (IConsole console : consoles) { if (console == IvyConsole.this) { init(); } @@ -128,8 +127,7 @@ public class IvyConsole extends MessageConsole implements MessageLogger { } public void consolesRemoved(IConsole[] consoles) { - for (int i = 0; i < consoles.length; i++) { - IConsole console = consoles[i]; + for (IConsole console : consoles) { if (console == IvyConsole.this) { ConsolePlugin.getDefault().getConsoleManager().removeConsoleListener(this); dispose(); @@ -183,9 +181,7 @@ public class IvyConsole extends MessageConsole implements MessageLogger { private void dump() { synchronized (document) { visible = true; - ConsoleDocument.ConsoleLine[] lines = document.getLines(); - for (int i = 0; i < lines.length; i++) { - ConsoleDocument.ConsoleLine line = lines[i]; + for (ConsoleDocument.ConsoleLine line : document.getLines()) { appendLine(line.getType(), line.getLine()); } document.clear(); http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsoleFactory.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsoleFactory.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsoleFactory.java index 53b6712..0ca19c5 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsoleFactory.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/console/IvyConsoleFactory.java @@ -32,10 +32,9 @@ public class IvyConsoleFactory implements IConsoleFactory { IvyConsole console = IvyPlugin.getDefault().getConsole(); if (console != null) { IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); - IConsole[] existing = manager.getConsoles(); boolean exists = false; - for (int i = 0; i < existing.length; i++) { - if (console == existing[i]) { + for (IConsole existing : manager.getConsoles()) { + if (console == existing) { exists = true; } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvyModuleDescriptorEditor.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvyModuleDescriptorEditor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvyModuleDescriptorEditor.java index 3c04a7c..07fd208 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvyModuleDescriptorEditor.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvyModuleDescriptorEditor.java @@ -83,11 +83,10 @@ public class IvyModuleDescriptorEditor extends FormEditor implements IResourceCh private void parseModuleDescriptorExtensionMetadata() { final IExtension[] extensions = Platform.getExtensionRegistry() .getExtensionPoint(ModuleDescriptorExtension.EXTENSION_POINT).getExtensions(); - for (int i = 0; i < extensions.length; i++) { - final IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { + for (IExtension extension : extensions) { + for (IConfigurationElement configElement : extension.getConfigurationElements()) { final ModuleDescriptorExtensionDescriptor descriptor = new ModuleDescriptorExtensionDescriptor( - configElements[j]); + configElement); moduleDescriptorExtensionDescriptors.add(descriptor); } } @@ -96,11 +95,10 @@ public class IvyModuleDescriptorEditor extends FormEditor implements IResourceCh private void parseEditorPageExtensionMetadata() { final IExtension[] extensions = Platform.getExtensionRegistry() .getExtensionPoint(IvyEditorPage.EXTENSION_POINT).getExtensions(); - for (int i = 0; i < extensions.length; i++) { - final IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { + for (IExtension extension : extensions) { + for (IConfigurationElement configElement : extension.getConfigurationElements()) { final IvyEditorPageDescriptor descriptor = new IvyEditorPageDescriptor( - configElements[j]); + configElement); ivyEditorPageDescriptors.add(descriptor); } } @@ -284,12 +282,11 @@ public class IvyModuleDescriptorEditor extends FormEditor implements IResourceCh final IResource res = event.getResource(); Display.getDefault().asyncExec(new Runnable() { public void run() { - IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages(); - for (int i = 0; i < pages.length; i++) { + for (IWorkbenchPage page : getSite().getWorkbenchWindow().getPages()) { if (((IFileEditorInput) xmlEditor.getEditorInput()).getFile().getProject() .equals(res)) { - IEditorPart editorPart = pages[i].findEditor(xmlEditor.getEditorInput()); - pages[i].closeEditor(editorPart, true); + IEditorPart editorPart = page.findEditor(xmlEditor.getEditorInput()); + page.closeEditor(editorPart, true); } } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvySettingsEditor.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvySettingsEditor.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvySettingsEditor.java index 9b6a2da..7543e90 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvySettingsEditor.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/editors/IvySettingsEditor.java @@ -178,13 +178,12 @@ public class IvySettingsEditor extends FormEditor implements IResourceChangeList final IResource res = event.getResource(); Display.getDefault().asyncExec(new Runnable() { public void run() { - IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages(); - for (int i = 0; i < pages.length; i++) { + for (IWorkbenchPage page : getSite().getWorkbenchWindow().getPages()) { if (((IFileEditorInput) xmlEditor.getEditorInput()).getFile().getProject() .equals(res)) { - IEditorPart editorPart = pages[i] + IEditorPart editorPart = page .findEditor(xmlEditor.getEditorInput()); - pages[i].closeEditor(editorPart, true); + page.closeEditor(editorPart, true); } } } http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java index 6fb118d..2c815e7 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/views/ReverseDependencyExplorerView.java @@ -210,10 +210,7 @@ public class ReverseDependencyExplorerView extends ViewPart { viewer.refresh(); - TreeItem[] items = viewer.getTree().getItems(); - - for (int i = 0; i < items.length; i++) { - TreeItem item = items[i]; + for (TreeItem item : viewer.getTree().getItems()) { MultiRevDependencyDescriptor multiRD = (MultiRevDependencyDescriptor) item .getData(); @@ -360,9 +357,9 @@ public class ReverseDependencyExplorerView extends ViewPart { } class CPDependencyDescriptor { - private IvyClasspathContainerImpl container; + private final IvyClasspathContainerImpl container; - private MultiRevDependencyDescriptor multiRevisionDescriptor; + private final MultiRevDependencyDescriptor multiRevisionDescriptor; public CPDependencyDescriptor(IvyClasspathContainerImpl container, MultiRevDependencyDescriptor multiRevisionDescriptor) { http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java index 6d7c553..1f89e3c 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResolver.java @@ -21,8 +21,6 @@ import java.io.File; import java.io.IOException; import java.text.ParseException; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import org.apache.ivy.Ivy; @@ -150,28 +148,28 @@ public class WorkspaceResolver extends AbstractResolver { // Not much to do here - downloads are not required for workspace projects. DownloadReport dr = new DownloadReport(); - for (int i = 0; i < artifacts.length; i++) { - ArtifactDownloadReport adr = new ArtifactDownloadReport(artifacts[i]); + for (Artifact artifact : artifacts) { + ArtifactDownloadReport adr = new ArtifactDownloadReport(artifact); dr.addArtifactReport(adr); // Only report java projects as downloaded - if (artifacts[i].getType().equals(ECLIPSE_PROJECT_TYPE)) { + if (artifact.getType().equals(ECLIPSE_PROJECT_TYPE)) { adr.setDownloadStatus(DownloadStatus.NO); adr.setSize(0); - Message.verbose("\t[IN WORKSPACE] " + artifacts[i]); - } else if (workspaceArtifacts != null && workspaceArtifacts.containsKey(artifacts[i])) { + Message.verbose("\t[IN WORKSPACE] " + artifact); + } else if (workspaceArtifacts != null && workspaceArtifacts.containsKey(artifact)) { adr.setDownloadStatus(DownloadStatus.NO); adr.setSize(0); // there is some 'forced' artifact by the dependency descriptor - Artifact eclipseArtifact = workspaceArtifacts.get(artifacts[i]); + Artifact eclipseArtifact = workspaceArtifacts.get(artifact); ArtifactDownloadReport eclipseAdr = new ArtifactDownloadReport(eclipseArtifact); eclipseAdr.setDownloadStatus(DownloadStatus.NO); eclipseAdr.setSize(0); - workspaceReports.put(artifacts[i], eclipseAdr); + workspaceReports.put(artifact, eclipseAdr); Message.verbose("\t[IN WORKSPACE] " + eclipseArtifact); } else { adr.setDownloadStatus(DownloadStatus.FAILED); Message.verbose("\t[Eclipse Workspace resolver] " - + "cannot download non-project artifact: " + artifacts[i]); + + "cannot download non-project artifact: " + artifact); } } return dr; @@ -200,15 +198,12 @@ public class WorkspaceResolver extends AbstractResolver { // Iterate over workspace to find Java project which has an Ivy // container for this dependency - for (int i = 0; i < projects.length; i++) { - IProject p = projects[i]; + for (IProject p : projects) { if (!p.exists()) { continue; } - List<IvyClasspathContainer> containers = IvyClasspathContainerHelper.getContainers(p); - Iterator<IvyClasspathContainer> itContainer = containers.iterator(); - while (itContainer.hasNext()) { - IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) itContainer.next(); + for (IvyClasspathContainer container : IvyClasspathContainerHelper.getContainers(p)) { + IvyClasspathContainerImpl ivycp = (IvyClasspathContainerImpl) container; ModuleDescriptor md = ivycp.getState().getCachedModuleDescriptor(); if (md == null) { continue; @@ -323,11 +318,11 @@ public class WorkspaceResolver extends AbstractResolver { workspaceArtifacts = new HashMap<>(); parentContext.set(IVYDE_WORKSPACE_ARTIFACTS, workspaceArtifacts); } - for (int j = 0; j < dArtifacts.length; j++) { - Artifact artifact = new MDArtifact(md, dArtifacts[j].getName(), - dArtifacts[j].getType(), dArtifacts[j].getExt(), - dArtifacts[j].getUrl(), - dArtifacts[j].getQualifiedExtraAttributes()); + for (DependencyArtifactDescriptor dArtifact : dArtifacts) { + Artifact artifact = new MDArtifact(md, dArtifact.getName(), + dArtifact.getType(), dArtifact.getExt(), + dArtifact.getUrl(), + dArtifact.getQualifiedExtraAttributes()); workspaceArtifacts.put(artifact, af); } IvyContext.pushContext(currentContext); @@ -368,27 +363,24 @@ public class WorkspaceResolver extends AbstractResolver { if (allConfs.length == 0) { newMd.addArtifact(ModuleDescriptor.DEFAULT_CONFIGURATION, af); } else { - for (int k = 0; k < allConfs.length; k++) { - newMd.addConfiguration(allConfs[k]); - newMd.addArtifact(allConfs[k].getName(), af); + for (Configuration conf : allConfs) { + newMd.addConfiguration(conf); + newMd.addArtifact(conf.getName(), af); } } - DependencyDescriptor[] dependencies = md.getDependencies(); - for (int k = 0; k < dependencies.length; k++) { - newMd.addDependency(dependencies[k]); + for (DependencyDescriptor dependency : md.getDependencies()) { + newMd.addDependency(dependency); } - ExcludeRule[] allExcludeRules = md.getAllExcludeRules(); - for (int k = 0; k < allExcludeRules.length; k++) { - newMd.addExcludeRule(allExcludeRules[k]); + for (ExcludeRule excludeRule : md.getAllExcludeRules()) { + newMd.addExcludeRule(excludeRule); } newMd.getExtraInfos().addAll(md.getExtraInfos()); - License[] licenses = md.getLicenses(); - for (int k = 0; k < licenses.length; k++) { - newMd.addLicense(licenses[k]); + for (License license : md.getLicenses()) { + newMd.addLicense(license); } return newMd; http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f6952d90/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java ---------------------------------------------------------------------- diff --git a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java index a633524..bf99d1a 100644 --- a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java +++ b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/workspaceresolver/WorkspaceResourceChangeListener.java @@ -204,9 +204,9 @@ public class WorkspaceResourceChangeListener implements IResourceChangeListener return allContainers; } - for (int i = 0; i < projects.length; i++) { - if (!openedProjects.contains(projects[i].getProject())) { - allContainers.addAll(IvyClasspathContainerHelper.getContainers(projects[i])); + for (IJavaProject project : projects) { + if (!openedProjects.contains(project.getProject())) { + allContainers.addAll(IvyClasspathContainerHelper.getContainers(project)); } }
