Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2008-12-15 10:50:03 -0500
committerThomas Watson2008-12-15 10:50:03 -0500
commit4acc71df1e60902617a64ef4996e4951f4218a9d (patch)
tree4ee17048303464241da4b0099ecd0b615bc483d1 /bundles/org.eclipse.osgi/resolver
parent7e2fa05c41b1f235eda6cb8728a48b6e7c8ab5aa (diff)
downloadrt.equinox.framework-4acc71df1e60902617a64ef4996e4951f4218a9d.tar.gz
rt.equinox.framework-4acc71df1e60902617a64ef4996e4951f4218a9d.tar.xz
rt.equinox.framework-4acc71df1e60902617a64ef4996e4951f4218a9d.zip
Bug 253243 [osgi] Keep API up to date with latest OSGi R4.2 specification
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java6
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java3
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java2
4 files changed, 9 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
index 2597d4525..2d80e5263 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
import org.eclipse.osgi.framework.debug.Debug;
import org.eclipse.osgi.framework.debug.FrameworkDebugOptions;
import org.eclipse.osgi.framework.internal.core.Constants;
+import org.eclipse.osgi.framework.internal.core.FilterImpl;
import org.eclipse.osgi.framework.util.SecureAction;
import org.eclipse.osgi.internal.module.GroupingChecker.PackageRoots;
import org.eclipse.osgi.internal.resolver.BundleDescriptionImpl;
@@ -305,7 +306,7 @@ public class ResolverImpl implements org.eclipse.osgi.service.resolver.Resolver
if (platformProperties == null)
return false;
try {
- Filter filter = FrameworkUtil.createFilter(platformFilter);
+ Filter filter = FilterImpl.newInstance(platformFilter);
for (int i = 0; i < platformProperties.length; i++)
// using matchCase here in case of duplicate case invarient keys (bug 180817)
if (filter.matchCase(platformProperties[i]))
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
index 322131e11..6ba83c78c 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/GenericSpecificationImpl.java
@@ -11,8 +11,10 @@
*******************************************************************************/
package org.eclipse.osgi.internal.resolver;
+import org.eclipse.osgi.framework.internal.core.FilterImpl;
import org.eclipse.osgi.service.resolver.*;
-import org.osgi.framework.*;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
public class GenericSpecificationImpl extends VersionConstraintImpl implements GenericSpecification {
private Filter matchingFilter;
@@ -28,7 +30,7 @@ public class GenericSpecificationImpl extends VersionConstraintImpl implements G
void setMatchingFilter(String matchingFilter) throws InvalidSyntaxException {
synchronized (this.monitor) {
- this.matchingFilter = matchingFilter == null ? null : FrameworkUtil.createFilter(matchingFilter);
+ this.matchingFilter = matchingFilter == null ? null : FilterImpl.newInstance(matchingFilter);
}
}
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
index 152becbc4..7370ac94d 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/NativeCodeDescriptionImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.osgi.internal.resolver;
import java.util.Dictionary;
import org.eclipse.osgi.framework.internal.core.Constants;
+import org.eclipse.osgi.framework.internal.core.FilterImpl;
import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.*;
@@ -184,7 +185,7 @@ public class NativeCodeDescriptionImpl extends BaseDescriptionImpl implements Na
}
void setFilter(String filter) throws InvalidSyntaxException {
- this.filter = filter == null ? null : FrameworkUtil.createFilter(filter);
+ this.filter = filter == null ? null : FilterImpl.newInstance(filter);
}
void setLanguages(String[] languages) {
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index a017142e9..39b8c553f 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -70,7 +70,7 @@ public abstract class StateImpl implements State {
if (platformFilter != null) {
try {
// add any new platform filter propery keys this bundle is using
- FilterImpl filter = (FilterImpl) FrameworkUtil.createFilter(platformFilter);
+ FilterImpl filter = FilterImpl.newInstance(platformFilter);
addPlatformPropertyKeys(filter.getAttributes());
} catch (InvalidSyntaxException e) {
// ignore this is handled in another place

Back to the top