diff --git a/pom.xml b/pom.xml
index ee28075..580e20a 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}
@@ -100,7 +109,7 @@
com.sencha.gxt
gxt
- 3.0.1
+ ${gxtVersion}
@@ -132,7 +141,7 @@
com.allen-sauer.gwt.log
gwt-log
- 3.2.1
+ ${gwtLogVersion}
provided
diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
index fb5ea4f..50fe20a 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionCard.java
@@ -23,9 +23,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;
import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
@@ -84,7 +85,7 @@ public class TabResourcesSelectionCard extends WizardCard {
// getWizardWindow().setFinishCommand(sayFinish);
}
-
+
public TDOpenSession getTdOpenSession() {
return tdOpenSession;
}
@@ -123,14 +124,14 @@ public class TabResourcesSelectionCard extends WizardCard {
protected void retrievedLastTableNull(TRId trId) {
if (trId.getTabResourceType().compareTo(TabResourceType.FLOW) == 0) {
- Log.debug("Attention",
+ Log.debug(
+ "Attention",
"This tabular resource has type flow and it does not have a valid table, no data entered in the flow");
AlertMessageBox d = new AlertMessageBox("Attention",
"No data entered in the flow");
d.addHideHandler(new HideHandler() {
public void onHide(HideEvent event) {
-
}
});
@@ -154,17 +155,34 @@ 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())) {
+ // Next in GXT 3.1.1
+
+ mb.addDialogHideHandler(new DialogHideHandler() {
+
+ @Override
+ public void onDialogHide(DialogHideEvent event) {
+ switch (event.getHideButton()) {
+ case NO:
+
+ break;
+ case YES:
callDeleteLastTable();
- } else if (mb.getHideButton() == mb
- .getButtonById(PredefinedButton.NO.name())) {
- // perform NO action
+ break;
+ default:
+ 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())) { // perform NO action }
+ * } });
+ */
mb.setWidth(300);
mb.show();
diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
index 3a59075..ea18a28 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
@@ -43,14 +43,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;
+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.RowDoubleClickEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
import com.sencha.gxt.widget.core.client.event.RowDoubleClickEvent.RowDoubleClickHandler;
import com.sencha.gxt.widget.core.client.event.SelectEvent;
import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
@@ -112,9 +111,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());
@@ -209,19 +208,17 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
grid.setBorders(false);
grid.setLoadMask(true);
grid.setColumnReordering(true);
-
-
+
grid.addRowDoubleClickHandler(new RowDoubleClickHandler() {
-
+
@Override
public void onRowDoubleClick(RowDoubleClickEvent event) {
- int rowIndex=event.getRowIndex();
+ int rowIndex = event.getRowIndex();
requestOpen(rowIndex);
}
-
});
-
+
SelectHandler sh = new SelectHandler() {
public void onSelect(SelectEvent event) {
loader.load();
@@ -240,20 +237,20 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
con.add(grid, new VerticalLayoutData(1, 1));
setWidget(con);
}
-
+
/**
*
* @param rowIndex
*/
protected void requestOpen(int rowIndex) {
- TabResource tabResource=grid.getStore().get(rowIndex);
- if(tabResource!=null){
+ TabResource tabResource = grid.getStore().get(rowIndex);
+ if (tabResource != null) {
parent.getTdOpenSession().setSelectedTabResource(tabResource);
parent.retrieveLastTable();
}
-
+
}
-
+
protected void createContextMenu() {
contextMenu = new Menu();
MenuItem deleteTRItem = new MenuItem("Delete");
@@ -368,17 +365,33 @@ 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;
}
+
}
});
+
+ // TODO
+ /*
+ * 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();