diff options
| author | Darin Wright | 2010-10-04 18:25:31 +0000 |
|---|---|---|
| committer | Darin Wright | 2010-10-04 18:25:31 +0000 |
| commit | ef4a398e9e9303318edb12d29712e67f5cf79dac (patch) | |
| tree | a8f75a1b50302df015c1eaf52696d2a7d11cd089 | |
| parent | 709ebfdbdd40c2a44cdb3f309a23f8936d1b2f61 (diff) | |
| download | eclipse.platform-R3_6_1_maintenance.tar.gz eclipse.platform-R3_6_1_maintenance.tar.xz eclipse.platform-R3_6_1_maintenance.zip | |
[r361m] Bug 326958 - default ANT home directory lower than the Ant plugin versionv20101004_r362v20101004_r361mR3_6_1_maintenance
| -rw-r--r-- | ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java index 38344934d..61d38c449 100644 --- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java +++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -476,11 +476,14 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences. /** * Simple algorithm to find the highest version of <code>org.apache.ant</code> * available. If there are other providers that are not <code>org.apache.ant</code> - * <code>null</code> is returned so that all bundles will be inspected - * for contributed libraries. - * <p> - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851 - * </p> + * they are ignored and all versions of <code>org.apache.ant</code> are considered. + * <br><br> + * See the following bugs for related history: + * <ul> + * <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851">https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851</a></li> + * <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325125">https://bugs.eclipse.org/bugs/show_bug.cgi?id=325125</a></li> + * </ul> + * * @param packages the live list of {@link ExportedPackage}s to inspect * @return the bundle that represents the highest version of <code>org.apache.ant</code> or <code>null</code> * if there are other providers for the <code>org.apache.ant.tools</code> packages. @@ -496,9 +499,6 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences. if("org.apache.ant".equals(bundle.getSymbolicName())) { //$NON-NLS-1$ bundles.add(bundle); } - else { - return null; - } } Bundle highest = null; Bundle temp = null; |