From 3aa3e3130988ea89dd62e16ac9ff35c7630ae8d0 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Wed, 31 Jan 2018 15:22:28 +0000
Subject: [PATCH] tostring fixed for timeseries

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@162812 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  3 +++
 .../json/input/others/TimeSeriesBean.java     | 26 +++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6caf699..671fd1c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,9 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="grsf-publisher-ws"/>
         <property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
index 59a2897..972ca58 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
@@ -148,21 +148,21 @@ public class TimeSeriesBean<T, T1> implements Comparable<TimeSeriesBean<T, T1>>{
 				databaseSource + 
 				"]";
 
-		return partial.replaceAll("\\b\\[ - \\b", "[");
+		return partial.replace("[ - ", "[").replace("[]", "").replace("&nbsp;", " ");
 
 	}
 
-	//		public static void main(String[] args) {
-	//			
-	//			TimeSeriesBean<String, String> t = new TimeSeriesBean<String, String>();
-	//			t.setYear(1021L);
-	//			t.setDatabaseSource("tttt");
-	//			t.setDataOwner("zzzz");
-	//			t.setUnit("uuuu");
-	//			t.setValue("vvvv");
-	//			t.setAssessment("2015");
-	//			System.err.println("Result is \n" + t);
-	//			
-	//		}
+	//	public static void main(String[] args) {
+	//
+	//		TimeSeriesBean<String, String> t = new TimeSeriesBean<String, String>();
+	//		t.setYear(-1L);
+	//		t.setDatabaseSource("tttt");
+	//		t.setDataOwner("zzzz");
+	//		t.setUnit("uuuu");
+	//		t.setValue("vvvv");
+	//		t.setAssessment("2015");
+	//		System.err.println("Result is \n" + t.toString());
+	//
+	//	}
 
 }