Updated to GWT 2.6.1

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-open-widget@101748 82a268e6-3cf1-43bd-a215-b396298e98cf

pom.xml

@@ -44,7 +44,14 @@
 		<configDirectory>config</configDirectory>
 		
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.5.1</gwtVersion>
+		<!-- <gwtVersion>2.5.1</gwtVersion>
+		<gwtLogVersion>3.2.1</gwtLogVersion>
+		<gxtVersion>3.0.1</gxtVersion> -->
+		
+		<!-- Next -->
+		<gwtVersion>2.6.1</gwtVersion>
+		<gwtLogVersion>3.3.2</gwtLogVersion>
+		<gxtVersion>3.1.1</gxtVersion> 
 		
 		<KEYS>${env.KEYS}</KEYS>
 		
@@ -76,10 +83,12 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 
 
@@ -100,7 +109,7 @@
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
-			<version>3.0.1</version>
+			<version>${gxtVersion}</version>
 		</dependency>
 
 		<!-- tabular-data-wizard-widget -->
@@ -132,7 +141,7 @@
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
 			<artifactId>gwt-log</artifactId>
-			<version>3.2.1</version>
+			<version>${gwtLogVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 

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;
 
@@ -123,7 +124,8 @@ 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");
@@ -131,7 +133,6 @@ public class TabResourcesSelectionCard extends WizardCard {
 
 				public void onHide(HideEvent event) {
 
-
 				}
 			});
 			d.show();
@@ -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() {
+		// Next in GXT 3.1.1
-			public void onHide(HideEvent event) {
+
-				if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
+		mb.addDialogHideHandler(new DialogHideHandler() {
-						.name())) {
+
+			@Override
+			public void onDialogHide(DialogHideEvent event) {
+				switch (event.getHideButton()) {
+				case NO:
+
+					break;
+				case YES:
 					callDeleteLastTable();
-				} else if (mb.getHideButton() == mb
+					break;
-						.getButtonById(PredefinedButton.NO.name())) {
+				default:
-					// perform NO action
+					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();
 

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.<ColumnConfig<TabResource, ?>> asList(nameColumn,typeColumn,
+					Arrays.<ColumnConfig<TabResource, ?>> asList(nameColumn,
-							tableTypeNameColumn, ownerColumn, agencyColumn, dateColumn),
+							typeColumn, tableTypeNameColumn, ownerColumn,
-					nameColumn);
+							agencyColumn, dateColumn), nameColumn);
 
 		} catch (Throwable e) {
 			Log.debug("Error building panel:" + e.getMessage());
@@ -210,16 +209,14 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 		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() {
@@ -246,8 +243,8 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 	 * @param rowIndex
 	 */
 	protected void requestOpen(int rowIndex) {
-		TabResource tabResource=grid.getStore().get(rowIndex);
+		TabResource tabResource = grid.getStore().get(rowIndex);
-		if(tabResource!=null){
+		if (tabResource != null) {
 			parent.getTdOpenSession().setSelectedTabResource(tabResource);
 			parent.retrieveLastTable();
 		}
@@ -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() {
+		// Next in GXT 3.1.1
-			public void onHide(HideEvent event) {
+		mb.addDialogHideHandler(new DialogHideHandler() {
-				if (mb.getHideButton() == mb.getButtonById(PredefinedButton.YES
+
-						.name())) {
+			@Override
+			public void onDialogHide(DialogHideEvent event) {
+				switch (event.getHideButton()) {
+				case NO:
+					break;
+				case YES:
 					callDeleteTabularResource();
-				} else if (mb.getHideButton() == mb
+					break;
-						.getButtonById(PredefinedButton.NO.name())) {
+				default:
-					// perform NO action
+					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();