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
This commit is contained in:
parent
dac74c1c8e
commit
f0121298cf
|
@ -195,7 +195,7 @@ public class TabularResourceProperties extends FramedPanel {
|
|||
storeCombo.addAll(licencesList);
|
||||
|
||||
comboLicences = new ComboBox<LicenceData>(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());
|
||||
|
|
|
@ -19,7 +19,7 @@ public interface LicenceDataPropertiesCombo extends PropertyAccess<LicenceData>
|
|||
@Path("id")
|
||||
ModelKeyProvider<LicenceData> id();
|
||||
|
||||
LabelProvider<LicenceData> licence();
|
||||
LabelProvider<LicenceData> licenceName();
|
||||
|
||||
@Path("licence")
|
||||
ValueProvider<LicenceData, String> licenceValueProvider();
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 695 B |
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
After Width: | Height: | Size: 695 B |
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Loading…
Reference in New Issue