diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5fe3680..336593c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
+
+ uses
+
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
index 1a49579..0148911 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
@@ -71,107 +71,107 @@ public class CkanEventHandlerManager {
// bind on insert metadata
eventBus.addHandler(InsertMetadataEvent.TYPE, new InsertMetadataEventHandler() {
- @Override
- public void onInsertMetadata(
+ @Override
+ public void onInsertMetadata(
InsertMetadataEvent loadSelecteReleaseEvent) {
- final Modal modal = new Modal(true, true);
- // request who's doing the insert
- GCubeCkanDataCatalog.service.getUser(new AsyncCallback() {
+ final Modal modal = new Modal(true, true);
+ // request who's doing the insert
+ GCubeCkanDataCatalog.service.getUser(new AsyncCallback() {
- @Override
- public void onSuccess(String username) {
+ @Override
+ public void onSuccess(String username) {
- if (username != null) {
- modal.setTitle("Publish Product");
- modal.addStyleName("insert-metadata-modal-style");
- modal.add(new CreateDatasetForm(username, eventBus));
- modal.setCloseVisible(true);
- modal.show();
-
- // hide any popup panel opened
- modal.addHideHandler(new HideHandler() {
-
- @Override
- public void onHide(HideEvent hideEvent) {
- eventBus.fireEvent(new CloseCreationFormEvent());
- }
- });
- }
- else
- Window.alert("Please, logout and login again then retry.");
+ if (username != null) {
+ modal.setTitle("Publish Product");
+ modal.addStyleName("insert-metadata-modal-style");
+ modal.add(new CreateDatasetForm(username, eventBus));
+ modal.setCloseVisible(true);
+ modal.show();
+
+ // hide any popup panel opened
+ modal.addHideHandler(new HideHandler() {
+
+ @Override
+ public void onHide(HideEvent hideEvent) {
+ eventBus.fireEvent(new CloseCreationFormEvent());
+ }
+ });
}
-
- @Override
- public void onFailure(Throwable caught) {
-
+ else
Window.alert("Please, logout and login again then retry.");
- }
- });
- }
- });
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+
+ Window.alert("Please, logout and login again then retry.");
+ }
+ });
+ }
+ });
// bind on edit (TODO)
eventBus.addHandler(
- EditMetadataEvent.TYPE, new EditMetadataEventHandler() {
+ EditMetadataEvent.TYPE, new EditMetadataEventHandler() {
- @Override
- public void onEditMetadata(EditMetadataEvent editMetadataEvent) {
+ @Override
+ public void onEditMetadata(EditMetadataEvent editMetadataEvent) {
- // TODO Auto-generated method stub
- }
- });
+ // TODO Auto-generated method stub
+ }
+ });
// show datasets event
eventBus.addHandler(
- ShowUserDatasetsEvent.TYPE, new ShowUserDatasetsEventHandler() {
+ ShowUserDatasetsEvent.TYPE, new ShowUserDatasetsEventHandler() {
- @Override
- public void onShowDatasets(
- ShowUserDatasetsEvent showUserDatasetsEvent) {
- String request = getCkanRequest("/dashboard/datasets", null);
- panel.instanceCkanFrame(request);
- }
- });
+ @Override
+ public void onShowDatasets(
+ ShowUserDatasetsEvent showUserDatasetsEvent) {
+ String request = getCkanRequest("/dashboard/datasets", null);
+ panel.instanceCkanFrame(request);
+ }
+ });
eventBus.addHandler(
- ShowUserOrganizationsEvent.TYPE,
- new ShowUserOrganizationsEventHandler() {
+ ShowUserOrganizationsEvent.TYPE,
+ new ShowUserOrganizationsEventHandler() {
- @Override
- public void onShowOrganizations(
- ShowUserOrganizationsEvent showUserDatasetsEvent) {
+ @Override
+ public void onShowOrganizations(
+ ShowUserOrganizationsEvent showUserDatasetsEvent) {
- panel.showOrganizations();
+ panel.showOrganizations();
- }
- });
+ }
+ });
eventBus.addHandler(
- ShowUserGroupsEvent.TYPE, new ShowUserGroupsEventHandler() {
+ ShowUserGroupsEvent.TYPE, new ShowUserGroupsEventHandler() {
- @Override
- public void onShowGroups(ShowUserGroupsEvent showUserDatasetsEvent) {
- String request = getCkanRequest("/dashboard/groups", null);
- panel.instanceCkanFrame(request);
- }
- });
+ @Override
+ public void onShowGroups(ShowUserGroupsEvent showUserDatasetsEvent) {
+ String request = getCkanRequest("/dashboard/groups", null);
+ panel.instanceCkanFrame(request);
+ }
+ });
// show statistics event
eventBus.addHandler(
- ShowStatisticsEvent.TYPE, new ShowStatisticsEventHandler() {
+ ShowStatisticsEvent.TYPE, new ShowStatisticsEventHandler() {
- @Override
- public void onShowStatistics(
- ShowStatisticsEvent showStatisticsEvent) {
- String request = getCkanRequest("/stats", null);
- panel.instanceCkanFrame(request);
- }
- });
+ @Override
+ public void onShowStatistics(
+ ShowStatisticsEvent showStatisticsEvent) {
+ String request = getCkanRequest("/stats", null);
+ panel.instanceCkanFrame(request);
+ }
+ });
eventBus.addHandler(NotifyLogoutEvent.TYPE, new NotifyLogoutEventHandler() {
@Override
public void onLogout(NotifyLogoutEvent editMetadataEvent) {
-// CKanLeaveFrame frame = new CKanLeaveFrame(GCubeCkanDataCatalog.CKAN_LOGUT_SERVICE);
-// DOM.appendChild(RootPanel.getBodyElement(), frame.getElement());
+ // CKanLeaveFrame frame = new CKanLeaveFrame(GCubeCkanDataCatalog.CKAN_LOGUT_SERVICE);
+ // DOM.appendChild(RootPanel.getBodyElement(), frame.getElement());
}
});
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java
index 63d95af..0f2bbc3 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java
@@ -19,7 +19,7 @@ public interface GcubeCkanDataCatalogService extends RemoteService {
CkanConnectorAccessPoint getCKanConnector(
- String pathInfoParameters, String queryStringParameters) throws Exception;
+ String pathInfoParameters, String queryStringParameters, String currentUrl) throws Exception;
CkanRole getMyRole() throws Exception;
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java
index 789a3c7..a7e1d55 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java
@@ -19,30 +19,21 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
*/
public interface GcubeCkanDataCatalogServiceAsync {
-
void getMyRole(AsyncCallback callback);
-
void getUser(AsyncCallback callback);
void getCKanConnector(
- String pathInfoParameters, String queryStringParameters,
+ String pathInfoParameters, String queryStringParameters, String currentUrl,
AsyncCallback callback);
-
-
- /**
- *
- */
+
void logoutFromCkan(AsyncCallback callback);
-
void logoutURIFromCkan(AsyncCallback callback);
-
void getCkanOrganizationsNamesAndUrlsForUser(
AsyncCallback