[583470] Eliminate org.eclipse.emf.query usage
diff --git a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF index 736b03c..35cdaf2 100644 --- a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.modisco.infra.common.ui;bundle-version="0.6.0", org.eclipse.modisco.infra.query.core;bundle-version="0.0.1", - org.eclipse.emf.query;bundle-version="1.2.100", org.eclipse.modisco.infra.common.core;bundle-version="0.7.0", org.eclipse.ui.ide;bundle-version="3.5.0", org.junit;bundle-version="4.7.0",
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/samples/EmfmqQueryTest.java b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/samples/EmfmqQueryTest.java index dcc2c21..aee8661 100644 --- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/samples/EmfmqQueryTest.java +++ b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/samples/EmfmqQueryTest.java
@@ -1,5 +1,6 @@ package org.eclipse.modisco.infra.query.tests.samples; +import java.util.Collections; /** * Copyright (c) 2009,2019 Mia-Software and others. * All rights reserved. This program and the accompanying materials @@ -15,11 +16,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.emf.query.conditions.eobjects.structuralfeatures.EObjectAttributeValueCondition; -import org.eclipse.emf.query.conditions.strings.SubStringValue; -import org.eclipse.emf.query.statements.FROM; -import org.eclipse.emf.query.statements.SELECT; -import org.eclipse.emf.query.statements.WHERE; import org.eclipse.modisco.infra.query.core.exception.ModelQueryExecutionException; import org.eclipse.modisco.infra.query.core.java.IJavaModelQuery; import org.eclipse.modisco.infra.query.core.java.ParameterValueList; @@ -30,11 +26,13 @@ public Set<? extends EObject> evaluate(final EPackage context, final ParameterValueList parameterValues) throws ModelQueryExecutionException { - EPackage ePackage = context; +/* Functionality removed in accordance with Bug 583470 + * EPackage ePackage = context; SELECT statement = new SELECT(new FROM(ePackage.getEClassifiers()), new WHERE(new EObjectAttributeValueCondition( EcorePackage.eINSTANCE.getENamedElement_Name(), new SubStringValue("EC")))); //$NON-NLS-1$ - return statement.execute().getEObjects(); + return statement.execute().getEObjects(); */ + return Collections.emptySet(); } } \ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target index 0c0c184..35a0b76 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/nightly.target
@@ -42,11 +42,6 @@ <repository location="http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/> - <!--repository location="https://download.eclipse.org/modeling/emf/query/updates/interim"/--> - <repository location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> - </location> - <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/> <!--repository location="https://download.eclipse.org/modeling/emf/validation/updates/interim"/--> <repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824"/>
diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target index 1574d23..68164bf 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/stable.target
@@ -20,7 +20,6 @@ <!--unit id="org.eclipse.net4j.db.derby.feature.group" version="0.0.0"/--> <unit id="org.eclipse.net4j.db.derby" version="0.0.0"/> <unit id="org.eclipse.net4j.db.derby.source" version="0.0.0"/> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/> <!--unit id="org.eclipse.birt.chart.feature.group" version="0.0.0"/-->
diff --git a/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target b/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target index 1f857d1..8d8492c 100644 --- a/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target +++ b/org.eclipse.modisco.releng.tycho/targetPlatforms/unspecified.target
@@ -23,7 +23,6 @@ <!--unit id="org.eclipse.net4j.db.derby.feature.group" version="0.0.0"/--> <unit id="org.eclipse.net4j.db.derby" version="0.0.0"/> <unit id="org.eclipse.net4j.db.derby.source" version="0.0.0"/> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.birt.chart.feature.group" version="0.0.0"/>