diff --git a/.classpath b/.classpath
index 9f748b0..45a4bb8 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -39,5 +39,5 @@
-
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 4d17cd3..672496e 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -2,11 +2,11 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3fad16f..18ea1db 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,9 @@
+
+ uses
+
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 664cfd0..dade01f 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,8 +2,8 @@
-
+
diff --git a/.tern-project b/.tern-project
index a185ba0..61348cc 100644
--- a/.tern-project
+++ b/.tern-project
@@ -1 +1,17 @@
-{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file
+{
+ "plugins": {
+ "aui": {
+
+ },
+ "liferay": {
+
+ },
+ "yui": {
+
+ }
+ },
+ "libs": [
+ "ecma5",
+ "browser"
+ ]
+}
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 51f9f6e..be37ed3 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,10 @@
+
+ fixes for Incident #10262: Cannot see who liked posts on VREs of Parthenos
+ Feature #10242: add comment taking up to 3 seconds sometime to be delivered in the UI now shows a loader
+ Ported to GWT 2.8.1
+
fixes for changes to the underneath
diff --git a/pom.xml b/pom.xml
index 1c07b66..d28ea17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.user
news-feed
war
- 2.4.0-SNAPSHOT
+ 2.5.0-SNAPSHOT
gCube News Feed Portlet
@@ -25,10 +25,10 @@
- 2.6.1
+ 2.8.1
18.0
distro
- 1.7
+ 1.8
1.8
${project.build.directory}/${project.build.finalName}
6.2.5
@@ -53,12 +53,29 @@
${gwtVersion}
provided
+
+ com.google.gwt
+ gwt-dev
+ ${gwtVersion}
+ provided
+
+
+ com.google.gwt
+ gwt-codeserver
+ ${gwtVersion}
+ provided
+
com.google.gwt
gwt-servlet
${gwtVersion}
provided
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
org.gcube.portlets.user
gcube-widgets
@@ -185,9 +202,12 @@
1.0.3
compile
+
- com.google
+ org.gwt-jsonmaker
gwt-jsonmaker
+ 1.3.0
+ compile
net.eliasbalasis
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 e06873a..5f3d064 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
@@ -1299,16 +1299,19 @@ public class NewsFeedPanel extends Composite {
}
private void doAddComment(final TweetTemplate owner, String text, HashSet mentionedUsers) {
+ owner.showCommentingPreloader(true);
newsService.comment(owner.getFeedKey(), text, mentionedUsers, owner.getMyFeedUserId(), owner.isAppFeed(), new AsyncCallback() {
@Override
public void onFailure(Throwable caught) {
+ owner.showCommentingPreloader(true);
Window.alert("Could not deliver this comment: " + caught.getMessage());
}
@Override
public void onSuccess(OperationResult result) {
+ owner.showCommentingPreloader(false);
if (result != null) {
if (!result.isSuccess()) {
- //CheckSession.showLogoutDialog();
+ Window.alert("Could not deliver this comment. Please try again in a short while.");
}
else {
Comment comment = (Comment) result.getObject();
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 120c9a1..409fb0c 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
@@ -78,7 +78,7 @@ public class TweetTemplate extends Composite {
private int totalComments = 0;
private HTML showAllComments = new HTML();
private boolean isAppFeed = false;
-
+ private HTML submitCommentPreloader = new HTML("");
private TweetTemplate myInstance;
// Carousel from the image-previewer widget
@@ -617,10 +617,21 @@ public class TweetTemplate extends Composite {
}
public void addComment(SingleComment comment) {
-
commentsPanel.add(comment);
myComments.add(comment);
+ }
+ /**
+ *
+ * @param show true to show a preloader, false to hide it.
+ * display a preloader userful when the user is wating for the comment operation to be confirmed by the server
+ */
+ public void showCommentingPreloader(boolean show) {
+ if (show)
+ commentsPanel.add(submitCommentPreloader);
+ else
+ commentsPanel.remove(submitCommentPreloader);
+
}
public void updateSingleComment(Comment edited, HTMLPanel commentPanel){