From 406bb94f8af6d41bce0a01f5b9717d28c4046949 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 9 Nov 2020 11:12:54 +0100 Subject: [PATCH] merged with trunk --- .classpath | 2 +- .settings/com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 3 --- .../geoportaldataentry/client/GeoPortalDataEntryApp.java | 6 ++---- .../client/ui/GeonaDataEntryMainForm.java | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.classpath b/.classpath index ce272c8..9de8301 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index 3f6f7f3..c875387 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/francesco/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.1-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 4ec8b3e..d895209 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -77,9 +77,6 @@ - - uses - diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 93aaee5..a960a8e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -234,10 +234,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onSuccess(CommitReport result) { - try { - modal.remove(loader); - }catch (Exception e) { - } + modalContainerPanel.clear(); + modal.setCloseVisible(true); Alert alert = new Alert(result.getMsg()); switch (result.getState()) { case OK: diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaDataEntryMainForm.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaDataEntryMainForm.java index 986f2e9..43427af 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaDataEntryMainForm.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaDataEntryMainForm.java @@ -133,7 +133,7 @@ public class GeonaDataEntryMainForm extends Composite { } - private void showAlertOnSaveAction(String text, AlertType type, boolean hideAfterAWhile){ + public void showAlertOnSaveAction(String text, AlertType type, boolean hideAfterAWhile){ //Window.alert("Called alertOnCreate"); alertFormAction.setText(text);