summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-04-17 05:30:37 (EDT)
committer Manik Kishore2012-06-19 07:27:04 (EDT)
commit4577e9ccbfdb0f10720dc3e4ff96597d8b616cbd (patch)
tree9cd144a4508696c2f9bbea4a4cd28e899af09362
parentd7e9d8ebb47c11ae374c9bf333fcdd59a6ac7390 (diff)
downloadorg.eclipse.stardust.ui.web-4577e9ccbfdb0f10720dc3e4ff96597d8b616cbd.zip
org.eclipse.stardust.ui.web-4577e9ccbfdb0f10720dc3e4ff96597d8b616cbd.tar.gz
org.eclipse.stardust.ui.web-4577e9ccbfdb0f10720dc3e4ff96597d8b616cbd.tar.bz2
Jira-ID: CRNT-24433
1)Added method to set tooltipURL in TreeTable.java 2)Added code to set the treeTable tooltipURL in ConfigurationVariablesBean, ModelManagementBean,ActivityCriticalityManagerBean,ProcessTreeTable,ActivityTreeTable,BusinessProcessManagerBean .java files 3)Made changes to treeTableTreeColumn.xhtml to include dynamic path for tooltipURL and set id class for panelTooltip 4)Renamed processTooltip.xhtml to genericPanelToolTip.xhtml and made id attribute dynamic git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55529 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ConfigurationVariablesBean.java8
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java6
-rw-r--r--admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml5
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/BusinessProcessManagerBean.java4
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/ActivityCriticalityManagerBean.java5
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/treetable/TreeTable.java12
-rw-r--r--portal-common/src/main/resources/META-INF/tags/treeTableTreeColumn.xhtml26
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css4
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml5
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml5
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ActivityTreeTable.java4
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessTreeTable.java4
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/common/genericPanelToolTip.xhtml (renamed from views-common/src/main/resources/META-INF/xhtml/common/processToolTip.xhtml)13
14 files changed, 79 insertions, 24 deletions
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ConfigurationVariablesBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ConfigurationVariablesBean.java
index 74e9379..023d437 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ConfigurationVariablesBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ConfigurationVariablesBean.java
@@ -71,6 +71,7 @@ import org.eclipse.stardust.ui.web.viewscommon.beans.SessionContext;
import org.eclipse.stardust.ui.web.viewscommon.dialogs.ConfigurationImportDialogBean;
import org.eclipse.stardust.ui.web.viewscommon.dialogs.ICallbackHandler;
import org.eclipse.stardust.ui.web.viewscommon.dialogs.PreferencesResource;
+import org.eclipse.stardust.ui.web.viewscommon.messages.MessagesViewsCommonBean;
import org.eclipse.stardust.ui.web.viewscommon.utils.ExceptionHandler;
import org.eclipse.stardust.ui.web.viewscommon.utils.ModelCache;
@@ -353,7 +354,12 @@ public class ConfigurationVariablesBean extends UIComponentBean
treeTable.setAutoFilter(true);
treeTable.setFilterRootNode(true);
rootModelNode.getUserObject().setTreeTable(treeTable);
-
+
+ if (null != treeTable)
+ {
+ treeTable.setTooltipURL(org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths.V_PANELTOOLTIP_URL);
+ }
+
try
{
// create root node end
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
index 03a2794..482a4c4 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
@@ -224,7 +224,6 @@ public class ModelManagementBean extends UIComponentBean implements ViewEventHan
hiddenRootItem.setType(ModelManagementTreeItem.Type.NONE);
// rootItem.setLabel("Models");
rootModelNode = TreeNodeFactory.createTreeNode(modelTreeTable, this, hiddenRootItem, true);
-
// Now Create a Model & Tree Table
DefaultTreeModel rootNode = new DefaultTreeModel(rootModelNode);
modelTreeTable = new TreeTable(rootNode, colSelectorPopup, tableDataFilters);
@@ -233,7 +232,10 @@ public class ModelManagementBean extends UIComponentBean implements ViewEventHan
modelTreeTable.setAutoFilter(false);
modelTreeTable.setFilterRootNode(true);
rootModelNode.getUserObject().setTreeTable(modelTreeTable);
-
+ if (null != modelTreeTable)
+ {
+ modelTreeTable.setTooltipURL(org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths.V_PANELTOOLTIP_URL);
+ }
List<ModelManagementTreeItem> list = buildTreeTableData(hiddenRootItem);
for (ModelManagementTreeItem item : list)
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
index a2f81dd..6b00e03 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
@@ -14,7 +14,7 @@
-->
<ice:panelGroup style="margin: 0px; padding: 0px;">
- <ice:panelGroup rendered="#{col.columnName == 'modelName'}" style="display:inline;" panelTooltip="procToolTip">
+ <ice:panelGroup rendered="#{col.columnName == 'modelName'}" style="display:inline;" panelTooltip="qcPnlTooltip">
<ice:outputText style="display: inline;" value="#{row.modelName}">
<h:graphicImage rendered="#{row.oldModel}"
value="/plugins/views-common/images/icons/model.gif"
@@ -65,7 +65,8 @@
</ice:panelGroup>
</ice:panelGroup>
- <ui:include src="/plugins/views-common/common/processToolTip.xhtml">
+ <ui:include src="/plugins/views-common/common/genericPanelToolTip.xhtml">
<ui:param name="tooltip" value="#{row.modelDescription}" />
+ <ui:param name="id" value="qcPnlTooltip" />
</ui:include>
</f:view> \ No newline at end of file
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/BusinessProcessManagerBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/BusinessProcessManagerBean.java
index 9dff5aa..23d05c1 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/BusinessProcessManagerBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/BusinessProcessManagerBean.java
@@ -159,6 +159,10 @@ public class BusinessProcessManagerBean extends UIViewComponentBean
activeModel.getModelOID(), filterAuxiliaryProcesses);
TreeTableNode modelNode = TreeNodeFactory.createTreeNode(treeTable, this, modelWithPrio, true);
+ if (null != treeTable)
+ {
+ treeTable.setTooltipURL(org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths.V_PANELTOOLTIP_URL);
+ }
// Build Tree
buildPriorityOverviewTree(modelWithPrio, modelNode);
modelNode.getUserObject().setTreeTable(treeTable);
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/ActivityCriticalityManagerBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/ActivityCriticalityManagerBean.java
index eee57d7..1117f46 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/ActivityCriticalityManagerBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/ActivityCriticalityManagerBean.java
@@ -118,7 +118,10 @@ public class ActivityCriticalityManagerBean extends UIViewComponentBean
treeTable.setFilterRootNode(false);
treeTable.setHideRootNode(true);
rootModelNode.getUserObject().setTreeTable(treeTable);
-
+ if (null != treeTable)
+ {
+ treeTable.setTooltipURL(org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths.V_PANELTOOLTIP_URL);
+ }
List<DeployedModel> models = ModelCache.findModelCache().getActiveModels();
boolean filterAuxiliaryProcesses = filterAuxiliaryProcesses();
boolean filterAuxiliaryActivities = filterAuxiliaryActivities();
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/treetable/TreeTable.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/treetable/TreeTable.java
index 4dbdfbf..6892417 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/treetable/TreeTable.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/treetable/TreeTable.java
@@ -34,6 +34,7 @@ public class TreeTable extends DataTable<TreeTableUserObject>
private TreeModel treeModel;
private boolean filterRootNode = true;
private boolean hideRootNode;
+ private String tooltipURL;
// **************************** CONSTRUCTORS ****************************
@@ -248,4 +249,15 @@ public class TreeTable extends DataTable<TreeTableUserObject>
{
this.hideRootNode = hideRootNode;
}
+
+ public String getTooltipURL()
+ {
+ return tooltipURL;
+ }
+
+ public void setTooltipURL(String tooltipURL)
+ {
+ this.tooltipURL = tooltipURL;
+ }
+
}
diff --git a/portal-common/src/main/resources/META-INF/tags/treeTableTreeColumn.xhtml b/portal-common/src/main/resources/META-INF/tags/treeTableTreeColumn.xhtml
index 311545e..4583f33 100644
--- a/portal-common/src/main/resources/META-INF/tags/treeTableTreeColumn.xhtml
+++ b/portal-common/src/main/resources/META-INF/tags/treeTableTreeColumn.xhtml
@@ -13,9 +13,12 @@
rendered -> "true/false" Default true
-->
<ui:composition>
- <ui:include src="/plugins/views-common/common/processToolTip.xhtml">
- <ui:param name="tooltip" value="#{row.tooltip}" />
- </ui:include>
+ <ice:panelGroup rendered="#{!empty table.tooltipURL}">
+ <ui:include src="#{table.tooltipURL}">
+ <ui:param name="tooltip" value="#{row.tooltip}" />
+ <ui:param name="id" value="treeTableTooltip" />
+ </ui:include>
+ </ice:panelGroup>
<c:if test="#{empty treeLineStyle}">
<c:set var="treeLineStyle" value="NONE" />
</c:if>
@@ -79,10 +82,19 @@
<ice:commandButton disabled="#{row.leaf}" image="#{row.icon}" action="#{row.toggleRow}"
style="#{row.leaf ? 'cursor: default; opacity: 1' : ''}; padding-left:3px; background:transparent;" />
<ice:outputText value=" " escape="false" style="vertical-align: super;display:inline;padding:0px;margin:0px;" />
- <ice:panelGroup style="display:inline;" panelTooltip="procToolTip">
- <ice:outputText value="#{row.line1Text}" escape="false"
- style="vertical-align: super;display:inline;" />
- </ice:panelGroup>
+ <c:choose>
+ <c:when test="#{!empty table.tooltipURL}">
+ <ice:panelGroup style="display:inline;"
+ panelTooltip="treeTableTooltip">
+ <ice:outputText value="#{row.line1Text}" escape="false"
+ style="vertical-align: super;display:inline;" />
+ </ice:panelGroup>
+ </c:when>
+ <c:otherwise>
+ <ice:outputText value="#{row.line1Text}" escape="false"
+ style="vertical-align: super;display:inline;" />
+ </c:otherwise>
+ </c:choose>
</ice:panelGroup>
<!-- *** LINE 2 *** -->
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css b/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
index 6424bfb..218d2a8 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
+++ b/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
@@ -1624,14 +1624,14 @@ table.autoCompTable, table.autoCompTable > tbody > tr, table.autoCompTable > tbo
}
/* ********* Tooltip for Process,Model ,Activity Details ********** */
-.processTooltip {
+.genericPnlTooltip {
white-space: normal;
text-align: left;
font-weight: normal;
word-wrap: break-word;
}
-.processTooltipPanel .processTooltipPanelBody{
+.genericPnlTooltipPanel .genericPnlTooltipPanelBody{
width: auto;
max-width: 200px;
height: auto;
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
index 6859018..b36092a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
@@ -25,7 +25,7 @@
<ice:panelGrid columns="3">
<ice:graphicImage
value="/plugins/views-common/images/icons/process.png" />
- <ice:panelGroup style="display:inline;" panelTooltip="procToolTip">
+ <ice:panelGroup style="display:inline;" panelTooltip="myProcTooltip">
<ice:outputText value="#{item.name}:" />
</ice:panelGroup>
<ice:commandLink styleClass="action-link" action="#{item.select}"
@@ -36,8 +36,9 @@
</ice:outputFormat>
</ice:commandLink>
</ice:panelGrid>
- <ui:include src="/plugins/views-common/common/processToolTip.xhtml">
+ <ui:include src="/plugins/views-common/common/genericPanelToolTip.xhtml">
<ui:param name="tooltip" value="#{item.title}" />
+ <ui:param name="id" value="myProcTooltip" />
</ui:include>
</ice:panelSeries>
</ice:panelGroup>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
index b4bf54a..60ae251 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
@@ -25,14 +25,15 @@
<ice:panelGrid columns="2">
<ice:graphicImage
value="/plugins/views-common/images/icons/process.png" />
- <ice:panelGroup style="display:inline;" panelTooltip="procToolTip">
+ <ice:panelGroup style="display:inline;" panelTooltip="startProcTooltip">
<ice:commandLink value="#{item.name}" styleClass="action-link"
action="#{item.selectAction}">
</ice:commandLink>
</ice:panelGroup>
</ice:panelGrid>
- <ui:include src="/plugins/views-common/common/processToolTip.xhtml">
+ <ui:include src="/plugins/views-common/common/genericPanelToolTip.xhtml">
<ui:param name="tooltip" value="#{item.title}" />
+ <ui:param name="id" value="startProcTooltip" />
</ui:include>
</ice:panelSeries>
</ice:panelGroup>
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
index 112f54e..8439671 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
@@ -116,4 +116,6 @@ public interface ResourcePaths
static final String V_JOIN_PROCESS_CONF_DLG = "/plugins/views-common/dialogs/joinProcessNotificationDialog.xhtml";
static final String V_ATTACH_CASE_CONF_DLG = "/plugins/views-common/views/case/attachToCaseNotification.xhtml";
static final String V_DETACH_CASE_CONF_DLG = "/plugins/views-common/views/case/detachCaseNotification.xhtml";
+
+ static final String V_PANELTOOLTIP_URL = "/plugins/views-common/common/genericPanelToolTip.xhtml";
}
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ActivityTreeTable.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ActivityTreeTable.java
index c245ed9..813eb71 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ActivityTreeTable.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ActivityTreeTable.java
@@ -32,6 +32,7 @@ import org.eclipse.stardust.ui.web.common.treetable.TreeTable;
import org.eclipse.stardust.ui.web.common.treetable.TreeTableBean;
import org.eclipse.stardust.ui.web.common.treetable.TreeTableNode;
import org.eclipse.stardust.ui.web.viewscommon.common.FilterToolbarItem;
+import org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths;
import org.eclipse.stardust.ui.web.viewscommon.dialogs.AbortActivityBean;
import org.eclipse.stardust.ui.web.viewscommon.dialogs.ICallbackHandler;
import org.eclipse.stardust.ui.web.viewscommon.messages.MessagesViewsCommonBean;
@@ -223,7 +224,8 @@ public class ActivityTreeTable implements TreeTableBean,ICallbackHandler
treeTable.setAutoFilter(false);
activityRootNode.getUserObject().setTreeTable(treeTable);
activityRootNode.getUserObject().setLeaf(false);
-
+ if (null != treeTable)
+ treeTable.setTooltipURL(ResourcePaths.V_PANELTOOLTIP_URL);
buildActivityTreeTable(activityRootNode, activityTableRoot);
columnModelEventHandler.setNeedRefresh(false);
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessTreeTable.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessTreeTable.java
index 1eec6a9..4d0a038 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessTreeTable.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessTreeTable.java
@@ -30,6 +30,7 @@ import org.eclipse.stardust.ui.web.common.treetable.TreeTableBean;
import org.eclipse.stardust.ui.web.common.treetable.TreeTableNode;
import org.eclipse.stardust.ui.web.common.treetable.TreeTableUserObject;
import org.eclipse.stardust.ui.web.viewscommon.common.FilterToolbarItem;
+import org.eclipse.stardust.ui.web.viewscommon.core.ResourcePaths;
import org.eclipse.stardust.ui.web.viewscommon.descriptors.DescriptorColumnUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.DefaultColumnModelEventHandler;
import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessInstanceUtils;
@@ -190,7 +191,8 @@ public class ProcessTreeTable implements TreeTableBean
// Build Tree
buildProcessHistoryTree(processHistoryTableRoot, processInstanceNode);
}
-
+ if (null != treeTable)
+ treeTable.setTooltipURL(ResourcePaths.V_PANELTOOLTIP_URL);
treeTable.setAutoFilter(false);
columnModelEventHandler.setNeedRefresh(false);
// Build Tree
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/processToolTip.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/genericPanelToolTip.xhtml
index 8247c3c..a569881 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/processToolTip.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/genericPanelToolTip.xhtml
@@ -6,11 +6,18 @@
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:pc="http://www.sungard.de/carnot/web/portal-plugin/portalcommon">
- <ice:panelTooltip id="procToolTip" hoverDelay="500"
- styleClass="tooltip processTooltipPanel" rendered="#{tooltip!=null}">
+ <!-- ***** Documentation for Tooltip *****
+ # Attributes ('*' indicates mandatory attributes)
+ id* -> tooltip Id
+ tooltip - > tooltip text displayed Default null
+ -->
+ <ice:panelTooltip id="#{id}" hoverDelay="500"
+ styleClass="tooltip genericPnlTooltipPanel"
+ rendered="#{!empty tooltip}">
<f:facet name="header"></f:facet>
<f:facet name="body">
- <ice:outputText value="#{tooltip}" styleClass="processTooltip" escape="false"/>
+ <ice:outputText value="#{tooltip}" styleClass="genericPnlTooltip"
+ escape="false" />
</f:facet>
</ice:panelTooltip>