From 2ea8dee4744816dc6253b93b7cd10e345092c249 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 15 Jun 2021 16:52:27 +0200 Subject: [PATCH] reverted to gwt 2.7 --- pom.xml | 4 +- .../client/CkanContentModeratorWidget.java | 107 ++++++++++++++---- .../ui/ContentModeratorSystemPanel.java | 20 ++++ .../client/ui/table/ItemsTable.java | 2 +- .../CkanContentModeratorServiceImpl.java | 5 +- 5 files changed, 111 insertions(+), 27 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/ContentModeratorSystemPanel.java diff --git a/pom.xml b/pom.xml index 155b122..ca88d0d 100644 --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,11 @@ - 2.8.2 + 2.7.0 distro UTF-8 UTF-8 - 1.8 + 1.7 1.8 ${project.build.directory}/${project.build.finalName} 2.4.0 diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java index 73188d4..6550472 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java @@ -3,44 +3,107 @@ package org.gcube.portlets.widgets.ckancontentmoderator.client; import java.util.List; import org.gcube.datacatalogue.utillibrary.shared.ItemStatus; +import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.ContentModeratorSystemPanel; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.table.ItemsTable; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.table.ItemsTable.DISPLAY_FIELD; import org.gcube.portlets.widgets.ckancontentmoderator.shared.CatalogueDataset; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.Command; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.view.client.ListDataProvider; /** - * Entry point classes define onModuleLoad(). + * The Class CkanContentModeratorWidget. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * Jun 15, 2021 */ public class CkanContentModeratorWidget { - public final CkanContentModeratorServiceAsync contentModeratorService = GWT.create(CkanContentModeratorService.class); - - ItemsTable itemsTable; - - CkanContentModeratorWidget(DISPLAY_FIELD[] displayFields, DISPLAY_FIELD sortByField){ + public final CkanContentModeratorServiceAsync contentModeratorService = GWT + .create(CkanContentModeratorService.class); + + private ItemsTable itemsTable; + private ContentModeratorSystemPanel cmsPanel = new ContentModeratorSystemPanel(); + private Boolean isContentModeratorEnabled = null; + + /** + * Instantiates a new ckan content moderator widget. + * + * @param displayFields the display fields + * @param sortByField the sort by field + */ + public CkanContentModeratorWidget(DISPLAY_FIELD[] displayFields, DISPLAY_FIELD sortByField) { itemsTable = new ItemsTable(null, displayFields, sortByField); + itemsTable.initTable(null, null, new ListDataProvider()); + cmsPanel.add(itemsTable.getCellTable()); } - - - public void loadItemsForStatus(ItemStatus status){ - - - contentModeratorService.getListItemsForStatus(status, ContentModeratorWidgetConstants.ITEMS_PER_PAGE, ContentModeratorWidgetConstants.ITEM_START_INDEX, new AsyncCallback>() { - - @Override - public void onSuccess(List result) { - itemsTable.updateItems(result, true); - - } - + + /** + * Load items for status. + * + * @param status the status + * @throws Exception the exception + */ + public void loadItemsForStatus(ItemStatus status) throws Exception { + + if (isContentModeratorEnabled == null) + throw new Exception("Please, first check if the content moderator is enabled in this context"); + + if (!isContentModeratorEnabled) + throw new Exception("Content Moderator is not enabled in this context"); + + contentModeratorService.getListItemsForStatus(status, ContentModeratorWidgetConstants.ITEMS_PER_PAGE, + ContentModeratorWidgetConstants.ITEM_START_INDEX, new AsyncCallback>() { + + @Override + public void onSuccess(List result) { + itemsTable.updateItems(result, true); + + } + + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + + } + }); + + } + + /** + * Checks if is content moderator enabled. + * + * @param onCompletation the on completation + */ + public void isContentModeratorEnabled(final Command onCompletation) { + + contentModeratorService.isContentModeratorEnabled(new AsyncCallback() { + @Override public void onFailure(Throwable caught) { - // TODO Auto-generated method stub - + onCompletation.execute(); + + } + + @Override + public void onSuccess(Boolean result) { + isContentModeratorEnabled = result; + onCompletation.execute(); + } }); - + + } + + public ItemsTable getItemsTable() { + return itemsTable; + } + + public ScrollPanel getPanel(){ + return cmsPanel; } } diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/ContentModeratorSystemPanel.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/ContentModeratorSystemPanel.java new file mode 100644 index 0000000..ac8fa9f --- /dev/null +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/ContentModeratorSystemPanel.java @@ -0,0 +1,20 @@ +package org.gcube.portlets.widgets.ckancontentmoderator.client.ui; + +import com.google.gwt.user.client.ui.ScrollPanel; + + +/** + * The Class ContentModeratorSystemPanel. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * Jun 15, 2021 + */ +public class ContentModeratorSystemPanel extends ScrollPanel { + + + + public ContentModeratorSystemPanel(){ + + } +} diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java index b46799d..41194da 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java @@ -33,7 +33,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.view.client.AbstractDataProvider; import com.google.gwt.view.client.ListDataProvider; -// TODO: Auto-generated Javadoc + /** * The Class ItemsTable. * diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceImpl.java index ff9758f..a17d7fb 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceImpl.java @@ -26,8 +26,9 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem @Override public boolean isContentModeratorEnabled() { - // TODO Auto-generated method stub - return false; + LOG.info("called isContentModeratorEnabled"); + LOG.warn("isContentModeratorEnabled METHOD MUST BE IMPLEMENTED!!!"); + return true; } @Override