summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-04-03 07:47:33 (EDT)
committerManik Kishore2012-06-19 07:25:20 (EDT)
commit268abe38952e74191a9830de9f41f4baaf069c87 (patch)
tree49d4160677a7bca7178f67c5fd4be3eb2cc50f52
parent5dc03809faa565dbe3384089167f888330a48cef (diff)
downloadorg.eclipse.stardust.ui.web-268abe38952e74191a9830de9f41f4baaf069c87.zip
org.eclipse.stardust.ui.web-268abe38952e74191a9830de9f41f4baaf069c87.tar.gz
org.eclipse.stardust.ui.web-268abe38952e74191a9830de9f41f4baaf069c87.tar.bz2
Jira-ID: CRNT-24440
Converted Character to String for search git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55230 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DataMappingWrapper.java9
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DescriptorFilterUtils.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java9
3 files changed, 17 insertions, 3 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DataMappingWrapper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DataMappingWrapper.java
index c82edb7..4ddf178 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DataMappingWrapper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DataMappingWrapper.java
@@ -397,6 +397,15 @@ public class DataMappingWrapper implements IGenericInputField, Serializable
{
setDateValue((Date) value);
}
+ else if (null != value && value instanceof Character)
+ {
+ setStringValue(value.toString());
+ }
+ else
+ {
+ this.value = value;
+ }
+
}
private Number convertToNumber(Number value, Class type)
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DescriptorFilterUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DescriptorFilterUtils.java
index 9cf0c59..6894d01 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DescriptorFilterUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/descriptors/DescriptorFilterUtils.java
@@ -590,7 +590,7 @@ public class DescriptorFilterUtils
// for String
if (Character.class.equals(dataPath.getMappedType()) || String.class.equals(dataPath.getMappedType()))
{
- dataFilter = getStringFilter(dataPath, (String) value, false);
+ dataFilter = getStringFilter(dataPath, value, false);
}// for boolean
else if (Boolean.class.equals(dataPath.getMappedType()))
{
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
index 9039d88..d8ce329 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/search/RelatedProcessSearchHelper.java
@@ -174,13 +174,18 @@ public class RelatedProcessSearchHelper
Object value = sourceDescriptors.get(path.getId());
if (null != value)
{
+ if (value instanceof Character)
+ {
+ value = value.toString();
+ }
+
if (value instanceof String && StringUtils.isNotEmpty(value.toString()))
{
- dmWrapper.setValue(sourceDescriptors.get(path.getId()));
+ dmWrapper.setValue(value);
}
else if (!(value instanceof String))
{
- dmWrapper.setValue(sourceDescriptors.get(path.getId()));
+ dmWrapper.setValue(value);
}
}
}