diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 8ae7790..3f8ea4e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -10,9 +10,6 @@
uses
-
- uses
-
uses
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 1dd071d..bb3755c 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,10 +1,19 @@
+
+ Integrated workspace explorer widget and replace light tree
+
- Revised the way we shorten posts' text when this is very long, better heuristic used
- Fixed bug #320, Users tagging does not work if @ is in the middle of already typed text, works for hashtags too
- Revised mail notification message formatting, user text is now more clear and visible
- Revised the way we provide back links for posts, removed assumption that News Feed is always present the default community page, good for single VRE portals support
+ Revised the way we shorten posts' text when this is very long,
+ better heuristic used
+ Fixed bug #320, Users tagging does not work if @ is in the
+ middle of already typed text, works for hashtags too
+ Revised mail notification message formatting, user text is now
+ more clear and visible
+ Revised the way we provide back links for posts, removed
+ assumption that News Feed is always present the default community
+ page, good for single VRE portals support
@@ -14,12 +23,14 @@
added ClientScopeHandler to help prevent the back button cache
- problem in Chrome and Firefox
+ problem in Chrome and Firefox
+
fixed see more problem with commercial ands (amps;) not being
- converted
+ converted
+
@@ -34,7 +45,8 @@
- Fixed bug loosing session when messaging user from the news feed
+ Fixed bug loosing session when messaging user from the news
+ feed
{
}
- private static final int MAX_SHOWTEXT_LENGTH = 256;
+ private static final int MAX_SHOWTEXT_LENGTH = 450;
private boolean isUsers = false;
private TweetTemplate owner;
@@ -78,8 +78,11 @@ public class SingleComment extends Composite {
commentToShow = commentToShow.replaceAll("<","<").replaceAll(">",">");
commentToShow = commentToShow.replaceAll("&","&");
+
+
if (commentToShow.length() > MAX_SHOWTEXT_LENGTH) {
- commentToShow = commentToShow.substring(0, MAX_SHOWTEXT_LENGTH) + "...";
+ final int TEXT_TO_SHOW_LENGHT = (commentToShow.length() < 700) ? (commentToShow.length() - (commentToShow.length() / 3)) : 700;
+ commentToShow = commentToShow.substring(0, TEXT_TO_SHOW_LENGHT) + "...";
seeMore.setHTML(" See More ");
}
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 c8d8cbc..726cd23 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
@@ -81,7 +81,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
private static final String SESSION_ADMIN_ATTR = "SESSION_ADMIN_ATTR";
private static final String USER_SETTINGS_ATTR = "USER_SETTINGS_ATTR";
- public static final String TEST_USER = "test.user";
+
public static final String TEST_SCOPE = "/gcube/devsec/USTORE_VRE";
private String APP_ID;
@@ -122,8 +122,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
* @return .
*/
public String getDevelopmentUser() {
- String user = TEST_USER;
-// user = "massimiliano.assante";
+ String user = NewsConstants.TEST_USER;
+// user = "andrea.rossi";
return user;
}
/**
@@ -162,7 +162,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
isDevelopment = true;
}
- if (username.compareTo(TEST_USER) != 0 && !isDevelopment) {
+ if (username.compareTo(NewsConstants.TEST_USER) != 0 && !isDevelopment) {
UserModel user = UserLocalServiceUtil.getUserByScreenName(OrganizationsUtil.getCompany().getCompanyId(), username);
thumbnailURL = "/image/user_male_portrait?img_id="+user.getPortraitId();
fullName = user.getFirstName() + " " + user.getLastName();
@@ -557,7 +557,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
boolean likeCommitResult = false;
UserInfo user = getUserSettings().getUserInfo();
- if (user.getUsername().compareTo(TEST_USER) == 0) {
+ if (user.getUsername().compareTo(NewsConstants.TEST_USER) == 0) {
return false;
}
@@ -611,7 +611,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
_log.trace("Trying to add this comment " + commentText);
UserInfo user = getUserSettings().getUserInfo();
- if (user.getUsername().compareTo(TEST_USER) == 0) {
+ if (user.getUsername().compareTo(NewsConstants.TEST_USER) == 0) {
return new OperationResult(false, "Session Expired", null);
}
@@ -671,7 +671,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
@Override
public OperationResult editComment(Comment toEdit) {
UserInfo user = getUserSettings().getUserInfo();
- if (user.getUsername().compareTo(TEST_USER) == 0) {
+ if (user.getUsername().compareTo(NewsConstants.TEST_USER) == 0) {
return new OperationResult(false, "Session Expired", null);
}
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/shared/NewsConstants.java b/src/main/java/org/gcube/portlets/user/newsfeed/shared/NewsConstants.java
index 993dfa5..ae21e53 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/shared/NewsConstants.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/shared/NewsConstants.java
@@ -7,4 +7,6 @@ public class NewsConstants {
public static final int FEEDS_NO_PER_CATEGORY = 10;
public static final int FEEDS_MAX_PER_CATEGORY = 30;
+
+ public static final String TEST_USER = "test.user";
}