From 285fce7c4a903d237a9f18dad8dd4d4f41a34061 Mon Sep 17 00:00:00 2001 From: t562372 Date: Fri, 28 Oct 2016 11:07:44 +0200 Subject: [PATCH 1/2] adjusted dependencies to renamed wfs artifacts, completed upgrade 4.7.0 --- .../tests/FeatureInjectorProviderCustom.xtend | 6 +++--- org.boomslang.dsl.feature.ui/META-INF/MANIFEST.MF | 2 +- .../ui/contentassist/FeatureProposalProvider.xtend | 4 ++-- .../ui/quickfix/FeatureQuickfixProvider.xtend | 2 -- org.boomslang.dsl.feature/META-INF/MANIFEST.MF | 2 +- .../dsl/feature/scoping/FeatureScopeProvider.xtend | 2 +- .../dsl/feature/validation/FeatureValidator.xtend | 13 ++++--------- .../META-INF/MANIFEST.MF | 2 +- .../tests/MappingInjectorProviderCustom.xtend | 6 +++--- org.boomslang.dsl.mapping.ui/META-INF/MANIFEST.MF | 2 +- org.boomslang.feature/feature.xml | 6 +++--- org.boomslang.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- 13 files changed, 22 insertions(+), 29 deletions(-) diff --git a/org.boomslang.dsl.feature.tests/src/org/boomslang/dsl/feature/tests/FeatureInjectorProviderCustom.xtend b/org.boomslang.dsl.feature.tests/src/org/boomslang/dsl/feature/tests/FeatureInjectorProviderCustom.xtend index 1a3b69a..3b0a530 100644 --- a/org.boomslang.dsl.feature.tests/src/org/boomslang/dsl/feature/tests/FeatureInjectorProviderCustom.xtend +++ b/org.boomslang.dsl.feature.tests/src/org/boomslang/dsl/feature/tests/FeatureInjectorProviderCustom.xtend @@ -2,10 +2,10 @@ package org.boomslang.dsl.feature.tests import org.boomslang.dsl.feature.tests.FeatureInjectorProvider import com.google.inject.Injector -import com.wireframesketcher.model.xtext.BoomslangWFSModelResourceFactory -import com.wireframesketcher.model.xtext.ScreenEmfSupport +import org.boomslang.wireframesketcher.model.xtext.BoomslangWFSModelResourceFactory +import org.boomslang.wireframesketcher.model.xtext.ScreenEmfSupport import org.eclipse.emf.ecore.resource.Resource -import com.wireframesketcher.model.xtext.ScreenStandaloneSetupGenerated +import org.boomslang.wireframesketcher.model.xtext.ScreenStandaloneSetupGenerated class FeatureInjectorProviderCustom extends FeatureInjectorProvider { diff --git a/org.boomslang.dsl.feature.ui/META-INF/MANIFEST.MF b/org.boomslang.dsl.feature.ui/META-INF/MANIFEST.MF index ee702a7..b81c82f 100644 --- a/org.boomslang.dsl.feature.ui/META-INF/MANIFEST.MF +++ b/org.boomslang.dsl.feature.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.boomslang.dsl.feature, org.eclipse.xtend.lib;resolution:=optional, org.boomslang.dsl.mapping, org.boomslang.core.ui, - com.wireframesketcher.model.xtext, + org.boomslang.wireframesketcher.model.xtext, org.apache.commons.lang Import-Package: org.boomslang.dsl.mapping.mapping, org.apache.log4j diff --git a/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/contentassist/FeatureProposalProvider.xtend b/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/contentassist/FeatureProposalProvider.xtend index 6c64acb..ce71a45 100644 --- a/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/contentassist/FeatureProposalProvider.xtend +++ b/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/contentassist/FeatureProposalProvider.xtend @@ -39,8 +39,8 @@ import static extension org.eclipse.xtext.EcoreUtil2.* import com.wireframesketcher.model.WidgetGroup import com.wireframesketcher.model.TabbedPane import com.wireframesketcher.model.Tree -import com.wireframesketcher.model.xtext.ScreenResourceDescriptionStrategyUtil -import com.wireframesketcher.model.xtext.IEObjectDescriptionUtil +import org.boomslang.wireframesketcher.model.xtext.ScreenResourceDescriptionStrategyUtil +import org.boomslang.wireframesketcher.model.xtext.IEObjectDescriptionUtil import org.boomslang.dsl.feature.feature.NodeQName import org.eclipse.xtext.scoping.impl.FilteringScope import org.apache.commons.lang.StringUtils diff --git a/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/quickfix/FeatureQuickfixProvider.xtend b/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/quickfix/FeatureQuickfixProvider.xtend index 0ad941d..850faee 100644 --- a/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/quickfix/FeatureQuickfixProvider.xtend +++ b/org.boomslang.dsl.feature.ui/src/org/boomslang/dsl/feature/ui/quickfix/FeatureQuickfixProvider.xtend @@ -29,8 +29,6 @@ import org.eclipse.xtext.ui.editor.quickfix.Fix import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor import org.eclipse.xtext.validation.Issue import org.boomslang.dsl.feature.validation.TypeCorrespondsToRefValidator -import org.boomslang.dsl.feature.feature.BClickAction -import org.boomslang.dsl.feature.feature.BTypeAction /** * Custom quickfixes. diff --git a/org.boomslang.dsl.feature/META-INF/MANIFEST.MF b/org.boomslang.dsl.feature/META-INF/MANIFEST.MF index 947efa3..876a43c 100644 --- a/org.boomslang.dsl.feature/META-INF/MANIFEST.MF +++ b/org.boomslang.dsl.feature/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0", - com.wireframesketcher.model.xtext;visibility:=reexport, + org.boomslang.wireframesketcher.model.xtext;visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.10.0", org.eclipse.xtext.xtext.generator;bundle-version="2.10.0", org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional, diff --git a/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/scoping/FeatureScopeProvider.xtend b/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/scoping/FeatureScopeProvider.xtend index dde63e7..1824e29 100644 --- a/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/scoping/FeatureScopeProvider.xtend +++ b/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/scoping/FeatureScopeProvider.xtend @@ -17,7 +17,7 @@ import org.eclipse.xtext.scoping.IScope import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider import org.eclipse.xtext.scoping.impl.FilteringScope import com.wireframesketcher.model.WidgetContainer -import com.wireframesketcher.model.xtext.IEObjectDescriptionUtil +import org.boomslang.wireframesketcher.model.xtext.IEObjectDescriptionUtil import java.util.ArrayList import org.boomslang.dsl.feature.feature.BToScreenSwitch import org.eclipse.xtext.resource.IEObjectDescription diff --git a/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/validation/FeatureValidator.xtend b/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/validation/FeatureValidator.xtend index d485554..5dce0d4 100644 --- a/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/validation/FeatureValidator.xtend +++ b/org.boomslang.dsl.feature/src/org/boomslang/dsl/feature/validation/FeatureValidator.xtend @@ -5,15 +5,10 @@ package org.boomslang.dsl.feature.validation import org.boomslang.core.validation.PackageFolderStructureValidator import org.boomslang.dsl.feature.feature.BScenario -import org.boomslang.dsl.feature.feature.BWidgetWrapper import org.boomslang.dsl.feature.feature.FeaturePackage -//import org.boomslang.dsl.mapping.mapping.BMappingPackage -//import org.boomslang.dsl.mapping.mapping.MappingPackage import com.google.inject.Inject -import com.wireframesketcher.model.Screen import java.util.List import org.eclipse.xtext.resource.IContainer -import org.eclipse.xtext.resource.IEObjectDescription import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider import org.eclipse.xtext.validation.Check import org.eclipse.xtext.validation.ComposedChecks @@ -71,15 +66,15 @@ class FeatureValidator extends AbstractFeatureValidator { } if (!nextScenarioInChain.params.nullOrEmpty || nextScenarioInChain.dataProvider != null) { error( - '''Only unparameterized scenarios may be used as dependencies, but «nextScenarioInChain.name» is parameterized (chain: «scenarioChain. - map[name].join(" -> ")» -> «nextScenarioInChain.name»)''', scenarioChain.head, + '''Only unparameterized scenarios may be used as dependencies, but �nextScenarioInChain.name� is parameterized (chain: �scenarioChain. + map[name].join(" -> ")� -> �nextScenarioInChain.name�)''', scenarioChain.head, FeaturePackage.Literals.BSCENARIO__PRE_SCENARIO, REFERENCED_PARAMETERIZED_SCENARIO) return } if (scenarioChain.contains(nextScenarioInChain)) { error( - '''Recursive dependencies, the chain is: «scenarioChain.map[name].join(" -> ")» -> «scenarioChain.head. - name»''', scenarioChain.head, FeaturePackage.Literals.BSCENARIO__PRE_SCENARIO, SCENARIO_DEPENDENCY_LOOP) + '''Recursive dependencies, the chain is: �scenarioChain.map[name].join(" -> ")� -> �scenarioChain.head. + name�''', scenarioChain.head, FeaturePackage.Literals.BSCENARIO__PRE_SCENARIO, SCENARIO_DEPENDENCY_LOOP) return } scenarioChain.add(nextScenarioInChain) diff --git a/org.boomslang.dsl.mapping.tests/META-INF/MANIFEST.MF b/org.boomslang.dsl.mapping.tests/META-INF/MANIFEST.MF index e0f0474..be43061 100644 --- a/org.boomslang.dsl.mapping.tests/META-INF/MANIFEST.MF +++ b/org.boomslang.dsl.mapping.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.boomslang.dsl.mapping, org.xpect.xtext.lib, org.eclipse.ui.workbench;resolution:=optional, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional, - com.wireframesketcher.model.xtext;bundle-version="4.7.0" + org.boomslang.wireframesketcher.model.xtext;bundle-version="4.7.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.boomslang.dsl.mapping.tests Import-Package: org.junit.runner;version="4.5.0", diff --git a/org.boomslang.dsl.mapping.tests/src/org/boomslang/dsl/mapping/tests/MappingInjectorProviderCustom.xtend b/org.boomslang.dsl.mapping.tests/src/org/boomslang/dsl/mapping/tests/MappingInjectorProviderCustom.xtend index 1205dea..42dfe15 100644 --- a/org.boomslang.dsl.mapping.tests/src/org/boomslang/dsl/mapping/tests/MappingInjectorProviderCustom.xtend +++ b/org.boomslang.dsl.mapping.tests/src/org/boomslang/dsl/mapping/tests/MappingInjectorProviderCustom.xtend @@ -2,10 +2,10 @@ package org.boomslang.dsl.mapping.tests import org.boomslang.dsl.mapping.tests.MappingInjectorProvider import com.google.inject.Injector -import com.wireframesketcher.model.xtext.BoomslangWFSModelResourceFactory -import com.wireframesketcher.model.xtext.ScreenEmfSupport +import org.boomslang.wireframesketcher.model.xtext.BoomslangWFSModelResourceFactory +import org.boomslang.wireframesketcher.model.xtext.ScreenEmfSupport import org.eclipse.emf.ecore.resource.Resource -import com.wireframesketcher.model.xtext.ScreenStandaloneSetupGenerated +import org.boomslang.wireframesketcher.model.xtext.ScreenStandaloneSetupGenerated class MappingInjectorProviderCustom extends MappingInjectorProvider { diff --git a/org.boomslang.dsl.mapping.ui/META-INF/MANIFEST.MF b/org.boomslang.dsl.mapping.ui/META-INF/MANIFEST.MF index 5658e7a..b157368 100644 --- a/org.boomslang.dsl.mapping.ui/META-INF/MANIFEST.MF +++ b/org.boomslang.dsl.mapping.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.boomslang.dsl.mapping, org.eclipse.xtext.builder, org.eclipse.xtext.xbase.lib, org.boomslang.core.ui, - com.wireframesketcher.model.xtext, + org.boomslang.wireframesketcher.model.xtext, org.apache.commons.lang;bundle-version="2.6.0" Import-Package: org.boomslang.core.contentassist, org.boomslang.dsl.mapping.services, diff --git a/org.boomslang.feature/feature.xml b/org.boomslang.feature/feature.xml index 6c2d753..2044d33 100644 --- a/org.boomslang.feature/feature.xml +++ b/org.boomslang.feature/feature.xml @@ -28,7 +28,7 @@ version="0.0.0"/> - + @@ -67,7 +67,7 @@ - + diff --git a/org.boomslang.feature/pom.xml b/org.boomslang.feature/pom.xml index d00856d..43072eb 100644 --- a/org.boomslang.feature/pom.xml +++ b/org.boomslang.feature/pom.xml @@ -54,7 +54,7 @@ com.wireframesketcher - com.wireframesketcher.model.xtext + org.boomslang.wireframesketcher.model.xtext ${wfs.version} --> diff --git a/org.boomslang.generator.feature.extension/META-INF/MANIFEST.MF b/org.boomslang.generator.feature.extension/META-INF/MANIFEST.MF index 7a9c0f9..a2bb78a 100644 --- a/org.boomslang.generator.feature.extension/META-INF/MANIFEST.MF +++ b/org.boomslang.generator.feature.extension/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.emf.common, org.antlr.runtime, org.eclipse.xtext.common.types, - com.wireframesketcher.model.xtext;visibility:=reexport, + org.boomslang.wireframesketcher.model.xtext;visibility:=reexport, org.boomslang.dsl.feature;visibility:=reexport, org.boomslang.dsl.mapping;visibility:=reexport, org.apache.commons.lang, From ff51e34e3f26de8b6cee7dc34c5a367d85f42f9e Mon Sep 17 00:00:00 2001 From: t562372 Date: Fri, 28 Oct 2016 11:18:17 +0200 Subject: [PATCH 2/2] renamed dependency in remote target platform --- .../org.boomslang.targetplatform.target | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.boomslang.targetplatform/org.boomslang.targetplatform.target b/org.boomslang.targetplatform/org.boomslang.targetplatform.target index 985ebed..5c8c9a0 100644 --- a/org.boomslang.targetplatform/org.boomslang.targetplatform.target +++ b/org.boomslang.targetplatform/org.boomslang.targetplatform.target @@ -47,9 +47,9 @@ - - - + + +