Bug 511127 - error markers on imports with version ranges
Use PluginRegistry.findModel(String, VersionRange, PluginFilter) instead
of PluginRegistry.findModel(String, String, int, PluginFilter).
Change-Id: I19e3b2ecc179dd62ffb9a250381ae153cf3cc5f5
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/ImportObject.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/ImportObject.java
index 5eaed5c..4172ab4 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/ImportObject.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/ImportObject.java
@@ -15,6 +15,7 @@
import java.io.PrintWriter;
import java.io.Serializable;
+import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.pde.core.ISourceObject;
import org.eclipse.pde.core.IWritable;
import org.eclipse.pde.core.plugin.IPluginBase;
@@ -86,7 +87,9 @@
@Override
protected IPluginModelBase findModel() {
- return PluginRegistry.findModel(getId(), iimport.getVersion(), iimport.getMatch(), null);
+ String version = iimport.getVersion();
+ VersionRange range = new VersionRange(version);
+ return PluginRegistry.findModel(getId(), range, null);
}
}
