summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-05 02:19:46 (EST)
committerManik Kishore2012-06-19 07:19:03 (EDT)
commit1bb12c917a56bb59a18f483c9ccfa3aecf5cfca3 (patch)
tree36d739850391569b0d460476e2ab33869f59aea9
parentbb68b8723e57a2b58f27318d6a9e0e6d14cf5e80 (diff)
downloadorg.eclipse.stardust.ui.web-1bb12c917a56bb59a18f483c9ccfa3aecf5cfca3.zip
org.eclipse.stardust.ui.web-1bb12c917a56bb59a18f483c9ccfa3aecf5cfca3.tar.gz
org.eclipse.stardust.ui.web-1bb12c917a56bb59a18f483c9ccfa3aecf5cfca3.tar.bz2
Jira-ID: CRNT-24029
1)Removed isStructuredData(dataPath) check for key descriptor. 2)Removed isDescriptor() check if we check key descriptor. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54288 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/CommonDescriptorUtils.java4
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/I18nUtils.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ModelUtils.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/CommonDescriptorUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/CommonDescriptorUtils.java
index c8d4d0b..4189e18 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/CommonDescriptorUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/CommonDescriptorUtils.java
@@ -468,7 +468,7 @@ public class CommonDescriptorUtils
Map<String, DataPath> keyDescriptors = CollectionUtils.newHashMap();
for (DataPath path : dataList)
{
- if (path.isKeyDescriptor() && Direction.IN.equals(path.getDirection()) && path.isDescriptor()
+ if (path.isKeyDescriptor() && Direction.IN.equals(path.getDirection())
&& DescriptorFilterUtils.isDataFilterable(path))
{
keyDescriptors.put(path.getId(), path);
@@ -501,7 +501,7 @@ public class CommonDescriptorUtils
DataPath[] commonDatas = getCommonDescriptors(commonProcessDefinitions, true);
for (DataPath dataPath : commonDatas)
{
- if (dataPath.isDescriptor() && dataPath.isKeyDescriptor() && !isStructuredData(dataPath))
+ if (dataPath.isKeyDescriptor())
{
Pair<Class, Object> firstTypeValuePair = null;
for (ProcessInstance childPi : children)
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/I18nUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/I18nUtils.java
index 7c8ee6e..f1d4d9b 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/I18nUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/I18nUtils.java
@@ -340,7 +340,7 @@ public class I18nUtils
for (DataPath path : datas)
{
if (caseDataPath.getId().equals(path.getId()) && caseDataPath.getMappedType().equals(path.getMappedType())
- && path.isDescriptor() && path.isKeyDescriptor())
+ && path.isKeyDescriptor())
{
label = getString(path, mode);
if (null != label)
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ModelUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ModelUtils.java
index 1e76c2f..c40d124 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ModelUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ModelUtils.java
@@ -245,7 +245,7 @@ public class ModelUtils
Map<String, DataPath> dataMap = CollectionUtils.newHashMap();
for (DataPath path : datas)
{
- if (path.isDescriptor() && path.isKeyDescriptor())
+ if (path.isKeyDescriptor())
{
dataMap.put(path.getId(), path);
}