From d8c6205b4499597743c24d93c6e30eec35c624b2 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Mon, 3 Oct 2016 15:30:27 +0000
Subject: [PATCH] minor fix in tags panel

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@132484 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../ui/dataset/resources/TagsPanel.java       | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/TagsPanel.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/TagsPanel.java
index fef64ac..468cf89 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/TagsPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/TagsPanel.java
@@ -37,6 +37,9 @@ public class TagsPanel extends Composite{
 	@UiField FocusPanel focusPanelTags;
 	@UiField Popover popoverTags;
 
+	// regular expression for tags
+	private static final String REGEX_TAG = "^[a-zA-Z0-9]*$";
+
 	// tags list
 	private List<String> tagsList = new ArrayList<String>();
 
@@ -60,6 +63,18 @@ public class TagsPanel extends Composite{
 				);
 	}
 
+	@UiHandler("tagsEnterTextBox")
+	void onAddTag(KeyDownEvent event){
+
+		if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
+			if (!tagsEnterTextBox.getValue().trim().isEmpty()) {
+
+				addTagElement(tagsEnterTextBox);
+
+			}
+		}
+	}
+
 	/**
 	 * Add the tag as an element (inserted by the user)
 	 */
@@ -75,14 +90,14 @@ public class TagsPanel extends Composite{
 			// ckan accepts only alphanumeric values
 			String[] subTags = itemBox.getValue().split(" ");
 			if(subTags.length == 1){
-				if(!subTags[0].matches("^[a-zA-Z0-9]*$"))
+				if(!subTags[0].matches(REGEX_TAG))
 					return;
 				if(subTags[0].length() <= 1)
 					return;
 			}else{
 				for (int i = 0; i < subTags.length; i++) {
 					String subTag = subTags[i];
-					if(!subTag.matches("^[a-zA-Z0-9]*$"))
+					if(!subTag.matches(REGEX_TAG))
 						return;
 				}
 			}
@@ -121,14 +136,14 @@ public class TagsPanel extends Composite{
 		// ckan accepts only alphanumeric values
 		String[] subTags = tag.split(" ");
 		if(subTags.length == 1){
-			if(!subTags[0].matches("^[a-zA-Z0-9]*$"))
+			if(!subTags[0].matches(REGEX_TAG))
 				return;
 			if(subTags[0].length() <= 1)
 				return;
 		}else{
 			for (int i = 0; i < subTags.length; i++) {
 				String subTag = subTags[i];
-				if(!subTag.matches("^[a-zA-Z0-9]*$"))
+				if(!subTag.matches(REGEX_TAG))
 					return;
 			}
 		}
@@ -173,18 +188,10 @@ public class TagsPanel extends Composite{
 
 	}
 
-	@UiHandler("tagsEnterTextBox")
-	void onAddTag(KeyDownEvent event){
-
-		if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
-			if (!tagsEnterTextBox.getValue().trim().isEmpty()) {
-
-				addTagElement(tagsEnterTextBox);
-
-			}
-		}
-	}
-
+	/**
+	 * Return the tag list
+	 * @return
+	 */
 	public List<String> getTags() {
 		return tagsList;
 	}