Managed correlation among the fields upload_type, image_type and

publication_type

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java

@@ -25,8 +25,11 @@ import com.github.gwtbootstrap.client.ui.TextBox;
 import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
 import com.github.gwtbootstrap.datepicker.client.ui.DateBox;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -72,6 +75,15 @@ public class BasicInformationView extends Composite implements FormValidator {
 	@UiField
 	ListBox field_upload_type;
 
+	@UiField
+	ListBox field_image_type;
+	
+	@UiField
+	ControlGroup cg_publication_type;
+
+	@UiField
+	ControlGroup cg_image_type;
+
 	@UiField
 	ControlLabel cl_upload_type;
 
@@ -132,6 +144,31 @@ public class BasicInformationView extends Composite implements FormValidator {
 		this.zenodoItem = zenodoItem;
 		fillForm();
 		setVisibleFieldsForUpdate(isUpdate);
+
+		field_upload_type.addChangeHandler(new ChangeHandler() {
+
+			@Override
+			public void onChange(ChangeEvent event) {
+				
+				cg_publication_type.setVisible(false);
+				cg_image_type.setVisible(false);
+
+				if(zenodoItem.getMetadata().getPublication_type()!=null) {
+					List<String> publicationTypeSelected = zenodoItem.getMetadata().getPublication_type().getSelectedValues();
+					boolean selectedFromServerModel = publicationTypeSelected!=null;
+					cg_publication_type.setVisible(selectedFromServerModel);
+				}
+				
+				String selectedLower = field_upload_type.getSelectedValue().toLowerCase();
+				if (selectedLower.compareTo("publication") == 0) {
+					cg_publication_type.setVisible(true);
+					GWT.log("Upload type selected: publication");
+				}else if(selectedLower.compareTo("image")==0) {
+					GWT.log("Upload type selected: image");
+					cg_image_type.setVisible(true);
+				}
+			}
+		});
 //		
 //		pager.getRight().addClickHandler(new ClickHandler() {
 //			
@@ -203,13 +240,29 @@ public class BasicInformationView extends Composite implements FormValidator {
 			// Publication Type
 			if (zMeta.getPublication_type() != null) {
 				FieldUtil.addValuesToListBox(field_publication_type, zMeta.getPublication_type().getSelectableValues());
-				FieldUtil.selectValueToListBox(field_publication_type, zMeta.getPublication_type().getSelectedValues());
+				if (zMeta.getPublication_type().getSelectedValues() != null) {
+					FieldUtil.selectValueToListBox(field_publication_type,
+							zMeta.getPublication_type().getSelectedValues());
 				} else
-				field_publication_type.setEnabled(false);
+					cg_publication_type.setVisible(false);
+			} else
+				cg_publication_type.setVisible(false);
 			
 			InfoTextAndLabels.addFieldDescriptionInfo("publication_type", cl_publication_type);
 			
-			if (zMeta.getAccess_right() != null) {
+			if(zMeta.getImage_type() != null) {
+				FieldUtil.addValuesToListBox(field_image_type, zMeta.getImage_type().getSelectableValues());
+				if (zMeta.getImage_type().getSelectedValues() != null) {
+					FieldUtil.selectValueToListBox(field_image_type,
+							zMeta.getImage_type().getSelectedValues());
+				} else
+					cg_image_type.setVisible(false);
+			}else
+				cg_image_type.setVisible(false);
+
+
+			// Access Right
+			if (zMeta.getAccess_right().getSelectedValues() != null) {
 				FieldUtil.addValuesToListBox(field_access_right, zMeta.getAccess_right().getSelectableValues());
 				FieldUtil.selectValueToListBox(field_access_right, zMeta.getAccess_right().getSelectedValues());
 			} else
@@ -217,14 +270,25 @@ public class BasicInformationView extends Composite implements FormValidator {
 
 			InfoTextAndLabels.addFieldDescriptionInfo("access_right", cl_access_right);
 
-			if (zMeta.getLicense() != null) {
-				FieldUtil.addValuesToListBox(field_license, Arrays.asList(zMeta.getLicense().getId()));
-				FieldUtil.selectValueToListBox(field_license, Arrays.asList(zMeta.getLicense().getId()));
+			// License
+			if (zMeta.getLicenses() != null) {
+				List<String> listLicensesIds = null;
+				List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectedValues());
+				if(zMeta.getLicenses().getSelectableValues()!=null) {
+					listLicensesIds = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectableValues());
+					FieldUtil.addValuesToListBox(field_license, listLicensesIds);
+				}else {
+					//Exception case on missing list of selectable license ids
+					FieldUtil.addValuesToListBox(field_access_right, selectedLicensesId);
+		
+				}
+				FieldUtil.selectValueToListBox(field_license, selectedLicensesId);
 			}
 			field_license.setEnabled(false); // because is not changeable
 
 			InfoTextAndLabels.addFieldDescriptionInfo("license", cl_license);
 
+			// Keywords
 			if (zMeta.getKeywords() != null && zMeta.getKeywords().size() > 0) {
 				for (String keyword : zMeta.getKeywords()) {
 					the_tags_panel.addTagElement(keyword);
@@ -461,6 +525,16 @@ public class BasicInformationView extends Composite implements FormValidator {
 		return field_access_right;
 	}
 	
+	
+	/**
+	 * Gets the field image type.
+	 *
+	 * @return the field image type
+	 */
+	public ListBox getField_image_type() {
+		return field_image_type;
+	}
+
 	/**
 	 * Gets the field license.
 	 *
@@ -479,6 +553,24 @@ public class BasicInformationView extends Composite implements FormValidator {
 		return field_publication_type;
 	}
 	
+	/**
+	 * Gets the cg publication type.
+	 *
+	 * @return the cg publication type
+	 */
+	public ControlGroup getCg_publication_type() {
+		return cg_publication_type;
+	}
+	
+	/**
+	 * Gets the cg image type.
+	 *
+	 * @return the cg image type
+	 */
+	public ControlGroup getCg_image_type() {
+		return cg_image_type;
+	}
+
 	/**
 	 * Gets the field publication date.
 	 *

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.ui.xml

@@ -50,7 +50,8 @@
 						</b:Controls>
 					</b:ControlGroup>
 					<b:ControlGroup ui:field="cg_description">
-						<b:ControlLabel for="cl_description" ui:field="cl_description">
+						<b:ControlLabel for="cl_description"
+							ui:field="cl_description">
 							<font color="red">*</font>
 							Description
 						</b:ControlLabel>
@@ -66,7 +67,8 @@
 
 
 					<b:ControlGroup ui:field="cg_upload_type">
-						<b:ControlLabel for="cg_upload_type" ui:field="cl_upload_type">
+						<b:ControlLabel for="cg_upload_type"
+							ui:field="cl_upload_type">
 							Upload type
 						</b:ControlLabel>
 						<b:Controls>
@@ -79,7 +81,8 @@
 					</b:ControlGroup>
 
 					<b:ControlGroup ui:field="cg_publication_type">
-						<b:ControlLabel for="cl_publication_type" ui:field="cl_publication_type">
+						<b:ControlLabel for="cl_publication_type"
+							ui:field="cl_publication_type">
 							Publication type
 						</b:ControlLabel>
 						<b:Controls>
@@ -91,8 +94,23 @@
 						</b:Controls>
 					</b:ControlGroup>
 
+					<b:ControlGroup ui:field="cg_image_type">
+						<b:ControlLabel for="cl_image_type"
+							ui:field="cl_image_type">
+							Image type
+						</b:ControlLabel>
+						<b:Controls>
+							<!-- <b:InputAddOn prependIcon="BOOK"> -->
+							<b:ListBox name="Image type"
+								ui:field="field_image_type">
+							</b:ListBox>
+							<!-- </b:InputAddOn> -->
+						</b:Controls>
+					</b:ControlGroup>
+
 					<b:ControlGroup ui:field="cg_access_right">
-						<b:ControlLabel for="cl_access_right"  ui:field="cl_access_right">
+						<b:ControlLabel for="cl_access_right"
+							ui:field="cl_access_right">
 							Access right
 						</b:ControlLabel>
 						<b:Controls>
@@ -105,7 +123,8 @@
 					</b:ControlGroup>
 
 					<b:ControlGroup ui:field="cg_license">
-						<b:ControlLabel for="cl_license"  ui:field="cl_license">
+						<b:ControlLabel for="cl_license"
+							ui:field="cl_license">
 							License
 						</b:ControlLabel>
 						<b:Controls>
@@ -117,7 +136,8 @@
 					</b:ControlGroup>
 
 					<b:ControlGroup ui:field="cg_publication_date">
-						<b:ControlLabel for="cl_publication_date" ui:field="cl_publication_date">
+						<b:ControlLabel for="cl_publication_date"
+							ui:field="cl_publication_date">
 							Publication date
 						</b:ControlLabel>
 						<b:Controls>

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java

@@ -134,10 +134,24 @@ public class Ckan2ZenodoViewManager {
 		String uploadType = basicForm.getField_upload_type().getSelectedValue();
 		if(uploadType!=null)
 			meta.setUpload_type(new SerializableEnum<>(Arrays.asList(uploadType), meta.getUpload_type().getSelectableValues()));
+		
 		// publication type
+		if(basicForm.getCg_publication_type().isVisible()) {
+			//sets the publication_type only if the field is visible
 			String publicationType = basicForm.getField_publication_type().getSelectedValue();
 			if(publicationType!=null)
 				meta.setPublication_type(new SerializableEnum<>(Arrays.asList(publicationType), meta.getPublication_type().getSelectableValues()));
+		}
+		
+		//image type
+		if(basicForm.getCg_image_type().isVisible()) {
+			//sets the image_type only if the field is visible
+			String imageType = basicForm.getField_image_type().getSelectedValue();
+			if(imageType!=null) {
+				meta.setImage_type(new SerializableEnum<>(Arrays.asList(imageType), meta.getImage_type().getSelectableValues()));
+			}
+		}
+		
 		// access right
 		String accessRight = basicForm.getField_access_right().getSelectedValue();
 		if(accessRight!=null)

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java

@@ -1,7 +1,11 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.client.view;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
+
 import com.github.gwtbootstrap.client.ui.ControlGroup;
 import com.github.gwtbootstrap.client.ui.ListBox;
 import com.github.gwtbootstrap.client.ui.TextBox;
@@ -92,6 +96,25 @@ public class FieldUtil {
 	}
 	
 
+	/**
+	 * To zenodo ids.
+	 *
+	 * @param listLicenses the list licenses
+	 * @return the list
+	 */
+	public static List<String> toZenodoIds(List<LicenseBean> listLicenses){
+		if(listLicenses==null)
+			return null;
+		
+		List<String> licenses = new ArrayList<String>(listLicenses.size());
+		for (ZenodoLicense zenodoLicense : listLicenses) {
+			licenses.add(zenodoLicense.getId());
+		}
+		
+		return licenses;
+	}
+
+	
 	/**
 	 * Select value to list box.
 	 *

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
 
 
 /**
@@ -23,7 +24,7 @@ public class CkanToZenodoUtil {
 	 */
 	public static List<String> getNames(Enum<?>[] arrayEnum) {
 
-		List<String> list = new ArrayList<String>();
+		List<String> list = new ArrayList<>();
 		for (Enum<?> s : arrayEnum) {
 			list.add(s.name());
 		}
@@ -42,9 +43,22 @@ public class CkanToZenodoUtil {
 	 */
 	public static <T extends Enum<T>> SerializableEnum<String> toSerializableEnum(T[] enumSelected, T[] enumValues) {
 
-		List<String> selectedValues = CkanToZenodoUtil.getNames(enumSelected);
+		List<String> selectedValues = enumSelected!=null?CkanToZenodoUtil.getNames(enumSelected):null;
 		List<String> values = CkanToZenodoUtil.getNames(enumValues);
 		return new SerializableEnum<String>(selectedValues, values);
 	}
 	
+	
+	/**
+	 * To serializable enum.
+	 *
+	 * @param <E> the element type
+	 * @param selectedLicense the selected license
+	 * @param allLicenses the all licenses
+	 * @return the serializable enum
+	 */
+	public static <E extends ZenodoLicense> SerializableEnum<E> toSerializableEnum(List<E> selectedLicense, List<E> allLicenses) {
+
+		return new SerializableEnum<E>(selectedLicense, allLicenses);
+	}
 }

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java

@@ -1,6 +1,7 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.server.converter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.gcube.data.publishing.ckan2zenodo.model.CkanResource;
@@ -11,6 +12,7 @@ import org.gcube.data.publishing.ckan2zenodo.model.zenodo.Creator;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DateInterval;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata.AccessRights;
+import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata.ImageType;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata.PublicationType;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata.UploadType;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.FileDeposition;
@@ -199,27 +201,45 @@ public class ItemToZenodoConverter {
 		zm.setDescription(depositionMetadata.getDescription());
 		
 		//Access Type
+		AccessRights[] accessRight = null;
 		if(depositionMetadata.getAccess_right()!=null) {
-			AccessRights[] ar = { depositionMetadata.getAccess_right() };
-			SerializableEnum<String> sEnum  = CkanToZenodoUtil.toSerializableEnum(ar, AccessRights.values());
-			zm.setAccess_right(sEnum);
+			AccessRights[] theAccessRight = { depositionMetadata.getAccess_right() };
+			accessRight = theAccessRight;
 		}
+		zm.setAccess_right(CkanToZenodoUtil.toSerializableEnum(accessRight, AccessRights.values()));
 		
 		//Upload Type
+		UploadType[] uploadType = null;
 		if(depositionMetadata.getUpload_type()!=null) {
-			UploadType[] upType = { depositionMetadata.getUpload_type() };
-			SerializableEnum<String> sEnum  = CkanToZenodoUtil.toSerializableEnum(upType, UploadType.values());
-			zm.setUpload_type(sEnum);
+			UploadType[] theUploadType = { depositionMetadata.getUpload_type() };
+			uploadType = theUploadType;
+			
 		}
+		zm.setUpload_type(CkanToZenodoUtil.toSerializableEnum(uploadType, UploadType.values()));
 		
 		//Publication Type
+		PublicationType[] publicationType = null;
 		if(depositionMetadata.getPublication_type()!=null) {
-			PublicationType[] publicationType = { depositionMetadata.getPublication_type() };
-			SerializableEnum<String> sEnum  = CkanToZenodoUtil.toSerializableEnum(publicationType, PublicationType.values());
-			zm.setPublication_type(sEnum);
+			PublicationType[] thepublicationType = { depositionMetadata.getPublication_type() };
+			publicationType = thepublicationType;
 		}
+		zm.setPublication_type(CkanToZenodoUtil.toSerializableEnum(publicationType, PublicationType.values()));
+		
+		//Image Type
+		ImageType[] imageType = null;
+		if(depositionMetadata.getImage_type()!=null) {
+			ImageType[] theImageType = { depositionMetadata.getImage_type() };
+			imageType = theImageType;
+		}
+		zm.setImage_type(CkanToZenodoUtil.toSerializableEnum(imageType, ImageType.values()));
+		
+		//Licenses
+		List<LicenseBean> selectedLicenses = null;
+		if(depositionMetadata.getLicense()!=null) {
+			selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null));
+		}
+		zm.setLicenses(CkanToZenodoUtil.toSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES 
 		
-		zm.setLicense(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(),null)); //HAVE TO BE RIVISITED
 		zm.setKeywords(depositionMetadata.getKeywords());
 		zm.setCommunities(toZenodoCommunities(depositionMetadata.getCommunities()));
 		zm.setConference_acronym(depositionMetadata.getConference_acronym());
@@ -444,6 +464,15 @@ public class ItemToZenodoConverter {
 			depositionMetadata.setPublication_type(PublicationType.valueOf(thePublicationTypeValue));
 		}
 		
+		//image type
+		SerializableEnum<String> imageType = metadata.getImage_type();
+		LOG.debug("Read image type: "+imageType);
+		if(imageType!=null) {
+			String imageTypeValue = imageType.getSelectedValues().get(0);
+			LOG.debug("Set image type: "+imageTypeValue);
+			depositionMetadata.setImage_type(ImageType.valueOf(imageTypeValue));
+		}
+		
 		//creators
 		List<Creator> creators = null;
 		List<? extends ZenodoAuthor> zenodoCreators = metadata.getCreators();

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/ZenodoLicense.java

@@ -0,0 +1,9 @@
+package org.gcube.portlets.widgets.ckan2zenodopublisher.shared;
+
+public interface ZenodoLicense {
+	
+	String getId();
+	String getTitle();
+	String getUrl();
+
+}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java

@@ -2,6 +2,8 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
 
 import java.io.Serializable;
 
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
+
 /**
  * A license bean like the ckan's one.
  *
@@ -9,7 +11,7 @@ import java.io.Serializable;
  * 
  * Jan 13, 2020
  */
-public class LicenseBean implements Serializable{
+public class LicenseBean implements Serializable, ZenodoLicense{
 
 	/**
 	 * 

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java

@@ -6,6 +6,14 @@ import java.util.List;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
 
+
+/**
+ * The Class ZenodoMetadata.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+ * 
+ * Jan 20, 2020
+ */
 public class ZenodoMetadata implements Serializable{
 	
 	/**
@@ -70,448 +78,914 @@ public class ZenodoMetadata implements Serializable{
 	
 	private LicenseBean license; //TODO html
 
+	private SerializableEnum<LicenseBean> licenses;
 	
+	
+	/**
+	 * Instantiates a new zenodo metadata.
+	 */
 	public ZenodoMetadata(){}
 
 
+	/**
+	 * Gets the upload type.
+	 *
+	 * @return the upload type
+	 */
 	public SerializableEnum<String> getUpload_type() {
 		return upload_type;
 	}
 
 
+	/**
+	 * Sets the upload type.
+	 *
+	 * @param upload_type the new upload type
+	 */
 	public void setUpload_type(SerializableEnum<String> upload_type) {
 		this.upload_type = upload_type;
 	}
 
 
+	/**
+	 * Gets the publication type.
+	 *
+	 * @return the publication type
+	 */
 	public SerializableEnum<String> getPublication_type() {
 		return publication_type;
 	}
 
 
+	/**
+	 * Sets the publication type.
+	 *
+	 * @param publication_type the new publication type
+	 */
 	public void setPublication_type(SerializableEnum<String> publication_type) {
 		this.publication_type = publication_type;
 	}
 
 
+	/**
+	 * Gets the image type.
+	 *
+	 * @return the image type
+	 */
 	public SerializableEnum<String> getImage_type() {
 		return image_type;
 	}
 
 
+	/**
+	 * Sets the image type.
+	 *
+	 * @param image_type the new image type
+	 */
 	public void setImage_type(SerializableEnum<String> image_type) {
 		this.image_type = image_type;
 	}
 
 
+	/**
+	 * Gets the publication date.
+	 *
+	 * @return the publication date
+	 */
 	public Date getPublication_date() {
 		return publication_date;
 	}
 
 
+	/**
+	 * Sets the publication date.
+	 *
+	 * @param publication_date the new publication date
+	 */
 	public void setPublication_date(Date publication_date) {
 		this.publication_date = publication_date;
 	}
 
 
+	/**
+	 * Gets the title.
+	 *
+	 * @return the title
+	 */
 	public String getTitle() {
 		return title;
 	}
 
 
+	/**
+	 * Sets the title.
+	 *
+	 * @param title the new title
+	 */
 	public void setTitle(String title) {
 		this.title = title;
 	}
 
 
+	/**
+	 * Gets the creators.
+	 *
+	 * @return the creators
+	 */
 	public List<? extends ZenodoAuthor> getCreators() {
 		return creators;
 	}
 
 
+	/**
+	 * Sets the creators.
+	 *
+	 * @param creators the new creators
+	 */
 	public void setCreators(List<ZenodoCreator> creators) {
 		this.creators = creators;
 	}
 
 
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
 	public String getDescription() {
 		return description;
 	}
 
 
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
 	public void setDescription(String description) {
 		this.description = description;
 	}
 
 
+	/**
+	 * Gets the access right.
+	 *
+	 * @return the access right
+	 */
 	public SerializableEnum<String> getAccess_right() {
 		return access_right;
 	}
 
 
+	/**
+	 * Sets the access right.
+	 *
+	 * @param access_right the new access right
+	 */
 	public void setAccess_right(SerializableEnum<String> access_right) {
 		this.access_right = access_right;
 	}
 
 
+	/**
+	 * Gets the embargo date.
+	 *
+	 * @return the embargo date
+	 */
 	public Date getEmbargo_date() {
 		return embargo_date;
 	}
 
 
+	/**
+	 * Sets the embargo date.
+	 *
+	 * @param embargo_date the new embargo date
+	 */
 	public void setEmbargo_date(Date embargo_date) {
 		this.embargo_date = embargo_date;
 	}
 
 
+	/**
+	 * Gets the access conditions.
+	 *
+	 * @return the access conditions
+	 */
 	public String getAccess_conditions() {
 		return access_conditions;
 	}
 
 
+	/**
+	 * Sets the access conditions.
+	 *
+	 * @param access_conditions the new access conditions
+	 */
 	public void setAccess_conditions(String access_conditions) {
 		this.access_conditions = access_conditions;
 	}
 
 
+	/**
+	 * Gets the doi.
+	 *
+	 * @return the doi
+	 */
 	public String getDoi() {
 		return doi;
 	}
 
 
+	/**
+	 * Sets the doi.
+	 *
+	 * @param doi the new doi
+	 */
 	public void setDoi(String doi) {
 		this.doi = doi;
 	}
 
 
+	/**
+	 * Gets the preserve doi.
+	 *
+	 * @return the preserve doi
+	 */
 	public Boolean getPreserve_doi() {
 		return preserve_doi;
 	}
 
 
+	/**
+	 * Sets the preserve doi.
+	 *
+	 * @param preserve_doi the new preserve doi
+	 */
 	public void setPreserve_doi(Boolean preserve_doi) {
 		this.preserve_doi = preserve_doi;
 	}
 
 
+	/**
+	 * Gets the keywords.
+	 *
+	 * @return the keywords
+	 */
 	public List<String> getKeywords() {
 		return keywords;
 	}
 
 
+	/**
+	 * Sets the keywords.
+	 *
+	 * @param keywords the new keywords
+	 */
 	public void setKeywords(List<String> keywords) {
 		this.keywords = keywords;
 	}
 
 
+	/**
+	 * Gets the notes.
+	 *
+	 * @return the notes
+	 */
 	public String getNotes() {
 		return notes;
 	}
 
 
+	/**
+	 * Sets the notes.
+	 *
+	 * @param notes the new notes
+	 */
 	public void setNotes(String notes) {
 		this.notes = notes;
 	}
 
 
+	/**
+	 * Gets the related identifiers.
+	 *
+	 * @return the related identifiers
+	 */
 	public List<ZenodoRelatedIdentifier> getRelated_identifiers() {
 		return related_identifiers;
 	}
 
 
+	/**
+	 * Sets the related identifiers.
+	 *
+	 * @param related_identifiers the new related identifiers
+	 */
 	public void setRelated_identifiers(List<ZenodoRelatedIdentifier> related_identifiers) {
 		this.related_identifiers = related_identifiers;
 	}
 
 
+	/**
+	 * Gets the contributors.
+	 *
+	 * @return the contributors
+	 */
 	public List<? extends ZenodoAuthor> getContributors() {
 		return contributors;
 	}
 
 
+	/**
+	 * Sets the contributors.
+	 *
+	 * @param contributors the new contributors
+	 */
 	public void setContributors(List<ZenodoContributor> contributors) {
 		this.contributors = contributors;
 	}
 
 
+	/**
+	 * Gets the references.
+	 *
+	 * @return the references
+	 */
 	public List<String> getReferences() {
 		return references;
 	}
 
 
+	/**
+	 * Sets the references.
+	 *
+	 * @param references the new references
+	 */
 	public void setReferences(List<String> references) {
 		this.references = references;
 	}
 
 
+	/**
+	 * Gets the communities.
+	 *
+	 * @return the communities
+	 */
 	public List<ZenodoCommunity> getCommunities() {
 		return communities;
 	}
 
 
+	/**
+	 * Sets the communities.
+	 *
+	 * @param communities the new communities
+	 */
 	public void setCommunities(List<ZenodoCommunity> communities) {
 		this.communities = communities;
 	}
 
 
+	/**
+	 * Gets the grants.
+	 *
+	 * @return the grants
+	 */
 	public List<ZenodoGrant> getGrants() {
 		return grants;
 	}
 
 
+	/**
+	 * Sets the grants.
+	 *
+	 * @param grants the new grants
+	 */
 	public void setGrants(List<ZenodoGrant> grants) {
 		this.grants = grants;
 	}
 
 
+	/**
+	 * Gets the journal title.
+	 *
+	 * @return the journal title
+	 */
 	public String getJournal_title() {
 		return journal_title;
 	}
 
 
+	/**
+	 * Sets the journal title.
+	 *
+	 * @param journal_title the new journal title
+	 */
 	public void setJournal_title(String journal_title) {
 		this.journal_title = journal_title;
 	}
 
 
+	/**
+	 * Gets the journal volume.
+	 *
+	 * @return the journal volume
+	 */
 	public String getJournal_volume() {
 		return journal_volume;
 	}
 
 
+	/**
+	 * Sets the journal volume.
+	 *
+	 * @param journal_volume the new journal volume
+	 */
 	public void setJournal_volume(String journal_volume) {
 		this.journal_volume = journal_volume;
 	}
 
 
+	/**
+	 * Gets the journal issue.
+	 *
+	 * @return the journal issue
+	 */
 	public String getJournal_issue() {
 		return journal_issue;
 	}
 
 
+	/**
+	 * Sets the journal issue.
+	 *
+	 * @param journal_issue the new journal issue
+	 */
 	public void setJournal_issue(String journal_issue) {
 		this.journal_issue = journal_issue;
 	}
 
 
+	/**
+	 * Gets the journal pages.
+	 *
+	 * @return the journal pages
+	 */
 	public String getJournal_pages() {
 		return journal_pages;
 	}
 
 
+	/**
+	 * Sets the journal pages.
+	 *
+	 * @param journal_pages the new journal pages
+	 */
 	public void setJournal_pages(String journal_pages) {
 		this.journal_pages = journal_pages;
 	}
 
 
+	/**
+	 * Gets the conference title.
+	 *
+	 * @return the conference title
+	 */
 	public String getConference_title() {
 		return conference_title;
 	}
 
 
+	/**
+	 * Sets the conference title.
+	 *
+	 * @param conference_title the new conference title
+	 */
 	public void setConference_title(String conference_title) {
 		this.conference_title = conference_title;
 	}
 
 
+	/**
+	 * Gets the conference acronym.
+	 *
+	 * @return the conference acronym
+	 */
 	public String getConference_acronym() {
 		return conference_acronym;
 	}
 
 
+	/**
+	 * Sets the conference acronym.
+	 *
+	 * @param conference_acronym the new conference acronym
+	 */
 	public void setConference_acronym(String conference_acronym) {
 		this.conference_acronym = conference_acronym;
 	}
 
 
+	/**
+	 * Gets the conference dates.
+	 *
+	 * @return the conference dates
+	 */
 	public String getConference_dates() {
 		return conference_dates;
 	}
 
 
+	/**
+	 * Sets the conference dates.
+	 *
+	 * @param conference_dates the new conference dates
+	 */
 	public void setConference_dates(String conference_dates) {
 		this.conference_dates = conference_dates;
 	}
 
 
+	/**
+	 * Gets the conference place.
+	 *
+	 * @return the conference place
+	 */
 	public String getConference_place() {
 		return conference_place;
 	}
 
 
+	/**
+	 * Sets the conference place.
+	 *
+	 * @param conference_place the new conference place
+	 */
 	public void setConference_place(String conference_place) {
 		this.conference_place = conference_place;
 	}
 
 
+	/**
+	 * Gets the conference url.
+	 *
+	 * @return the conference url
+	 */
 	public String getConference_url() {
 		return conference_url;
 	}
 
 
+	/**
+	 * Sets the conference url.
+	 *
+	 * @param conference_url the new conference url
+	 */
 	public void setConference_url(String conference_url) {
 		this.conference_url = conference_url;
 	}
 
 
+	/**
+	 * Gets the conference session.
+	 *
+	 * @return the conference session
+	 */
 	public String getConference_session() {
 		return conference_session;
 	}
 
 
+	/**
+	 * Sets the conference session.
+	 *
+	 * @param conference_session the new conference session
+	 */
 	public void setConference_session(String conference_session) {
 		this.conference_session = conference_session;
 	}
 
 
+	/**
+	 * Gets the conference session part.
+	 *
+	 * @return the conference session part
+	 */
 	public String getConference_session_part() {
 		return conference_session_part;
 	}
 
 
+	/**
+	 * Sets the conference session part.
+	 *
+	 * @param conference_session_part the new conference session part
+	 */
 	public void setConference_session_part(String conference_session_part) {
 		this.conference_session_part = conference_session_part;
 	}
 
 
+	/**
+	 * Gets the imprint publisher.
+	 *
+	 * @return the imprint publisher
+	 */
 	public String getImprint_publisher() {
 		return imprint_publisher;
 	}
 
 
+	/**
+	 * Sets the imprint publisher.
+	 *
+	 * @param imprint_publisher the new imprint publisher
+	 */
 	public void setImprint_publisher(String imprint_publisher) {
 		this.imprint_publisher = imprint_publisher;
 	}
 
 
+	/**
+	 * Gets the imprint isbn.
+	 *
+	 * @return the imprint isbn
+	 */
 	public String getImprint_isbn() {
 		return imprint_isbn;
 	}
 
 
+	/**
+	 * Sets the imprint isbn.
+	 *
+	 * @param imprint_isbn the new imprint isbn
+	 */
 	public void setImprint_isbn(String imprint_isbn) {
 		this.imprint_isbn = imprint_isbn;
 	}
 
 
+	/**
+	 * Gets the imprint place.
+	 *
+	 * @return the imprint place
+	 */
 	public String getImprint_place() {
 		return imprint_place;
 	}
 
 
+	/**
+	 * Sets the imprint place.
+	 *
+	 * @param imprint_place the new imprint place
+	 */
 	public void setImprint_place(String imprint_place) {
 		this.imprint_place = imprint_place;
 	}
 
 
+	/**
+	 * Gets the partof title.
+	 *
+	 * @return the partof title
+	 */
 	public String getPartof_title() {
 		return partof_title;
 	}
 
 
+	/**
+	 * Sets the partof title.
+	 *
+	 * @param partof_title the new partof title
+	 */
 	public void setPartof_title(String partof_title) {
 		this.partof_title = partof_title;
 	}
 
 
+	/**
+	 * Gets the partof pages.
+	 *
+	 * @return the partof pages
+	 */
 	public String getPartof_pages() {
 		return partof_pages;
 	}
 
 
+	/**
+	 * Sets the partof pages.
+	 *
+	 * @param partof_pages the new partof pages
+	 */
 	public void setPartof_pages(String partof_pages) {
 		this.partof_pages = partof_pages;
 	}
 
 
+	/**
+	 * Gets the thesis supervisors.
+	 *
+	 * @return the thesis supervisors
+	 */
 	public List<ZenodoCreator> getThesis_supervisors() {
 		return thesis_supervisors;
 	}
 
 
+	/**
+	 * Sets the thesis supervisors.
+	 *
+	 * @param thesis_supervisors the new thesis supervisors
+	 */
 	public void setThesis_supervisors(List<ZenodoCreator> thesis_supervisors) {
 		this.thesis_supervisors = thesis_supervisors;
 	}
 
 
+	/**
+	 * Gets the thesis university.
+	 *
+	 * @return the thesis university
+	 */
 	public String getThesis_university() {
 		return thesis_university;
 	}
 
 
+	/**
+	 * Sets the thesis university.
+	 *
+	 * @param thesis_university the new thesis university
+	 */
 	public void setThesis_university(String thesis_university) {
 		this.thesis_university = thesis_university;
 	}
 
 
+	/**
+	 * Gets the subjects.
+	 *
+	 * @return the subjects
+	 */
 	public List<ZenodoSubject> getSubjects() {
 		return subjects;
 	}
 
 
+	/**
+	 * Sets the subjects.
+	 *
+	 * @param subjects the new subjects
+	 */
 	public void setSubjects(List<ZenodoSubject> subjects) {
 		this.subjects = subjects;
 	}
 
 
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
 	public String getVersion() {
 		return version;
 	}
 
 
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
 	public void setVersion(String version) {
 		this.version = version;
 	}
 
 
+	/**
+	 * Gets the language.
+	 *
+	 * @return the language
+	 */
 	public String getLanguage() {
 		return language;
 	}
 
 
+	/**
+	 * Sets the language.
+	 *
+	 * @param language the new language
+	 */
 	public void setLanguage(String language) {
 		this.language = language;
 	}
 
 
+	/**
+	 * Gets the locations.
+	 *
+	 * @return the locations
+	 */
 	public List<ZenodoLocation> getLocations() {
 		return locations;
 	}
 
 
+	/**
+	 * Sets the locations.
+	 *
+	 * @param locations the new locations
+	 */
 	public void setLocations(List<ZenodoLocation> locations) {
 		this.locations = locations;
 	}
 
 
+	/**
+	 * Gets the dates.
+	 *
+	 * @return the dates
+	 */
 	public List<ZenodoDateInterval> getDates() {
 		return dates;
 	}
 
 
+	/**
+	 * Sets the dates.
+	 *
+	 * @param dates the new dates
+	 */
 	public void setDates(List<ZenodoDateInterval> dates) {
 		this.dates = dates;
 	}
 
 
+	/**
+	 * Gets the method.
+	 *
+	 * @return the method
+	 */
 	public String getMethod() {
 		return method;
 	}
 
 
+	/**
+	 * Sets the method.
+	 *
+	 * @param method the new method
+	 */
 	public void setMethod(String method) {
 		this.method = method;
 	}
 
-	public LicenseBean getLicense() {
-		return license;
+//	/**
+//	 * Gets the license.
+//	 *
+//	 * @return the license
+//	 */
+//	public LicenseBean getLicense() {
+//		return license;
+//	}
+//
+//	/**
+//	 * Sets the license.
+//	 *
+//	 * @param license the new license
+//	 */
+//	public void setLicense(LicenseBean license) {
+//		this.license = license;
+//	}
+	
+	/**
+	 * Sets the licenses.
+	 *
+	 * @param licenses the new licenses
+	 */
+	public void setLicenses(SerializableEnum<LicenseBean> licenses) {
+		this.licenses = licenses;
 	}
 	
-	public void setLicense(LicenseBean license) {
-		this.license = license;
+	/**
+	 * Gets the licenses.
+	 *
+	 * @return the licenses
+	 */
+	public SerializableEnum<LicenseBean> getLicenses() {
+		return licenses;
 	}
 
 
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();