[Releng] Fix CCE in FindAndRepalceTarget
diff --git a/features/org.eclipse.oomph.util-feature/feature.xml b/features/org.eclipse.oomph.util-feature/feature.xml
index 4945995..a0e267b 100644
--- a/features/org.eclipse.oomph.util-feature/feature.xml
+++ b/features/org.eclipse.oomph.util-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.oomph.util"
label="%featureName"
- version="1.23.0.qualifier"
+ version="1.24.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.oomph.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.util-feature/pom.xml b/features/org.eclipse.oomph.util-feature/pom.xml
index 8f4f799..84bd113 100644
--- a/features/org.eclipse.oomph.util-feature/pom.xml
+++ b/features/org.eclipse.oomph.util-feature/pom.xml
@@ -20,6 +20,6 @@
</parent>
<groupId>org.eclipse.oomph.features</groupId>
<artifactId>org.eclipse.oomph.util</artifactId>
- <version>1.23.0-SNAPSHOT</version>
+ <version>1.24.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
index cdbc870..173aa05 100644
--- a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
org.eclipse.equinox.p2.engine;bundle-version="[2.2.0,3.0.0)",
org.eclipse.equinox.p2.ui.sdk;bundle-version="[1.2.4,2.0.0)",
org.eclipse.urischeme;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.ui;bundle-version="[1.18.0,2.0.0)",
+ org.eclipse.oomph.ui;bundle-version="[1.19.0,2.0.0)",
org.eclipse.oomph.p2.ui;bundle-version="[1.19.0,2.0.0)",
org.eclipse.oomph.setup.p2;bundle-version="[1.19.0,2.0.0)",
org.eclipse.oomph.setup.core;bundle-version="[1.26.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
index 3548ef0..6f12105 100644
--- a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.oomph.ui;singleton:=true
-Bundle-Version: 1.18.0.qualifier
+Bundle-Version: 1.19.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,11 +15,11 @@
org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.base.edit;bundle-version="[1.15.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.base.edit;bundle-version="[1.16.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional
-Export-Package: org.eclipse.oomph.internal.ui;version="1.18.0";x-internal:=true,
- org.eclipse.oomph.ui;version="1.18.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.ui;version="1.19.0";x-internal:=true,
+ org.eclipse.oomph.ui;version="1.19.0";x-internal:=true
Eclipse-BuddyPolicy: dependent
Automatic-Module-Name: org.eclipse.oomph.ui
diff --git a/plugins/org.eclipse.oomph.ui/pom.xml b/plugins/org.eclipse.oomph.ui/pom.xml
index 4789e49..a5c4963 100644
--- a/plugins/org.eclipse.oomph.ui/pom.xml
+++ b/plugins/org.eclipse.oomph.ui/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.ui</artifactId>
- <version>1.18.0-SNAPSHOT</version>
+ <version>1.19.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/FindAndReplaceTarget.java b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/FindAndReplaceTarget.java
index d37c9c9..5941961 100644
--- a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/FindAndReplaceTarget.java
+++ b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/FindAndReplaceTarget.java
@@ -1684,7 +1684,7 @@
{
// Always create a list.
List<String> result = new ArrayList<>();
- if (eAttribute.isMany())
+ if (eAttribute.isMany() && value instanceof List<?>)
{
// Add the textual representation of each value.
for (Object item : (List<?>)value)
@@ -1694,7 +1694,7 @@
}
else
{
- // Ad the textual representation of the one value.
+ // Add the textual representation of the one value.
result.add(EcoreUtil.convertToString(eDataType, value));
}
diff --git a/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
index e8b74f2..ed6e572 100644
--- a/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.ui;bundle-version="[1.18.0,2.0.0)",
+ org.eclipse.oomph.ui;bundle-version="[1.19.0,2.0.0)",
org.eclipse.oomph.version;bundle-version="[1.14.0,2.0.0)";visibility:=reexport,
org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)";resolution:=optional
