Updated Licence

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@115364 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java

@@ -8479,7 +8479,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			LicenceData licenceData;
 			for (int i = 0; i < licencesArray.length; i++) {
 				licence = licencesArray[i];
-				licenceData = new LicenceData(i, licence.toString());
+				licenceData = new LicenceData(i, licence.toString(),licence.getName());
 				licences.add(licenceData);
 			}
 

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/licenses/LicenceData.java

@@ -11,19 +11,21 @@ import java.io.Serializable;
 public class LicenceData implements Serializable {
 
 	private static final long serialVersionUID = -1489720811451521606L;
-	protected int id; // For insert in table only
-	protected String licence; // licence
+	private int id; // For insert in table only
+	private String licenceId;
+	private String licenceName;
 
 	public LicenceData(){
 		super();
 	}
 	
-	public LicenceData(int id, String licence) {
+	public LicenceData(int id, String licenceId, String licenceName) {
 		super();
 		this.id = id;
-		this.licence = licence;
+		this.licenceId = licenceId;
+		this.licenceName=licenceName;
 	}
-	
+
 	public int getId() {
 		return id;
 	}
@@ -32,17 +34,28 @@ public class LicenceData implements Serializable {
 		this.id = id;
 	}
 
-	public String getLicence() {
-		return licence;
+	public String getLicenceId() {
+		return licenceId;
 	}
 
-	public void setLicence(String licence) {
-		this.licence = licence;
+	public void setLicenceId(String licenceId) {
+		this.licenceId = licenceId;
+	}
+
+	public String getLicenceName() {
+		return licenceName;
+	}
+
+	public void setLicenceName(String licenceName) {
+		this.licenceName = licenceName;
 	}
 
 	@Override
 	public String toString() {
-		return "LicenceData [id=" + id + ", licence=" + licence + "]";
+		return "LicenceData [id=" + id + ", licenceId=" + licenceId
+				+ ", licenceName=" + licenceName + "]";
 	}
+	
+	
 
 }

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java

@@ -36,7 +36,8 @@ public class TabResource implements Serializable {
 	}
 
 	public TabResource(String id, String name, String description,
-			String agency, String date, String right, String validFrom, String validUntilTo, String licence, TRId trId) {
+			String agency, String date, String right, String validFrom, String validUntilTo, 
+			String licence, TRId trId) {
 		this.id = id;
 		this.name = name;
 		this.description = description;