diff --git a/.classpath b/.classpath
index f205eb9..53f61f6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -41,5 +41,5 @@
-
+
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 90a8f8f..662abb3 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-2.8.1-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-2.8.2-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cbff659..ecd5910 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -8,6 +8,9 @@
uses
+
+ uses
+
uses
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 5c4ba9b..bbd4554 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ HTML markup is not only escaped as it was but also displayed as simple text
+
Fixed Bug #17181, post editing leads to losing both formatting and mentions
diff --git a/pom.xml b/pom.xml
index 423d493..5ae22a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-
4.0.0
@@ -12,7 +13,7 @@
org.gcube.portlets.user
news-feed
war
- 2.8.1-SNAPSHOT
+ 2.8.2-SNAPSHOT
gCube News Feed Portlet
@@ -37,7 +38,7 @@
-
+
org.gcube.distribution
maven-portal-bom
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
index 05836ac..101e1b5 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
@@ -1357,6 +1357,7 @@ public class NewsFeedPanel extends Composite {
}
else {
Comment comment = (Comment) result.getComment();
+ GWT.log("Returned Comment="+comment.getText());
owner.addComment(new SingleComment(comment, owner, (comment.getUserid().equals(myUserInfo.getUsername()))));
owner.setCommentingDisabled(false);
owner.updateCommentsNumberCount();
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
index cf0ad16..e1075b4 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
@@ -80,7 +80,7 @@ public class SingleComment extends Composite {
String commentToShow = toShow.getText();
//replace the < & and >
- commentToShow = commentToShow.replaceAll("<","<").replaceAll(">",">");
+// commentToShow = commentToShow.replaceAll("<","<").replaceAll(">",">");
commentToShow = commentToShow.replaceAll("&","&");
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index 045d75e..2f4f5a3 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -308,8 +308,8 @@ public class TweetTemplate extends Composite {
avatarImage.setUrl(post.getThumbnailURL());
avatarImage.setPixelSize(40, 40);
- //replace the < & and >
- postText = postText.replaceAll("<","<").replaceAll(">",">");
+// //replace the < & and >
+// postText = postText.replaceAll("<","<").replaceAll(">",">");
postText = postText.replaceAll("&","&");
final String profilePageURL = GCubePortalConstants.PREFIX_GROUP_URL + NewsFeedPanel.extractOrgFriendlyURL(Location.getHref()) +GCubePortalConstants.USER_PROFILE_FRIENDLY_URL;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index 1781983..dc17b11 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -774,14 +774,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
List newHashtags = messageParser.getHashtags();
if (newHashtags != null && !newHashtags.isEmpty())
- store.saveHashTagsComment(toEdit.getKey(), vreIdFeed, newHashtags);
-
-// // get new hashtags
-// String escapedCommentText = Utils.escapeHtmlAndTransformUrl(toEdit.getText());
-// List newHashtags = Utils.getHashTags(escapedCommentText);
-// if (newHashtags != null && !newHashtags.isEmpty())
-// escapedCommentText = Utils.convertHashtagsAnchorHTML(escapedCommentText, newHashtags);
-
+ store.saveHashTagsComment(toEdit.getKey(), vreIdFeed, newHashtags);
+
edited = new Comment(toEdit.getKey(), toEdit.getUserid(),
toEdit.getTime(), toEdit.getFeedid(), escapedCommentText, user.getFullName(), user.getAvatarId(), true, new Date());