summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-12-14 06:45:28 (EST)
committer Stephan Born2013-01-25 12:36:08 (EST)
commitffd3bd3f7db77d415bdc22340c3749f4f561b108 (patch)
tree979b6936942531024d086a04c0aa5a1175af956b
parentc2af1e2a81ca71e922d86e6fe4d3232789fc0814 (diff)
downloadorg.eclipse.stardust.ui.web-ffd3bd3f7db77d415bdc22340c3749f4f561b108.zip
org.eclipse.stardust.ui.web-ffd3bd3f7db77d415bdc22340c3749f4f561b108.tar.gz
org.eclipse.stardust.ui.web-ffd3bd3f7db77d415bdc22340c3749f4f561b108.tar.bz2
Jira-ID: CRNT-26580
reverted following changes as with Icefaces patch IPP fails - changes to adapt new IceFaces patch jars git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61585 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml4
-rw-r--r--portal-common/etc/icefaces-ee-ivy-conf.xml6
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java3
3 files changed, 6 insertions, 7 deletions
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
index 6c6efae..8b80171 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
@@ -91,7 +91,7 @@
title="#{(row.totalPriority eq 0) ? null: row.title}">
<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-Total"
standAlone="false" />
- <f:param name="selectedPriorityForDetails" value="" />
+ <f:param name="selectedPriorityForDetails" value="#{null}" />
<f:param name="selectedCriticalForDetails" value="#{false}" />
</ice:commandLink>
</ice:panelGroup>
@@ -102,7 +102,7 @@
title="#{(row.criticalTotalPriority eq 0) ? null: row.title}">
<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-CritTotal"
standAlone="false" />
- <f:param name="selectedPriorityForDetails" value="" />
+ <f:param name="selectedPriorityForDetails" value="#{null}" />
<f:param name="selectedCriticalForDetails" value="#{true}" />
</ice:commandLink>
</ice:panelGroup>
diff --git a/portal-common/etc/icefaces-ee-ivy-conf.xml b/portal-common/etc/icefaces-ee-ivy-conf.xml
index 8056bb2..cf0fc9f 100644
--- a/portal-common/etc/icefaces-ee-ivy-conf.xml
+++ b/portal-common/etc/icefaces-ee-ivy-conf.xml
@@ -23,7 +23,7 @@
<publications/>
<dependencies>
- <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
<exclude org="javax.faces" module="jsf-api" />
<exclude org="javax.faces" module="jsf-impl" />
<exclude org="commons-logging" module="commons-logging-api"/>
@@ -37,10 +37,10 @@
<exclude org="avalon-framework" module="avalon-framework" />
<exclude org="log4j" module="log4j" />
</dependency>
- <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
<exclude org="org.icefaces" module="icefaces-ee" />
</dependency>
- <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
<exclude org="org.icefaces" module="icefaces-ee" />
</dependency>
</dependencies>
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
index 47d864f..31b50ed 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/View.java
@@ -356,7 +356,7 @@ public class View extends AbstractUiElement implements TabScopeManager
{
idParams = viewKey; // Keep the backward compatibility
}
- idParams = (idParams == null) ? "" : idParams;
+
return idParams;
}
@@ -472,7 +472,6 @@ public class View extends AbstractUiElement implements TabScopeManager
public String getViewId()
{
String viewId = (definition == null) ? getId() : definition.getName();
- viewId = (definition == null) ? "" : viewId;
return viewId;
}