diff --git a/.classpath b/.classpath index e0d3a4a..edad874 100644 --- a/.classpath +++ b/.classpath @@ -20,7 +20,6 @@ - @@ -28,7 +27,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6b5aebc..b90405e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate diff --git a/pom.xml b/pom.xml index 132a738..9be8fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -234,5 +234,4 @@ - war diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/GRSFManageWidget.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/GRSFManageWidget.java index 2d1728f..634a71f 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/GRSFManageWidget.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/GRSFManageWidget.java @@ -1,10 +1,6 @@ package org.gcube.datacatalogue.grsf_manage_widget.client; -import org.gcube.datacatalogue.grsf_manage_widget.client.view.ManageProductWidget; - import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.event.shared.HandlerManager; -import com.google.gwt.user.client.ui.RootPanel; /** * Entry point classes define onModuleLoad(). @@ -15,7 +11,7 @@ public class GRSFManageWidget implements EntryPoint { * This is the entry point method. */ public void onModuleLoad(){ - HandlerManager eventBus = new HandlerManager(null); - RootPanel.get("manageDiv").add(new ManageProductWidget("fffb6167-b570-42a8-92b9-5be28549c3b8", eventBus)); + //HandlerManager eventBus = new HandlerManager(null); + //RootPanel.get("manageDiv").add(new ManageProductWidget("fffb6167-b570-42a8-92b9-5be28549c3b8", eventBus)); } } diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java index 7f75a01..89b84a1 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java @@ -197,9 +197,10 @@ public class ManageProductWidget extends Composite{ loadingImage.setVisible(false); // ask to hide management panel - if(eventBus != null) + if(eventBus != null){ eventBus.fireEvent(new HideManagementPanelEvent()); - + GWT.log("Hide management panel event sent"); + } }else{ service.getProductBeanById(productIdentifier, new AsyncCallback() { diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/GRSFNotificationService.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/GRSFNotificationService.java index 006551d..8f784ef 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/GRSFNotificationService.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/GRSFNotificationService.java @@ -69,7 +69,7 @@ public class GRSFNotificationService extends RemoteServiceServlet implements GRS ManageProductBean toReturn = null; - + if(!Utils.isIntoPortal()){ toReturn = new ManageProductBean(); diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/Utils.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/Utils.java index 71f6b4b..0554723 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/Utils.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/server/manage/Utils.java @@ -336,16 +336,11 @@ public class Utils { throw new IllegalArgumentException( "Update failed for the following reason " + parsedJSON.get(Constants.ERROR_MESSAGE)); - // patch the catalogue product (no longer needed) - // return patchProduct(catalogue, bean, username); - }catch(Exception e){ - logger.error("Unable to update this Item " + e.getMessage()); + logger.error("Unable to update this Item " + e); throw e; } - return null; - } /**