From f27bc2908254c8594309e2f2c5755251eb28e1d6 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 29 Mar 2019 11:44:15 +0000 Subject: [PATCH] Revised social networking library mechanism for http links, mentions and hashtags recognition, Task #13207 testing passed git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@178783 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 9 ++- .project | 11 ++++ .../com.gwtplugins.gdt.eclipse.core.prefs | 4 ++ .settings/org.eclipse.jdt.core.prefs | 1 + .settings/org.eclipse.wst.common.component | 4 +- ....eclipse.wst.common.project.facet.core.xml | 1 + distro/changelog.xml | 4 ++ pom.xml | 5 +- .../client/view/ShareUpdateForm.java | 5 +- .../client/view/SuperPosedTextArea.java | 1 - src/main/resources/portal-logback.xml | 61 +++++++++++++++++++ 11 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 .settings/com.gwtplugins.gdt.eclipse.core.prefs create mode 100644 src/main/resources/portal-logback.xml diff --git a/.classpath b/.classpath index e54bb54..25177d5 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -15,11 +15,13 @@ + + @@ -30,6 +32,7 @@ + @@ -37,5 +40,5 @@ - + diff --git a/.project b/.project index eaa6395..0e4be8c 100644 --- a/.project +++ b/.project @@ -40,6 +40,16 @@ + + com.gwtplugins.gdt.eclipse.core.webAppProjectValidator + + + + + com.gwtplugins.gwt.eclipse.core.gwtProjectValidator + + + org.eclipse.m2e.core.maven2Builder @@ -56,5 +66,6 @@ org.eclipse.wst.jsdt.core.jsNature com.google.gwt.eclipse.core.gwtNature com.liferay.ide.core.liferayNature + com.gwtplugins.gwt.eclipse.core.gwtNature diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs new file mode 100644 index 0000000..3cb1d71 --- /dev/null +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +lastWarOutDir=/Users/massi/Documents/workspace/share-updates/target/share-updates-2.7.0-SNAPSHOT +warSrcDir=src/main/webapp +warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b257af7..a5c7673 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7 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.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index f76f134..8f5bf23 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ uses - + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 4067f6f..9378001 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -6,4 +6,5 @@ + diff --git a/distro/changelog.xml b/distro/changelog.xml index 8c920f9..cf098ed 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Revised social networking library mechanism for http links, mentions and hashtags recognition, Task #13207 + Incident #13096, mentioning in some VRE may not work diff --git a/pom.xml b/pom.xml index 081b621..1635920 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user share-updates war - 2.6.3-SNAPSHOT + 2.7.0-SNAPSHOT gCube Share Updates Portlet gCube Share Updates for exchanging updates with other users of VREs. @@ -254,11 +254,10 @@ - ShareUpdates.html ${webappDirectory} + -Dlogback.configurationFile=portal-logback.xml diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java index 3e77b73..d472a57 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java @@ -486,10 +486,7 @@ public class ShareUpdateForm extends Composite { // escape html text String toShareText = escapeHtml(textToPost); - if (! checkTextLength(toShareText)) { - Window.alert("We found a single word containing more than 50 chars and it's not a link, is it meaningful?"); - return; - } + // disable text edit and submission button enableSubmitButtons(false); shareTextArea.setEnabled(false); diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/SuperPosedTextArea.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/SuperPosedTextArea.java index 489dc43..4c56fc4 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/view/SuperPosedTextArea.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/view/SuperPosedTextArea.java @@ -16,7 +16,6 @@ import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.Node; import com.google.gwt.dom.client.NodeList; import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyPressEvent; diff --git a/src/main/resources/portal-logback.xml b/src/main/resources/portal-logback.xml new file mode 100644 index 0000000..4a1f65a --- /dev/null +++ b/src/main/resources/portal-logback.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + [PORTAL] %-4r [%t] %-5p %c - %m%n + + + + + %d{ISO8601} %-5p %c{2} [%t,%M:%L] + + + DEBUG + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +