From f0121298cf7d37ccf6b88908531e749f631b1043 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 12 Jun 2015 15:48:29 +0000 Subject: [PATCH] Updated Licence git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-information-widget@115365 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/TabularResourceProperties.java | 10 +++++----- .../licence/LicenceDataPropertiesCombo.java | 2 +- .../client/resources/ResourceBundle.java | 6 ++++++ .../client/resources/information.png | Bin 0 -> 695 bytes .../client/resources/information_32.png | Bin 0 -> 1582 bytes .../client/resources/information.png | Bin 0 -> 695 bytes .../client/resources/information_32.png | Bin 0 -> 1582 bytes 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/information.png create mode 100644 src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/information_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/informationwidget/client/resources/information.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/informationwidget/client/resources/information_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java index fb083be..2455e8c 100644 --- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/TabularResourceProperties.java @@ -195,7 +195,7 @@ public class TabularResourceProperties extends FramedPanel { storeCombo.addAll(licencesList); comboLicences = new ComboBox(storeCombo, - propsLicenceData.licence()); + propsLicenceData.licenceName()); comboLicences.setMinListWidth(250); comboLicences.setEditable(false); comboLicences.setTypeAhead(false); @@ -397,7 +397,7 @@ public class TabularResourceProperties extends FramedPanel { boolean licenceFound = false; for (int i = 0; i < listLicence.size(); i++) { if (tabResource.getLicence().compareTo( - listLicence.get(i).getLicence()) == 0) { + listLicence.get(i).getLicenceId()) == 0) { comboLicences.setValue(listLicence.get(i)); licenceFound = true; break; @@ -645,10 +645,10 @@ public class TabularResourceProperties extends FramedPanel { } if (comboLicences.getCurrentValue() != null - && comboLicences.getCurrentValue().getLicence() != null - && !comboLicences.getCurrentValue().getLicence().isEmpty()) { + && comboLicences.getCurrentValue().getLicenceId() != null + && !comboLicences.getCurrentValue().getLicenceId().isEmpty()) { tabResource - .setLicence(comboLicences.getCurrentValue().getLicence()); + .setLicence(comboLicences.getCurrentValue().getLicenceId()); } tabResource.setValid(validField.getValue()); diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/licence/LicenceDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/licence/LicenceDataPropertiesCombo.java index 814bff7..d78c779 100644 --- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/licence/LicenceDataPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/licence/LicenceDataPropertiesCombo.java @@ -19,7 +19,7 @@ public interface LicenceDataPropertiesCombo extends PropertyAccess @Path("id") ModelKeyProvider id(); - LabelProvider licence(); + LabelProvider licenceName(); @Path("licence") ValueProvider licenceValueProvider(); diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/ResourceBundle.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/ResourceBundle.java index c2708f5..1fc8270 100644 --- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/ResourceBundle.java +++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/ResourceBundle.java @@ -41,5 +41,11 @@ public interface ResourceBundle extends ClientBundle { @Source("resources_32.png") ImageResource resources32(); + @Source("information.png") + ImageResource information(); + + @Source("information_32.png") + ImageResource information32(); + } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/information.png b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/resources/information.png new file mode 100644 index 0000000000000000000000000000000000000000..fd2adeaeb60296fe841f3e988d059c5bc4e6bb03 GIT binary patch literal 695 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 gM%J46|FR_i0iOb-U2dns