Updated FeatureIDE dependency to Version 3.7.0
The FeatureIDE Handler used to be dependent on FeatureIDE 3.5.4 which
was originally released in February 2014. Due to a change in API, the
dependency update required a change in our code. This has now been done
and all target platforms have been updated accordingly.
Change-Id: I27b525ecd95e3143015753e66534e1d976624e52
diff --git a/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java b/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
index 845a4c9..3d13d80 100644
--- a/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
+++ b/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
@@ -53,7 +53,8 @@
String uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true).toPlatformString(false);
EObject wrapper = adapter.createArtifact(artifactModel, this.getClass().getName(), uri,
- Long.toString(feature.getInternalId()), feature.getName(), feature.getFeatureModel().getSourceFile().toString());
+ Long.toString(feature.getInternalId()), feature.getName(),
+ feature.getFeatureModel().getSourceFile().toString());
return wrapper;
}
@@ -61,7 +62,7 @@
public IFeature resolveWrapper(EObject wrapper) {
ArtifactMetaModelAdapter adapter = ExtensionPointHelper.getArtifactWrapperMetaModelAdapter().get();
FileHandler<IFeatureModel> fileHandler = FeatureModelManager
- .load(FileSystems.getDefault().getPath(adapter.getArtifactPath(wrapper).toOSString()));
+ .getFileHandler(FileSystems.getDefault().getPath(adapter.getArtifactPath(wrapper).toOSString()));
return fileHandler.getObject().getFeature(adapter.getArtifactName(wrapper));
}
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.target
index 35f4e56..c696660 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.10" sequenceNumber="1593287263">
+<target name="eclipse-capra-e4.10" sequenceNumber="1602682787">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.6.0.201812111211"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.tpd
index 0230263..4d4bddb 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.10.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.target
index a163249..fd0955e 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.11" sequenceNumber="1593270336">
+<target name="eclipse-capra-e4.11" sequenceNumber="1602682776">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.7.0.201903092251"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.tpd
index 028b705..41a776c 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.11.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.target
index 1caa2ff..0f2bc2f 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.12" sequenceNumber="1593287278">
+<target name="eclipse-capra-e4.12" sequenceNumber="1602682766">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.8.0.201906071757"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.tpd
index df1493a..c3df4ea 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.12.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.target
index 8e423c9..0770b90 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.13" sequenceNumber="1593287642">
+<target name="eclipse-capra-e4.13" sequenceNumber="1602682752">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.9.0.201909091956"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.tpd
index a4baec3..683e4d3 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.13.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.target
index 67f3139..78a698c 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.14" sequenceNumber="1593287718">
+<target name="eclipse-capra-e4.14" sequenceNumber="1602682740">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.10.0.201912051559"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.tpd
index 9d48685..5812afd 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.14.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.target
index b4e984a..910c8e5 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.15" sequenceNumber="1593287779">
+<target name="eclipse-capra-e4.15" sequenceNumber="1602682728">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.11.0.202003091030"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.tpd
index c586421..11f88cf 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.15.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.target
index e307376..326bfed 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.16" sequenceNumber="1593287837">
+<target name="eclipse-capra-e4.16" sequenceNumber="1602682717">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.11.1.202006011430"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.tpd
index 054b6cf..bec4d7c 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.16.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.7/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.target
index 766c1b3..0e175c1 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.6" sequenceNumber="1593287331">
+<target name="eclipse-capra-e4.6" sequenceNumber="1602682729">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.2.1.201703062208"/>
@@ -60,7 +60,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.tpd
index c3b7a0f..893f510 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.6.tpd
@@ -57,7 +57,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.5/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.target
index e12f9c6..e5d2a77 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.7" sequenceNumber="1593287322">
+<target name="eclipse-capra-e4.7" sequenceNumber="1602682698">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.4.3.201802261533"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.tpd
index 1f01ba1..6ee46a3 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.7.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.5/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.target
index 56315cb..565a23a 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.8" sequenceNumber="1593287315">
+<target name="eclipse-capra-e4.8" sequenceNumber="1602682670">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.5.0.201806170908"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.tpd
index c037635..e41fd8a 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.8.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.5/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.target b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.target
index cc6c9e9..0d52556 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.target
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="eclipse-capra-e4.9" sequenceNumber="1593287320">
+<target name="eclipse-capra-e4.9" sequenceNumber="1602682670">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.sdk.feature.group" version="9.5.3.201809121146"/>
@@ -64,7 +64,7 @@
<repository id="plantuml" location="http://hallvard.github.io/plantuml/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.6.3.202005292234"/>
+ <unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository id="feature-ide" location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.tpd b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.tpd
index 168e664..d8550c8 100644
--- a/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.tpd
+++ b/releng/org.eclipse.capra.releng.target/eclipse-capra-e4.9.tpd
@@ -61,7 +61,7 @@
}
location "http://featureide.cs.ovgu.de/update/v3/" feature-ide {
- de.ovgu.featureide.featuremodeling.feature.group 3.5.4
+ de.ovgu.featureide.featuremodeling.feature.group
}
location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.5/" APP4MC {
diff --git a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
index 38f29e0..3d80783 100644
--- a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
+++ b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
@@ -47,7 +47,7 @@
<repository location="http://download.eclipse.org/releases/neon"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.5.5.201906282321"/>
+<unit id="de.ovgu.featureide.featuremodeling.feature.group" version="3.7.0.202010141034"/>
<repository location="http://featureide.cs.ovgu.de/update/v3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/tests/org.eclipse.capra.handler.featureide.tests/src/org/eclipse/capra/handler/featureide/tests/TestFeatureIDETraces.java b/tests/org.eclipse.capra.handler.featureide.tests/src/org/eclipse/capra/handler/featureide/tests/TestFeatureIDETraces.java
index 763c317..e5a0fee 100644
--- a/tests/org.eclipse.capra.handler.featureide.tests/src/org/eclipse/capra/handler/featureide/tests/TestFeatureIDETraces.java
+++ b/tests/org.eclipse.capra.handler.featureide.tests/src/org/eclipse/capra/handler/featureide/tests/TestFeatureIDETraces.java
@@ -36,8 +36,10 @@
import org.junit.Before;
import org.junit.Test;
+import de.ovgu.featureide.fm.core.ExtensionManager.NoSuchExtensionException;
import de.ovgu.featureide.fm.core.base.IFeature;
import de.ovgu.featureide.fm.core.base.IFeatureModel;
+import de.ovgu.featureide.fm.core.base.impl.DefaultFeatureModelFactory;
import de.ovgu.featureide.fm.core.base.impl.FMFactoryManager;
import de.ovgu.featureide.fm.core.io.manager.FeatureModelManager;
import de.ovgu.featureide.fm.core.io.xml.XmlFeatureModelFormat;
@@ -58,15 +60,18 @@
}
@Test
- public void TestTraceCreation() throws CoreException, IOException {
+ public void TestTraceCreation() throws CoreException, IOException, NoSuchExtensionException {
+ FMFactoryManager fmFactoryManager = FMFactoryManager.getInstance();
+
// Create a project
IProject testProject = TestHelper.createSimpleProject(TEST_PROJECT_NAME);
assert (TestHelper.projectExists(TEST_PROJECT_NAME));
// Create a feature model with one feature
- IFeatureModel modelA = FMFactoryManager.getDefaultFactory().createFeatureModel();
+ IFeatureModel modelA = fmFactoryManager.getFactory(DefaultFeatureModelFactory.ID).create();
modelA.createDefaultValues(TEST_PROJECT_NAME);
- IFeature feature = FMFactoryManager.getDefaultFactory().createFeature(modelA, FEATURE_A_NAME);
+
+ IFeature feature = fmFactoryManager.getFactory(modelA).createFeature(modelA, FEATURE_A_NAME);
modelA.addFeature(feature);
modelA.getStructure().getRoot().addChild(feature.getStructure());
