From 67591125e695d0b9338142008dd2e1fe382ab417 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 5 Feb 2024 14:10:57 +0100 Subject: [PATCH] refactored to CustomFieldEntryProfile --- .../client/events/DeleteCustomFieldEvent.java | 8 ++++---- .../client/form/catalogue/CreateDatasetForm.java | 14 +++++++------- .../client/form/generic/CreateMetadataForm.java | 15 ++++++--------- ...eldEntry.java => CustomFieldEntryProfile.java} | 6 +++--- ...ntry.ui.xml => CustomFieldEntryProfile.ui.xml} | 0 5 files changed, 20 insertions(+), 23 deletions(-) rename src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/{CustomFieldEntry.java => CustomFieldEntryProfile.java} (91%) rename src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/{CustomFieldEntry.ui.xml => CustomFieldEntryProfile.ui.xml} (100%) diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteCustomFieldEvent.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteCustomFieldEvent.java index 41d01ab..d8a3ba5 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteCustomFieldEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteCustomFieldEvent.java @@ -1,5 +1,5 @@ package org.gcube.portlets.widgets.mpformbuilder.client.events; -import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntry; +import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntryProfile; import com.google.gwt.event.shared.GwtEvent; @@ -10,13 +10,13 @@ import com.google.gwt.event.shared.GwtEvent; public class DeleteCustomFieldEvent extends GwtEvent { public static Type TYPE = new Type(); - private CustomFieldEntry removedEntry; + private CustomFieldEntryProfile removedEntry; - public DeleteCustomFieldEvent(CustomFieldEntry removedEntry) { + public DeleteCustomFieldEvent(CustomFieldEntryProfile removedEntry) { this.removedEntry = removedEntry; } - public CustomFieldEntry getRemovedEntry() { + public CustomFieldEntryProfile getRemovedEntry() { return removedEntry; } diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/catalogue/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/catalogue/CreateDatasetForm.java index 1665743..6720318 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/catalogue/CreateDatasetForm.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/catalogue/CreateDatasetForm.java @@ -17,7 +17,7 @@ //import org.gcube.portlets.widgets.mpformbuilder.client.events.DeleteCustomFieldEventHandler; //import org.gcube.portlets.widgets.mpformbuilder.client.form.MetaDataField; //import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CategoryPanel; -//import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntry; +//import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntryProfile; //import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton; //import org.gcube.portlets.widgets.mpformbuilder.client.ui.resources.AddResourceContainer; //import org.gcube.portlets.widgets.mpformbuilder.client.ui.resources.AddResourceToDataset; @@ -190,7 +190,7 @@ // private HandlerManager eventBus; // // // added custom field entries (by the user) -// private List customFieldEntriesList = new ArrayList(); +// private List customFieldEntriesList = new ArrayList(); // // // the list of MetaDataField added // private List listOfMetadataFields = new ArrayList(); @@ -342,7 +342,7 @@ // // for (String value : values) { // // these are fixed key, variable value custom fields -// CustomFieldEntry toAdd = new CustomFieldEntry(eventBus, entry.getKey(), value, false); +// CustomFieldEntryProfile toAdd = new CustomFieldEntryProfile(eventBus, entry.getKey(), value, false); // customFieldEntriesList.add(toAdd); // customFields.add(toAdd); // @@ -796,7 +796,7 @@ // @UiHandler("addCustomFieldButton") // void addCustomFieldEvent(ClickEvent e){ // -// CustomFieldEntry toAdd = new CustomFieldEntry(eventBus, "", "", true); +// CustomFieldEntryProfile toAdd = new CustomFieldEntryProfile(eventBus, "", "", true); // customFieldEntriesList.add(toAdd); // customFields.add(toAdd); // @@ -993,7 +993,7 @@ // } // } // -// for(CustomFieldEntry customEntry : customFieldEntriesList){ +// for(CustomFieldEntryProfile customEntry : customFieldEntriesList){ // String key = customEntry.getKey(); // String value = customEntry.getValue(); // if(value != null && !value.isEmpty()){ @@ -1454,7 +1454,7 @@ // groupsListbox.setItemSelected(i, false); // // // delete custom fields -// for (CustomFieldEntry customField : customFieldEntriesList) { +// for (CustomFieldEntryProfile customField : customFieldEntriesList) { // customField.removeFromParent(); // } // customFieldEntriesList.clear(); @@ -1478,7 +1478,7 @@ // metadataTypeListbox.setEnabled(false); // groupsListbox.setEnabled(false); // -// for(CustomFieldEntry ce: customFieldEntriesList) +// for(CustomFieldEntryProfile ce: customFieldEntriesList) // ce.freeze(); // // // disable profile fields diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java index e6ad544..b3e530e 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/form/generic/CreateMetadataForm.java @@ -16,7 +16,7 @@ import org.gcube.portlets.widgets.mpformbuilder.client.form.MetaDataField; import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.GenericFormEvents.GenericFormEventsListener; import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.GenericFormEvents.HasGenericFormListenerRegistration; import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CategoryPanel; -import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntry; +import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CustomFieldEntryProfile; import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton; import org.gcube.portlets.widgets.mpformbuilder.client.ui.resources.AddResourceToDataset; import org.gcube.portlets.widgets.mpformbuilder.client.ui.twincolumnselection.TwinColumnSelectionMainPanel; @@ -205,9 +205,6 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe /** The Constant TRYING_TO_CREATE_PRODUCT. */ private static final String DATA_FORM_FILLED_IN_CORRECTLY = "Very well!!! Data form filled in correclty!"; - /** The Constant MISSING_PUBLISH_RIGHTS. */ - protected static final String MISSING_PUBLISH_RIGHTS = "It seems you are not authorized to publish on catalogue. Request it to the VRE manager or the portal administrator."; - /** The tab panel. */ // tab panel private TabPanel tabPanel; @@ -228,7 +225,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe /** The custom field entries list. */ // added custom field entries (by the user) - private List customFieldEntriesList = new ArrayList(); + private List customFieldEntriesList = new ArrayList(); /** The list of metadata fields. */ // the list of MetaDataField added @@ -611,7 +608,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe @UiHandler("addCustomFieldButton") void addCustomFieldEvent(ClickEvent e) { - CustomFieldEntry toAdd = new CustomFieldEntry(uiBus, "", "", true); + CustomFieldEntryProfile toAdd = new CustomFieldEntryProfile(uiBus, "", "", true); customFieldEntriesList.add(toAdd); customFields.add(toAdd); @@ -686,7 +683,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe } } - for (CustomFieldEntry customEntry : customFieldEntriesList) { + for (CustomFieldEntryProfile customEntry : customFieldEntriesList) { String key = customEntry.getKey(); String value = customEntry.getValue(); if (value != null && !value.isEmpty()) { @@ -856,7 +853,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe /* * @UiHandler("resetButton") void resetFormEvent(ClickEvent e){ * - * // delete custom fields for (CustomFieldEntry customField : + * // delete custom fields for (CustomFieldEntryProfile customField : * customFieldEntriesList) { customField.removeFromParent(); } * customFieldEntriesList.clear(); } */ @@ -871,7 +868,7 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe addCustomFieldButton.setEnabled(!bool); metadataTypeListbox.setEnabled(!bool); - for (CustomFieldEntry ce : customFieldEntriesList) + for (CustomFieldEntryProfile ce : customFieldEntriesList) ce.freeze(!bool); // disable profile fields diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntry.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntryProfile.java similarity index 91% rename from src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntry.java rename to src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntryProfile.java index 8332893..9799cef 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntry.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntryProfile.java @@ -18,13 +18,13 @@ import com.google.gwt.user.client.ui.Widget; * A custom field entry that has two textboxes, one for the key value and the other for the value. * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ -public class CustomFieldEntry extends Composite { +public class CustomFieldEntryProfile extends Composite { private static CustomFieldEntryUiBinder uiBinder = GWT .create(CustomFieldEntryUiBinder.class); interface CustomFieldEntryUiBinder extends - UiBinder { + UiBinder { } @UiField InputAddOn keyFieldPrepend; @@ -39,7 +39,7 @@ public class CustomFieldEntry extends Composite { // event bus private HandlerManager eventBus; - public CustomFieldEntry(HandlerManager eventBus, String key, String value, boolean isCustomCreatedByUser) { + public CustomFieldEntryProfile(HandlerManager eventBus, String key, String value, boolean isCustomCreatedByUser) { initWidget(uiBinder.createAndBindUi(this)); // save information diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntry.ui.xml b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntryProfile.ui.xml similarity index 100% rename from src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntry.ui.xml rename to src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/metadata/CustomFieldEntryProfile.ui.xml