diff --git a/pom.xml b/pom.xml
index 4d8522e..f3feff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,14 @@
config
- 2.5.1
+
+
+
+ 2.6.1
+ 3.3.2
+ 3.1.1
${env.KEYS}
@@ -76,10 +83,12 @@
com.google.gwt
gwt-servlet
+ ${gwtVersion}
com.google.gwt
gwt-user
+ ${gwtVersion}
@@ -105,7 +114,7 @@
com.sencha.gxt
gxt
- 3.0.1
+ ${gxtVersion}
@@ -148,7 +157,7 @@
com.allen-sauer.gwt.log
gwt-log
- 3.2.1
+ ${gwtLogVersion}
provided
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
index 6ab8852..611bb45 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
@@ -16,16 +16,17 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
+import com.sencha.gxt.widget.core.client.event.DialogHideEvent;
+import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler;
import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
/**
*
- * @author giancarlo
- * email: g.panichi@isti.cnr.it
+ * @author giancarlo email: g.panichi@isti.cnr.it
*
*/
public class TabResourcesSelectionCard extends WizardCard {
@@ -131,19 +132,42 @@ public class TabResourcesSelectionCard extends WizardCard {
protected void deleteTRWithLastTableNull() {
final ConfirmMessageBox mb = new ConfirmMessageBox("Delete",
"Would you like to delete this tabular resource without table?");
- mb.addHideHandler(new HideHandler() {
- public void onHide(HideEvent event) {
- if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
- .name())) {
- callDeleteLastTable();
+ // Next in GXT 3.1.1
- } else if (mb.getHideButton() == mb
- .getButtonById(PredefinedButton.NO.name())) {
+ mb.addDialogHideHandler(new DialogHideHandler() {
+
+ @Override
+ public void onDialogHide(DialogHideEvent event) {
+ switch (event.getHideButton()) {
+ case NO:
getWizardWindow().setEnableNextButton(false);
getWizardWindow().setEnableBackButton(true);
+ break;
+ case YES:
+ callDeleteLastTable();
+ break;
+ default:
+ getWizardWindow().setEnableNextButton(false);
+ getWizardWindow().setEnableBackButton(true);
+ break;
+
}
+
}
});
+
+ // TODO
+ /*
+ * GXT 3.0.1 mb.addHideHandler(new HideHandler() { public void
+ * onHide(HideEvent event) { if (mb.getHideButton() ==
+ * mb.getButtonById(PredefinedButton.YES .name())) {
+ * callDeleteLastTable();
+ *
+ * } else if (mb.getHideButton() == mb
+ * .getButtonById(PredefinedButton.NO.name())) {
+ * getWizardWindow().setEnableNextButton(false);
+ * getWizardWindow().setEnableBackButton(true); } } });
+ */
mb.setWidth(300);
mb.show();
@@ -151,55 +175,61 @@ public class TabResourcesSelectionCard extends WizardCard {
protected void callDeleteLastTable() {
Log.debug("Delete TR:"
- + replaceByExternalSession.getExternalTabularResource().getTrId());
- TDGWTServiceAsync.INSTANCE.removeTabularResource(
- replaceByExternalSession.getExternalTabularResource().getTrId(),
- new AsyncCallback() {
+ + replaceByExternalSession.getExternalTabularResource()
+ .getTrId());
+ TDGWTServiceAsync.INSTANCE
+ .removeTabularResource(replaceByExternalSession
+ .getExternalTabularResource().getTrId(),
+ new AsyncCallback() {
- public void onFailure(Throwable caught) {
- if (caught instanceof TDGWTSessionExpiredException) {
- getEventBus()
- .fireEvent(
- new SessionExpiredEvent(
- SessionExpiredType.EXPIREDONSERVER));
- } else {
- if (caught instanceof TDGWTIsLockedException) {
- Log.error(caught.getLocalizedMessage());
- UtilsGXT3.alert("Error Locked",
- caught.getLocalizedMessage());
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
- } else {
-
- AlertMessageBox d = new AlertMessageBox(
- "Error",
- "Error on delete TabResource: "
- + caught.getLocalizedMessage());
- d.addHideHandler(new HideHandler() {
-
- public void onHide(HideEvent event) {
+ public void onFailure(Throwable caught) {
+ if (caught instanceof TDGWTSessionExpiredException) {
+ getEventBus()
+ .fireEvent(
+ new SessionExpiredEvent(
+ SessionExpiredType.EXPIREDONSERVER));
+ } else {
+ if (caught instanceof TDGWTIsLockedException) {
+ Log.error(caught.getLocalizedMessage());
+ UtilsGXT3.alert("Error Locked",
+ caught.getLocalizedMessage());
getWizardWindow().setEnableNextButton(
false);
getWizardWindow().setEnableBackButton(
true);
+ } else {
+
+ AlertMessageBox d = new AlertMessageBox(
+ "Error",
+ "Error on delete TabResource: "
+ + caught.getLocalizedMessage());
+ d.addHideHandler(new HideHandler() {
+
+ public void onHide(HideEvent event) {
+ getWizardWindow()
+ .setEnableNextButton(
+ false);
+ getWizardWindow()
+ .setEnableBackButton(
+ true);
+
+ }
+
+ });
+ d.show();
}
-
- });
- d.show();
+ }
}
- }
- }
+ public void onSuccess(Void result) {
+ tabResourcesSelectionPanel.gridReload();
+ getWizardWindow().setEnableNextButton(false);
+ getWizardWindow().setEnableBackButton(true);
+ }
- public void onSuccess(Void result) {
- tabResourcesSelectionPanel.gridReload();
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
- }
-
- });
+ });
}
protected void updateConnectedTRInfo(TableData table) {
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionPanel.java
index 5f523b8..b76590d 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionPanel.java
@@ -38,13 +38,12 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean;
import com.sencha.gxt.data.shared.loader.ListLoader;
import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding;
import com.sencha.gxt.widget.core.client.ContentPanel;
-import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
import com.sencha.gxt.widget.core.client.button.TextButton;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
-import com.sencha.gxt.widget.core.client.event.HideEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
+import com.sencha.gxt.widget.core.client.event.DialogHideEvent;
+import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler;
import com.sencha.gxt.widget.core.client.event.SelectEvent;
import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
import com.sencha.gxt.widget.core.client.form.TextField;
@@ -98,9 +97,9 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
}
try {
buildPanel(properties.id(),
- Arrays.> asList(nameColumn,typeColumn,
- tableTypeNameColumn, ownerColumn, agencyColumn, dateColumn),
- nameColumn);
+ Arrays.> asList(nameColumn,
+ typeColumn, tableTypeNameColumn, ownerColumn,
+ agencyColumn, dateColumn), nameColumn);
} catch (Throwable e) {
Log.debug("Error building panel:" + e.getMessage());
@@ -320,17 +319,34 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
removableTR = tabResource;
final ConfirmMessageBox mb = new ConfirmMessageBox("Delete",
"Would you like to delete this tabular resource?");
- mb.addHideHandler(new HideHandler() {
- public void onHide(HideEvent event) {
- if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
- .name())) {
+
+ // Next in GXT 3.1.1
+
+ mb.addDialogHideHandler(new DialogHideHandler() {
+
+ @Override
+ public void onDialogHide(DialogHideEvent event) {
+ switch (event.getHideButton()) {
+ case NO:
+ break;
+ case YES:
callDeleteTabularResource();
- } else if (mb.getHideButton() == mb
- .getButtonById(PredefinedButton.NO.name())) {
- // perform NO action
+ break;
+ default:
+ break;
+
}
+
}
});
+ /*
+ * GXT 3.0.1 mb.addHideHandler(new HideHandler() { public void
+ * onHide(HideEvent event) { if (mb.getHideButton() ==
+ * mb.getButtonById(PredefinedButton.YES .name())) {
+ * callDeleteTabularResource(); } else if (mb.getHideButton() == mb
+ * .getButtonById(PredefinedButton.NO.name())) { // perform NO action }
+ * } });
+ */
mb.setWidth(300);
mb.show();