diff options
| author | Pascal Rapicault | 2011-06-19 18:52:51 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2011-06-19 18:52:51 +0000 |
| commit | 0d9038e7b18c3e17a13926230664d8515545973d (patch) | |
| tree | 08944374a234c99a4f2d079931655088be527f8f /bundles/org.eclipse.equinox.simpleconfigurator | |
| parent | 8baf009818d946c0c8374c5919c0979b201d29b5 (diff) | |
| download | rt.equinox.p2-0d9038e7b18c3e17a13926230664d8515545973d.tar.gz rt.equinox.p2-0d9038e7b18c3e17a13926230664d8515545973d.tar.xz rt.equinox.p2-0d9038e7b18c3e17a13926230664d8515545973d.zip | |
Bug 349774 - [felix][configurator] Remove dependency on VersionRange
Diffstat (limited to 'bundles/org.eclipse.equinox.simpleconfigurator')
| -rw-r--r-- | bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java index 0ab0582f2..aa0235abf 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java @@ -11,7 +11,6 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils; import java.io.*; import java.net.*; import java.util.*; -import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; public class SimpleConfiguratorUtils { @@ -20,7 +19,6 @@ public class SimpleConfiguratorUtils { private static final String VERSION_PREFIX = "#version="; public static final String ENCODING_UTF8 = "#encoding=UTF-8"; public static final Version COMPATIBLE_VERSION = new Version(1, 0, 0); - public static final VersionRange VERSION_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, new Version(2, 0, 0), false); private static final String FILE_SCHEME = "file"; private static final String REFERENCE_PREFIX = "reference:"; @@ -122,7 +120,7 @@ public class SimpleConfiguratorUtils { // version if (line.startsWith(VERSION_PREFIX)) { String version = line.substring(VERSION_PREFIX.length()).trim(); - if (!VERSION_TOLERANCE.isIncluded(new Version(version))) + if (!COMPATIBLE_VERSION.equals(new Version(version))) throw new IllegalArgumentException("Invalid version: " + version); } } |