diff --git a/pom.xml b/pom.xml index 0464713..f202472 100644 --- a/pom.xml +++ b/pom.xml @@ -45,14 +45,14 @@ config - 2.5.1 + - 2.6.1 3.3.2 - 3.1.1 --> + 3.1.1 ${env.KEYS} diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java index a49a2d6..54abab5 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java @@ -14,9 +14,10 @@ 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; //Next in GXT 3.1.1 //import com.sencha.gxt.widget.core.client.event.DialogHideEvent; //import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler; @@ -131,6 +132,7 @@ public class TabResourcesSelectionCard extends WizardCard { protected void deleteTRWithLastTableNull() { final ConfirmMessageBox mb = new ConfirmMessageBox("Delete", "Would you like to delete this tabular resource without table?"); + /* GXT 3.0.1 mb.addHideHandler(new HideHandler() { public void onHide(HideEvent event) { if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES @@ -143,8 +145,9 @@ public class TabResourcesSelectionCard extends WizardCard { } } }); + */ - /* Next in GXT 3.1.1 + // Next in GXT 3.1.1 mb.addDialogHideHandler(new DialogHideHandler() { @@ -167,7 +170,7 @@ public class TabResourcesSelectionCard extends WizardCard { } } - });*/ + }); mb.setWidth(300); mb.show(); diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java index 7ac72fc..96bacf5 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java @@ -39,17 +39,13 @@ 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; -//Next in GXT 3.1.1 -//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.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.HideEvent.HideHandler; import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; import com.sencha.gxt.widget.core.client.form.TextField; import com.sencha.gxt.widget.core.client.grid.CheckBoxSelectionModel; @@ -61,6 +57,7 @@ import com.sencha.gxt.widget.core.client.menu.Menu; import com.sencha.gxt.widget.core.client.menu.MenuItem; import com.sencha.gxt.widget.core.client.toolbar.LabelToolItem; import com.sencha.gxt.widget.core.client.toolbar.ToolBar; +//Next in GXT 3.1.1 public class TabResourcesSelectionPanel extends ContentPanel implements HasSelectionHandlers { @@ -102,9 +99,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()); @@ -337,20 +334,18 @@ 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())) { - callDeleteTabularResource(); - } else if (mb.getHideButton() == mb - .getButtonById(PredefinedButton.NO.name())) { - - } - } - }); - - /*Next in GXT 3.1.1 + /* + * 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())) { * + * } } }); + */ + + // Next in GXT 3.1.1 + mb.addDialogHideHandler(new DialogHideHandler() { @Override @@ -368,9 +363,7 @@ public class TabResourcesSelectionPanel extends ContentPanel implements } }); - */ - - + mb.setWidth(300); mb.show(); @@ -382,7 +375,8 @@ public class TabResourcesSelectionPanel extends ContentPanel implements new AsyncCallback() { public void onFailure(Throwable caught) { - UtilsGXT3.alert("Error", + UtilsGXT3.alert( + "Error", "Error on delete TabResource: " + caught.getLocalizedMessage()); }