From 1974f3f22a8a982b2310442c210ab261356561de Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Fri, 12 Jun 2015 15:46:54 +0000
Subject: [PATCH] Updated Licence

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-import-widget@115363 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../user/td/csvimportwidget/client/CSVTableDetailCard.java  | 6 +++---
 .../client/licence/LicenceDataPropertiesCombo.java          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java
index 2301b97..973d8c5 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java
@@ -159,7 +159,7 @@ public class CSVTableDetailCard extends WizardCard {
 		Log.trace("LoaderCombo created");
 
 		comboLicences = new ComboBox<LicenceData>(storeCombo,
-				propsLicenceData.licence()) {
+				propsLicenceData.licenceName()) {
 
 			protected void onAfterFirstAttach() {
 				super.onAfterFirstAttach();
@@ -337,8 +337,8 @@ public class CSVTableDetailCard extends WizardCard {
 			}
 			
 			if(comboLicences.getCurrentValue()!=null&&
-					comboLicences.getCurrentValue().getLicence()!=null && !comboLicences.getCurrentValue().getLicence().isEmpty()){
-				detail.setLicence(comboLicences.getCurrentValue().getLicence());
+					comboLicences.getCurrentValue().getLicenceId()!=null && !comboLicences.getCurrentValue().getLicenceId().isEmpty()){
+				detail.setLicence(comboLicences.getCurrentValue().getLicenceId());
 			}
 			
 			importSession.setTabResource(detail);
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java
index 1503f92..2241b16 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java
@@ -20,7 +20,7 @@ public interface LicenceDataPropertiesCombo extends
 	@Path("id")
 	ModelKeyProvider<LicenceData> id();
 	
-	LabelProvider<LicenceData> licence();
+	LabelProvider<LicenceData> licenceName();
 	
 
 }
\ No newline at end of file