From 845a8c4ece5a1cc955596d124b80a08d8ae02205 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 2 Feb 2024 17:00:07 +0100 Subject: [PATCH] refactored beans --- .../client/events/AddResourceEvent.java | 8 +-- .../client/events/DeleteResourceEvent.java | 8 +-- .../form/catalogue/CreateDatasetForm.java | 32 ++++----- .../form/generic/CreateMetadataForm.java | 10 +-- .../ui/resources/AddResourceToDataset.java | 8 +-- .../ui/resources/AddedResourcesSummary.java | 10 +-- .../twincolumnselection/ResourceCellLeft.java | 6 +- .../ResourceCellRight.java | 10 +-- .../twincolumnselection/ResourceInfoForm.java | 6 +- .../TwinColumnSelectionMainPanel.java | 70 +++++++++---------- .../shared/catalogue/DatasetBean.java | 30 ++++---- ...Bean.java => OrganizationBeanProfile.java} | 10 +-- ...n.java => ResourceElementBeanProfile.java} | 42 +++++------ 13 files changed, 125 insertions(+), 125 deletions(-) rename src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/{OrganizationBean.java => OrganizationBeanProfile.java} (80%) rename src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/{ResourceElementBean.java => ResourceElementBeanProfile.java} (79%) diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/AddResourceEvent.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/AddResourceEvent.java index f0485cc..af65fd5 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/AddResourceEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/AddResourceEvent.java @@ -1,6 +1,6 @@ package org.gcube.portlets.widgets.mpformbuilder.client.events; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.google.gwt.event.shared.GwtEvent; @@ -11,13 +11,13 @@ import com.google.gwt.event.shared.GwtEvent; public class AddResourceEvent extends GwtEvent { public static Type TYPE = new Type(); - private ResourceElementBean resource; + private ResourceElementBeanProfile resource; - public AddResourceEvent(ResourceElementBean resource) { + public AddResourceEvent(ResourceElementBeanProfile resource) { this.resource = resource; } - public ResourceElementBean getResource() { + public ResourceElementBeanProfile getResource() { return resource; } diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteResourceEvent.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteResourceEvent.java index c528579..6a08831 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteResourceEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/events/DeleteResourceEvent.java @@ -1,6 +1,6 @@ package org.gcube.portlets.widgets.mpformbuilder.client.events; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.google.gwt.event.shared.GwtEvent; @@ -11,13 +11,13 @@ import com.google.gwt.event.shared.GwtEvent; public class DeleteResourceEvent extends GwtEvent { public static Type TYPE = new Type(); - private ResourceElementBean resource; + private ResourceElementBeanProfile resource; - public DeleteResourceEvent(ResourceElementBean resource) { + public DeleteResourceEvent(ResourceElementBeanProfile resource) { this.resource = resource; } - public ResourceElementBean getResource() { + public ResourceElementBeanProfile getResource() { return resource; } 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 aef4a3b..1665743 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 @@ -26,7 +26,7 @@ //import org.gcube.portlets.widgets.mpformbuilder.client.ui.twincolumnselection.TwinColumnSelectionMainPanel; //import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.InfoIconsLabels; //import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.DatasetBean; -//import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.OrganizationBean; +//import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.OrganizationBeanProfile; //import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean; //import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.CategoryWrapper; //import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean; @@ -365,9 +365,9 @@ // } // // // set organizations -// List organizations = bean.getOrganizationList(); +// List organizations = bean.getOrganizationList(); // -// for (OrganizationBean organization : organizations) { +// for (OrganizationBeanProfile organization : organizations) { // organizationsListbox.addItem(organization.getTitle()); // nameTitleOrganizationMap.put(organization.getTitle(), organization.getName()); // } @@ -460,10 +460,10 @@ // setAlertBlock("Retrieving groups, please wait...", AlertType.INFO, true); // // // request groups -// ckanServices.getUserGroups(orgName, new AsyncCallback>() { +// ckanServices.getUserGroups(orgName, new AsyncCallback>() { // // @Override -// public void onSuccess(List groups) { +// public void onSuccess(List groups) { // if(groups == null){ // setAlertBlock("Error while retrieving groups", AlertType.ERROR, true); // }else{ @@ -473,7 +473,7 @@ // else{ // // // add groups -// for (OrganizationBean group : groups) { +// for (OrganizationBeanProfile group : groups) { // groupsListbox.addItem(group.getTitle(), group.getName()); // } // hideGroupsAlreadyInProfile(profiles); @@ -565,10 +565,10 @@ // setAlertBlock("Retrieving groups, please wait...", AlertType.INFO, true); // // // request groups -// ckanServices.getUserGroups(orgName, new AsyncCallback>() { +// ckanServices.getUserGroups(orgName, new AsyncCallback>() { // // @Override -// public void onSuccess(List groups) { +// public void onSuccess(List groups) { // // if(groups == null){ // setAlertBlock("Error while retrieving groups, try later", AlertType.ERROR, true); @@ -579,7 +579,7 @@ // else{ // // // add groups -// for (OrganizationBean group : groups) { +// for (OrganizationBeanProfile group : groups) { // groupsListbox.addItem(group.getTitle(), group.getName()); // } // groupsListbox.setEnabled(true); @@ -934,17 +934,17 @@ // Set tags = new HashSet(tagsPanel.getTags()); // // //we need to retrieve the organization's name from this title -// List orgs = receivedBean.getOrganizationList(); +// List orgs = receivedBean.getOrganizationList(); // String chosenOrganization = null; -// for (OrganizationBean organizationBean : orgs) { +// for (OrganizationBeanProfile organizationBean : orgs) { // if(chosenOrganizationTitle.equals(organizationBean.getTitle())){ // chosenOrganization = organizationBean.getName(); // break; // } // } // -// List groups = new ArrayList(); -// List groupsToForceCreation = new ArrayList(); +// List groups = new ArrayList(); +// List groupsToForceCreation = new ArrayList(); // // // get groups, if any // int items = groupsListbox.getItemCount(); @@ -952,7 +952,7 @@ // String groupTitle = groupsListbox.getItemText(i); // String groupName = groupsListbox.getValue(i); // if(groupsListbox.isItemSelected(i)){ -// groups.add(new OrganizationBean(groupTitle, groupName, false)); +// groups.add(new OrganizationBeanProfile(groupTitle, groupName, false)); // } // } // @@ -984,9 +984,9 @@ // if(groupsTitle != null){ // for (String groupTitle : groupsTitle) { // if(field.isGroupToForce()) -// groupsToForceCreation.add(new OrganizationBean(groupTitle, groupTitle, false, field.isPropagateUp())); +// groupsToForceCreation.add(new OrganizationBeanProfile(groupTitle, groupTitle, false, field.isPropagateUp())); // else -// groups.add(new OrganizationBean(groupTitle, groupTitle, false, field.isPropagateUp())); +// groups.add(new OrganizationBeanProfile(groupTitle, groupTitle, false, field.isPropagateUp())); // } // } // } 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 8884abc..e6ad544 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 @@ -25,7 +25,7 @@ import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.CustomLegend; import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.InfoIconsLabels; import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.LoaderIcon; import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.OrganizationBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.OrganizationBeanProfile; import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean; import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.CategoryWrapper; import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean; @@ -633,8 +633,8 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe } else { // Set tags = new HashSet(tagsPanel.getTags()); - List groups = new ArrayList(); - List groupsToForceCreation = new ArrayList(); + List groups = new ArrayList(); + List groupsToForceCreation = new ArrayList(); LinkedHashMap> customFieldsMap = new LinkedHashMap>(); List listFilesUploaded = new ArrayList(); @@ -673,10 +673,10 @@ public class CreateMetadataForm extends Composite implements HasGenericFormListe if (groupsTitle != null) { for (String groupTitle : groupsTitle) { if (field.isGroupToForce()) - groupsToForceCreation.add(new OrganizationBean(groupTitle, groupTitle, false, + groupsToForceCreation.add(new OrganizationBeanProfile(groupTitle, groupTitle, false, field.isPropagateUp())); else - groups.add(new OrganizationBean(groupTitle, groupTitle, false, + groups.add(new OrganizationBeanProfile(groupTitle, groupTitle, false, field.isPropagateUp())); } } diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddResourceToDataset.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddResourceToDataset.java index 8f8211f..5d8e377 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddResourceToDataset.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddResourceToDataset.java @@ -112,8 +112,8 @@ public class AddResourceToDataset extends Composite{ // collect data and build up the bean /*//TODO MUST BE DONE IN ANOTHER POINT * - * final ResourceElementBean resource = - new ResourceElementBean( + * final ResourceElementBeanProfile resource = + new ResourceElementBeanProfile( resourceNameTextBox.getText(), true, false, @@ -130,10 +130,10 @@ public class AddResourceToDataset extends Composite{ addResourceButton.setEnabled(false); // try to create - ckanServices.addResourceToDataset(resource, datasetId, new AsyncCallback() { + ckanServices.addResourceToDataset(resource, datasetId, new AsyncCallback() { @Override - public void onSuccess(ResourceElementBean result) { + public void onSuccess(ResourceElementBeanProfile result) { if(result != null){ showAlert("Resource created correctly", AlertType.SUCCESS); diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddedResourcesSummary.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddedResourcesSummary.java index b5b5ca4..24cf5b9 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddedResourcesSummary.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/resources/AddedResourcesSummary.java @@ -7,7 +7,7 @@ import org.gcube.portlets.widgets.mpformbuilder.client.events.AddResourceEvent; import org.gcube.portlets.widgets.mpformbuilder.client.events.AddResourceEventHandler; import org.gcube.portlets.widgets.mpformbuilder.client.events.DeleteResourceEvent; import org.gcube.portlets.widgets.mpformbuilder.client.events.DeleteResourceEventHandler; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.github.gwtbootstrap.client.ui.Accordion; import com.github.gwtbootstrap.client.ui.AccordionGroup; @@ -40,7 +40,7 @@ public class AddedResourcesSummary extends Composite{ private HandlerManager eventBus; // list of added resources (beans) - List addedResources; + List addedResources; @UiField VerticalPanel addResourcesPanel; @@ -54,7 +54,7 @@ public class AddedResourcesSummary extends Composite{ bind(); // init list - addedResources = new ArrayList(); + addedResources = new ArrayList(); } /** @@ -69,7 +69,7 @@ public class AddedResourcesSummary extends Composite{ public void onAddedResource(AddResourceEvent addResourceEvent) { // get the resource - final ResourceElementBean justAddedResource = addResourceEvent.getResource(); + final ResourceElementBeanProfile justAddedResource = addResourceEvent.getResource(); // Build an accordion to show resource info Accordion accordion = new Accordion(); @@ -116,7 +116,7 @@ public class AddedResourcesSummary extends Composite{ public void onDeletedResource(DeleteResourceEvent deleteResourceEvent) { // to delete - ResourceElementBean toDelete = deleteResourceEvent.getResource(); + ResourceElementBeanProfile toDelete = deleteResourceEvent.getResource(); diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellLeft.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellLeft.java index d954816..146de09 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellLeft.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellLeft.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.mpformbuilder.client.ui.twincolumnselection; import org.gcube.portlets.widgets.mpformbuilder.client.ui.icons.Images; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.core.client.GWT; @@ -11,14 +11,14 @@ import com.google.gwt.user.client.ui.Image; * Cell that renders left side panel objects * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ -public class ResourceCellLeft extends AbstractCell{ +public class ResourceCellLeft extends AbstractCell{ private static final Images image = GWT.create(Images.class); private static final String tipFile = "Hold down the Control (ctrl) or Command button to select multiple options"; private static final String tipFolder = "Click on the folder to navigate it"; @Override public void render(com.google.gwt.cell.client.Cell.Context context, - ResourceElementBean value, SafeHtmlBuilder sb) { + ResourceElementBeanProfile value, SafeHtmlBuilder sb) { if (value == null || value.isToBeAdded()) { return; diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellRight.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellRight.java index 84aab96..407fbf1 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellRight.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceCellRight.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.mpformbuilder.client.ui.twincolumnselection; import org.gcube.portlets.widgets.mpformbuilder.client.ui.icons.Images; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ValueUpdater; @@ -15,7 +15,7 @@ import com.google.gwt.user.client.ui.Image; * Cell that renders right side panel objects * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ -public class ResourceCellRight extends AbstractCell{ +public class ResourceCellRight extends AbstractCell{ private static final Images image = GWT.create(Images.class); private static final String tip = "Hold down the Control (CTRL) or Command button to select multiple options. Double click to access " @@ -27,7 +27,7 @@ public class ResourceCellRight extends AbstractCell{ @Override public void render(com.google.gwt.cell.client.Cell.Context context, - ResourceElementBean value, SafeHtmlBuilder sb) { + ResourceElementBeanProfile value, SafeHtmlBuilder sb) { if (value == null || !value.isToBeAdded() || value.isFolder()) { return; @@ -51,8 +51,8 @@ public class ResourceCellRight extends AbstractCell{ @Override public void onBrowserEvent(com.google.gwt.cell.client.Cell.Context context, - Element parent, ResourceElementBean value, NativeEvent event, - ValueUpdater valueUpdater) { + Element parent, ResourceElementBeanProfile value, NativeEvent event, + ValueUpdater valueUpdater) { if(value == null || TwinColumnSelectionMainPanel.isFroozen()) return; super.onBrowserEvent(context, parent, value, event, valueUpdater); diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceInfoForm.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceInfoForm.java index fabb27d..4b41426 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceInfoForm.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/ResourceInfoForm.java @@ -1,6 +1,6 @@ package org.gcube.portlets.widgets.mpformbuilder.client.ui.twincolumnselection; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.github.gwtbootstrap.client.ui.Button; import com.github.gwtbootstrap.client.ui.ControlGroup; @@ -44,7 +44,7 @@ public class ResourceInfoForm extends Composite{ @UiField ControlGroup controlName; - private ResourceElementBean resourceBean; + private ResourceElementBeanProfile resourceBean; private static ResourceInfoFormUiBinder uiBinder = GWT .create(ResourceInfoFormUiBinder.class); @@ -57,7 +57,7 @@ public class ResourceInfoForm extends Composite{ initWidget(uiBinder.createAndBindUi(this)); } - public ResourceInfoForm(final ResourceElementBean resource, final ValueUpdater valueUpdater) { + public ResourceInfoForm(final ResourceElementBeanProfile resource, final ValueUpdater valueUpdater) { initWidget(uiBinder.createAndBindUi(this)); resourceBean = resource; diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/TwinColumnSelectionMainPanel.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/TwinColumnSelectionMainPanel.java index 09b3800..4b68fd5 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/TwinColumnSelectionMainPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/client/ui/twincolumnselection/TwinColumnSelectionMainPanel.java @@ -7,7 +7,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBean; +import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.ResourceElementBeanProfile; import com.github.gwtbootstrap.client.ui.Breadcrumbs; import com.github.gwtbootstrap.client.ui.Button; @@ -72,9 +72,9 @@ public class TwinColumnSelectionMainPanel extends Composite{ */ private class PathBean{ NavLink link; - ResourceElementBean resourceFolder; + ResourceElementBeanProfile resourceFolder; - PathBean(NavLink link, ResourceElementBean resourceFolder){ + PathBean(NavLink link, ResourceElementBeanProfile resourceFolder){ this.link = link; this.resourceFolder = resourceFolder; } @@ -86,13 +86,13 @@ public class TwinColumnSelectionMainPanel extends Composite{ private static final String PANEL_HEIGHT = "400px"; private ShowMorePagerPanel showMorePanelLeft = new ShowMorePagerPanel(); private ShowMorePagerPanel showMorePanelRight = new ShowMorePagerPanel(); - private CellList cellListLeft; - private CellList cellListRight; - private ListDataProvider dataProviderLeft = new ListDataProvider(); - private ListDataProvider dataProviderRight = new ListDataProvider(); - private MultiSelectionModel selectionModelRight; - private MultiSelectionModel selectionModelLeft; - private final ResourceElementBean initialBean; + private CellList cellListLeft; + private CellList cellListRight; + private ListDataProvider dataProviderLeft = new ListDataProvider(); + private ListDataProvider dataProviderRight = new ListDataProvider(); + private MultiSelectionModel selectionModelRight; + private MultiSelectionModel selectionModelLeft; + private final ResourceElementBeanProfile initialBean; // private final static HTML aboutHeader = new HTML("Resource Manager"); // private final static HTML aboutBody = new HTML("

Move the files you want to attach to the product on the right panel below." // + " Please consider that any complex hierarchy structure you may have will be flatten.

"); @@ -106,7 +106,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ UiBinder { } - public TwinColumnSelectionMainPanel(ResourceElementBean initialBean) { + public TwinColumnSelectionMainPanel(ResourceElementBeanProfile initialBean) { initWidget(uiBinder.createAndBindUi(this)); frozen = false; @@ -143,13 +143,13 @@ public class TwinColumnSelectionMainPanel extends Composite{ /** * Initialize the left side panel */ - private void initLeftSidePanel(final ResourceElementBean initialBean) { + private void initLeftSidePanel(final ResourceElementBeanProfile initialBean) { // initialize the left side list ResourceCellLeft cell = new ResourceCellLeft(); // Set a key provider that provides a unique key for each object. - cellListLeft = new CellList(cell, ResourceElementBean.KEY_PROVIDER); + cellListLeft = new CellList(cell, ResourceElementBeanProfile.KEY_PROVIDER); cellListLeft.setKeyboardPagingPolicy(KeyboardPagingPolicy.INCREASE_RANGE); // set page size @@ -157,7 +157,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ cellListLeft.setPageSize(size); // Add a selection model so we can select cells. - selectionModelLeft = new MultiSelectionModel(ResourceElementBean.KEY_PROVIDER); + selectionModelLeft = new MultiSelectionModel(ResourceElementBeanProfile.KEY_PROVIDER); cellListLeft.setSelectionModel(selectionModelLeft); // perform an action on selection @@ -168,10 +168,10 @@ public class TwinColumnSelectionMainPanel extends Composite{ if(frozen) return; - Iterator selectedObjectsIterator = selectionModelLeft.getSelectedSet().iterator(); + Iterator selectedObjectsIterator = selectionModelLeft.getSelectedSet().iterator(); while (selectedObjectsIterator.hasNext()) { - ResourceElementBean selectedBean = selectedObjectsIterator.next(); + ResourceElementBeanProfile selectedBean = selectedObjectsIterator.next(); if(selectedBean.isFolder()){ // a single folder selected @@ -190,7 +190,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ removeStartingFromBreadcrumbs(navElem, pathBean); GWT.log("Clicked on element " + pathBean.resourceFolder.getName()); //breadcrumbsUpdater(); - ResourceElementBean folder = pathBean.resourceFolder; + ResourceElementBeanProfile folder = pathBean.resourceFolder; Collections.sort(folder.getChildren()); dataProviderLeft.setList(folder.getChildren()); dataProviderLeft.refresh(); @@ -306,12 +306,12 @@ public class TwinColumnSelectionMainPanel extends Composite{ ResourceCellRight cell = new ResourceCellRight(); // Set a key provider that provides a unique key for each object. - cellListRight = new CellList(cell, ResourceElementBean.KEY_PROVIDER); + cellListRight = new CellList(cell, ResourceElementBeanProfile.KEY_PROVIDER); cellListRight.setKeyboardPagingPolicy(KeyboardPagingPolicy.INCREASE_RANGE); - cellListRight.setValueUpdater(new ValueUpdater() { + cellListRight.setValueUpdater(new ValueUpdater() { @Override - public void update(ResourceElementBean value) { + public void update(ResourceElementBeanProfile value) { // just redraw the list cellListRight.redraw(); @@ -320,7 +320,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ }); // Add a selection model so we can select cells. - selectionModelRight = new MultiSelectionModel(ResourceElementBean.KEY_PROVIDER); + selectionModelRight = new MultiSelectionModel(ResourceElementBeanProfile.KEY_PROVIDER); cellListRight.setSelectionModel(selectionModelRight); // perform an action on selection @@ -353,7 +353,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ * Enable/disable the buttons to move objects from left to right properly. * @param setselectedItemsLeft */ - private void enableMoveToRightButtons(Set setselectedItemsLeft){ + private void enableMoveToRightButtons(Set setselectedItemsLeft){ if(setselectedItemsLeft == null || setselectedItemsLeft.isEmpty()){ allToRightButton.setEnabled(false); @@ -373,7 +373,7 @@ public class TwinColumnSelectionMainPanel extends Composite{ * Enable/disable the buttons to move objects from right to left properly. * @param setselectedItemsRight */ - private void enableMoveToLeftButtons(Set setselectedItemsRight){ + private void enableMoveToLeftButtons(Set setselectedItemsRight){ if(setselectedItemsRight == null || setselectedItemsRight.isEmpty()){ allToLeftButton.setEnabled(false); @@ -427,14 +427,14 @@ public class TwinColumnSelectionMainPanel extends Composite{ * Move to right elements * @param set the elements to move */ - private void moveToRight(Set setSelected){ + private void moveToRight(Set setSelected){ if(setSelected == null || setSelected.isEmpty()) return; - Iterator iterator = setSelected.iterator(); + Iterator iterator = setSelected.iterator(); while (iterator.hasNext()) { - ResourceElementBean resourceElementBean = iterator + ResourceElementBeanProfile resourceElementBean = iterator .next(); resourceElementBean.setToBeAdded(true); @@ -456,14 +456,14 @@ public class TwinColumnSelectionMainPanel extends Composite{ * Move to left elements * @param setSelected the elements to move */ - private void moveToLeft(Set setSelected){ + private void moveToLeft(Set setSelected){ if(setSelected == null || setSelected.isEmpty()) return; - Iterator iterator = setSelected.iterator(); + Iterator iterator = setSelected.iterator(); while (iterator.hasNext()) { - ResourceElementBean resourceElementBean = iterator.next(); + ResourceElementBeanProfile resourceElementBean = iterator.next(); resourceElementBean.setToBeAdded(false); } @@ -496,16 +496,16 @@ public class TwinColumnSelectionMainPanel extends Composite{ * Returns the root parent with the children as files to save * @return the resources to save */ - public ResourceElementBean getResourcesToPublish(){ + public ResourceElementBeanProfile getResourcesToPublish(){ - List current = dataProviderRight.getList(); + List current = dataProviderRight.getList(); - ResourceElementBean toReturn = new ResourceElementBean(); - List children = new ArrayList(); + ResourceElementBeanProfile toReturn = new ResourceElementBeanProfile(); + List children = new ArrayList(); - for (ResourceElementBean resource : current) { + for (ResourceElementBeanProfile resource : current) { if(resource.isToBeAdded() && !resource.isFolder()){ // be sure ... - ResourceElementBean beanWithoutChildren = new ResourceElementBean(resource); + ResourceElementBeanProfile beanWithoutChildren = new ResourceElementBeanProfile(resource); beanWithoutChildren.setName(resource.getEditableName()); children.add(beanWithoutChildren); } diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/DatasetBean.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/DatasetBean.java index 8f27e03..02b8b12 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/DatasetBean.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/DatasetBean.java @@ -29,14 +29,14 @@ // private String selectedOrganization; // private long version; // version 1, 2 ... // private boolean visible; // Private (false) or Public(true) -// private List organizationList; // list of organization in which the user is present and could create the dataset -// private ResourceElementBean resourceRoot; // in case of workspace, this is the directory root or the single file information +// private List organizationList; // list of organization in which the user is present and could create the dataset +// private ResourceElementBeanProfile resourceRoot; // in case of workspace, this is the directory root or the single file information // private List metadataList; // private List tags; // on retrieve, they are the keys of the product // private List tagsVocabulary; // when available // private Map> customFields; -// private List groups; -// private List groupsForceCreation; +// private List groups; +// private List groupsForceCreation; // // public DatasetBean(){ // super(); @@ -68,9 +68,9 @@ // String license, boolean visible, String source, long version, // String authorName, String authorSurname, String authorEmail, String maintainer, // String maintainerEmail, String ownerIdentifier, -// List organizationList, String selectedOrganization, -// ResourceElementBean resourceRoot, -// List metadataList, List groups, List tagsVocabulary) { +// List organizationList, String selectedOrganization, +// ResourceElementBeanProfile resourceRoot, +// List metadataList, List groups, List tagsVocabulary) { // super(); // this.id = id; // this.title = title; @@ -231,11 +231,11 @@ // this.maintainerEmail = maintainerEmail; // } // -// public List getOrganizationList() { +// public List getOrganizationList() { // return organizationList; // } // -// public void setOrganizationList(List organizationList) { +// public void setOrganizationList(List organizationList) { // this.organizationList = organizationList; // } // @@ -247,11 +247,11 @@ // this.selectedOrganization = selectedOrganization; // } // -// public ResourceElementBean getResourceRoot() { +// public ResourceElementBeanProfile getResourceRoot() { // return resourceRoot; // } // -// public void setResourceRoot(ResourceElementBean resourceRoot) { +// public void setResourceRoot(ResourceElementBeanProfile resourceRoot) { // this.resourceRoot = resourceRoot; // } // @@ -263,11 +263,11 @@ // this.authorFullName = authorFullName; // } // -// public List getGroups() { +// public List getGroups() { // return groups; // } // -// public void setGroups(List groups) { +// public void setGroups(List groups) { // this.groups = groups; // } // @@ -279,11 +279,11 @@ // this.tagsVocabulary = tagsVocabulary; // } // -// public List getGroupsForceCreation() { +// public List getGroupsForceCreation() { // return groupsForceCreation; // } // -// public void setGroupsForceCreation(List groupsForceCreation) { +// public void setGroupsForceCreation(List groupsForceCreation) { // this.groupsForceCreation = groupsForceCreation; // } // diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBean.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBeanProfile.java similarity index 80% rename from src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBean.java rename to src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBeanProfile.java index 3b4fd82..0ea3f25 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBean.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/OrganizationBeanProfile.java @@ -6,7 +6,7 @@ import java.io.Serializable; * A ckan organization/group (you can check its nature by looking at getIsOrganization();) like bean with name and title * @author Costantino Perciante (costantino.perciante@isti.cnr.it) */ -public class OrganizationBean implements Serializable{ +public class OrganizationBeanProfile implements Serializable{ private static final long serialVersionUID = -6566519399945530602L; private String title; @@ -14,18 +14,18 @@ public class OrganizationBean implements Serializable{ private boolean isOrganization; private boolean propagateUp; // an item linked to this group has to be added on the whole hierarchy chain - public OrganizationBean(){ + public OrganizationBeanProfile(){ super(); } - public OrganizationBean(String title, String name, boolean isOrganization) { + public OrganizationBeanProfile(String title, String name, boolean isOrganization) { super(); this.title = title; this.name = name; this.isOrganization = isOrganization; } - public OrganizationBean(String title, String name, boolean isOrganization, boolean propagateUp) { + public OrganizationBeanProfile(String title, String name, boolean isOrganization, boolean propagateUp) { super(); this.title = title; this.name = name; @@ -67,7 +67,7 @@ public class OrganizationBean implements Serializable{ @Override public String toString() { - return "OrganizationBean [title=" + title + ", name=" + name + return "OrganizationBeanProfile [title=" + title + ", name=" + name + ", isOrganization=" + isOrganization + ", propagateUp=" + propagateUp + "]"; } diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBean.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBeanProfile.java similarity index 79% rename from src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBean.java rename to src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBeanProfile.java index a40972e..a791ff4 100644 --- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBean.java +++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/catalogue/ResourceElementBeanProfile.java @@ -10,7 +10,7 @@ import com.google.gwt.view.client.ProvidesKey; * A resource element bean. Contains part of the logic used into the TwinColumn widget * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ -public class ResourceElementBean implements Comparable, Serializable{ +public class ResourceElementBeanProfile implements Comparable, Serializable{ private static final long serialVersionUID = -1230871392599580669L; private String name; @@ -23,8 +23,8 @@ public class ResourceElementBean implements Comparable, Ser private String url; private String description; private String organizationNameDatasetParent; // the organization name in which the parent dataset was created - private ResourceElementBean parent; - private List children; + private ResourceElementBeanProfile parent; + private List children; // to generate the GWT identifiers private static int nextId = 0; @@ -35,9 +35,9 @@ public class ResourceElementBean implements Comparable, Ser /** * The key provider that provides the unique ID of a bean. */ - public static final ProvidesKey KEY_PROVIDER = new ProvidesKey() { + public static final ProvidesKey KEY_PROVIDER = new ProvidesKey() { @Override - public Object getKey(ResourceElementBean item) { + public Object getKey(ResourceElementBeanProfile item) { return item == null ? null : item.identifierGWT; } }; @@ -46,7 +46,7 @@ public class ResourceElementBean implements Comparable, Ser * Copy constructor * @param another */ - public ResourceElementBean(ResourceElementBean another) { + public ResourceElementBeanProfile(ResourceElementBeanProfile another) { this.name = another.name; this.toBeAdded = another.toBeAdded; this.fullPath = another.fullPath; @@ -61,7 +61,7 @@ public class ResourceElementBean implements Comparable, Ser /** * Default constructor */ - public ResourceElementBean(){ + public ResourceElementBeanProfile(){ super(); this.identifierGWT = nextId; nextId++; @@ -74,11 +74,11 @@ public class ResourceElementBean implements Comparable, Ser * @param movedToRight * @param isFolder */ - public ResourceElementBean( - ResourceElementBean parent, + public ResourceElementBeanProfile( + ResourceElementBeanProfile parent, String name, boolean isFolder, - List children, + List children, String fullPath) { this.identifierGWT = nextId; nextId++; @@ -102,9 +102,9 @@ public class ResourceElementBean implements Comparable, Ser * @param description * @param organizationNameDatasetParent */ - public ResourceElementBean(String name, boolean toBeAdded, - boolean isFolder, ResourceElementBean parent, - List children, String fullPath, + public ResourceElementBeanProfile(String name, boolean toBeAdded, + boolean isFolder, ResourceElementBeanProfile parent, + List children, String fullPath, String originalIdInWorkspace, String mimeType, String url, String description, String organizationNameDatasetParent) { super(); @@ -123,11 +123,11 @@ public class ResourceElementBean implements Comparable, Ser this.organizationNameDatasetParent = organizationNameDatasetParent; } - public ResourceElementBean getParent() { + public ResourceElementBeanProfile getParent() { return parent; } - public void setParent(ResourceElementBean parent) { + public void setParent(ResourceElementBeanProfile parent) { this.parent = parent; } @@ -188,11 +188,11 @@ public class ResourceElementBean implements Comparable, Ser this.isFolder = isFolder; } - public List getChildren() { + public List getChildren() { return children; } - public void setChildren(List children) { + public void setChildren(List children) { this.children = children; } @@ -223,22 +223,22 @@ public class ResourceElementBean implements Comparable, Ser @Override public boolean equals(Object o) { boolean toReturn = false; - if (o instanceof ResourceElementBean) { - toReturn = identifierGWT == ((ResourceElementBean) o).identifierGWT; + if (o instanceof ResourceElementBeanProfile) { + toReturn = identifierGWT == ((ResourceElementBeanProfile) o).identifierGWT; } return toReturn; } @Override - public int compareTo(ResourceElementBean o) { + public int compareTo(ResourceElementBeanProfile o) { int toReturn = (o == null || o.fullPath == null) ? -1 : -o.fullPath.compareTo(fullPath); return toReturn; } @Override public String toString() { - return "ResourceElementBean [identifierGWT=" + identifierGWT + return "ResourceElementBeanProfile [identifierGWT=" + identifierGWT + ", name=" + name + ", editableName=" + editableName + ", toBeAdded=" + toBeAdded + ", isFolder=" + isFolder + ", fullPath=" + fullPath + ", originalIdInWorkspace="