From 4e790e6c3bf7f0565cbf8b5bb8861cd8c254c63f Mon Sep 17 00:00:00 2001
From: Gabriel Landais <glandais@kereval.com>
Date: Thu, 3 Mar 2011 14:09:30 +0000
Subject: [PATCH] Better message UI for Dicom
git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@20801 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
---
.../ihe/gazelle/proxy/model/message/AbstractMessage.java | 6 +++++-
gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml | 2 +-
pom.xml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
index 4e36c99f..05d927c7 100644
--- a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
+++ b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
@@ -105,7 +105,11 @@ public abstract class AbstractMessage {
}
public int getMessageLength() {
- return messageReceived.length;
+ if (messageReceived == null) {
+ return 0;
+ } else {
+ return messageReceived.length;
+ }
}
public void setMessageReceivedAsString(String messageReceived) {
diff --git a/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml b/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
index a1f4d9e0..88b4d61b 100644
--- a/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
+++ b/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
@@ -19,7 +19,7 @@
<h:outputText value="#{messageBean.message.fileTransfertSyntax}" />
<h:outputText value="Attributes :" style="font-weight:bold;" />
- <h:outputText
+ <h:outputText style="font-family: monospace;" escape="false"
value="#{messageBean.escape(messageBean.message.getAttributesForCommandSetAsString())}" />
<h:outputText value="Affected SOP Class :" style="font-weight:bold;" />
diff --git a/pom.xml b/pom.xml
index 4331525c..8f907289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<dependency>
<groupId>net.ihe.gazelle.simulators.tls</groupId>
<artifactId>TLSSimulator-pki-jar</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<type>jar</type>
</dependency>
--
GitLab