svn commit: r747918 - in /incubator/esme/trunk/server/src/main/scala/org/apache/esme/model: Message.scala Tag.scala

[vdichev]

Author: vdichev
Date: Wed Feb 25 20:54:40 2009
New Revision: 747918

URL: http://svn.apache.org/viewvc?rev=747918&view=rev
Log:
ESME-42 Fix tags, usernames and links disappearing from message text.

Modified:
    
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala

Modified: 
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: 
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=747918&r1=747917&r2=747918&view=diff
==============================================================================
--- 
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala 
(original)
+++ 
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala 
Wed Feb 25 20:54:40 2009
@@ -331,10 +331,10 @@
             lst map {
               case HashTag(t) => t.toXml
               case AtName(user) => <at_name id={user.id.toString}
-                  nickname={user.nickname.is} />
+                  nickname={user.nickname.is} >{"@" + 
user.nickname.is}</at_name>
               case MsgText(text) => Text(text)
               case URL(url) => <url id={url.id.toString}
-                  url={url.url.toString} uniqueId={url.uniqueId.is} />
+                  url={url.url.toString} uniqueId={url.uniqueId.is} 
>{url.url.toString}</url>
             }
           }</body>
         <tags>{

Modified: 
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala
URL: 
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala?rev=747918&r1=747917&r2=747918&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala 
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala 
Wed Feb 25 20:54:40 2009
@@ -73,5 +73,5 @@
   Message.findAndPrime(In.fk(MessageTag.message, By(MessageTag.tag, this)),
                       OrderBy(Message.id, Descending))
 
-  override def toXml = <tag id={id.is.toString} name={name.is}/>
+  override def toXml = <tag id={id.is.toString} name={name.is}>{"#" + 
name.is}</tag>
 }