From 96b9c8b5650223eef07417b73adc37066fac8b36 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 27 Nov 2014 17:30:11 +0000 Subject: [PATCH] Updated to GWT 2.6.1 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@101748 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 12 ++-- pom.xml | 16 +++-- .../user/td/client/TabularDataController.java | 65 +++++++++++++------ .../client/template/TemplateApplyPanel.java | 2 +- .../client/template/TemplateDeletePanel.java | 2 +- .../td/client/template/TemplateOpenPanel.java | 2 +- .../user/td/tabulardataportlet.gwt.xml | 12 ++-- 7 files changed, 75 insertions(+), 36 deletions(-) diff --git a/.classpath b/.classpath index 2995c7f..371da99 100644 --- a/.classpath +++ b/.classpath @@ -33,17 +33,17 @@ - + - + - + - + - - + + diff --git a/pom.xml b/pom.xml index 95076a9..3e12d41 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,15 @@ distro config - 2.5.1 + + + + + 2.6.1 + 3.3.2 + 3.1.1 @@ -435,7 +443,7 @@ com.allen-sauer.gwt.log gwt-log - 3.2.1 + ${gwtLogVersion} diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index c8b5504..0922e4d 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -77,11 +77,10 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; 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.container.BorderLayoutContainer.BorderLayoutData; -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 org.gcube.portlets.user.tdtemplate.client.TdTemplateController; @@ -647,10 +646,17 @@ public class TabularDataController { final ConfirmMessageBox mb = new ConfirmMessageBox("Confirm", "Are you sure you want to delete the taular 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: + mb.hide(); + break; + case YES: Log.debug("Remove TR:" + trId); TDGWTServiceAsync.INSTANCE.removeTabularResource(trId, new AsyncCallback() { @@ -667,12 +673,33 @@ public class TabularDataController { }); mb.hide(); - } else if (mb.getHideButton() == mb - .getButtonById(PredefinedButton.NO.name())) { - mb.hide(); + break; + default: + break; + } + } }); + + /* + * GXT 3.0.1 mb.addHideHandler(new HideHandler() { public void + * onHide(HideEvent event) { if (mb.getHideButton() == + * mb.getButtonById(PredefinedButton.YES .name())) { + * Log.debug("Remove TR:" + trId); + * TDGWTServiceAsync.INSTANCE.removeTabularResource(trId, new + * AsyncCallback() { + * + * public void onFailure(Throwable caught) { + * UtilsGXT3.alert("Error on Delete", caught.getLocalizedMessage()); } + * + * public void onSuccess(Void result) { requestCloseCurrent(); } + * + * }); + * + * mb.hide(); } else if (mb.getHideButton() == mb + * .getButtonById(PredefinedButton.NO.name())) { mb.hide(); } } }); + */ mb.setWidth(300); mb.show(); @@ -1242,17 +1269,17 @@ public class TabularDataController { public void onSuccess() { openWizard(); - + ReplaceByExternalTD replaceByExternalColWizard; - if(colname==null|| colname.isEmpty()){ - - replaceByExternalColWizard= new ReplaceByExternalTD( - trId, "Replace By External Columns", eventBus); + if (colname == null || colname.isEmpty()) { + + replaceByExternalColWizard = new ReplaceByExternalTD(trId, + "Replace By External Columns", eventBus); } else { - replaceByExternalColWizard= new ReplaceByExternalTD( - trId, colname,"Replace By External Columns", eventBus); + replaceByExternalColWizard = new ReplaceByExternalTD(trId, + colname, "Replace By External Columns", eventBus); } - + replaceByExternalColWizard.addListener(new WizardListener() { public void failed(String title, String message, Throwable throwable) { @@ -2046,7 +2073,7 @@ public class TabularDataController { } else { if (opId.compareTo(GridHeaderOperationId.COLUMNREPLACEBYEXTERNAL .toString()) == 0) { - + openReplaceByExternalColWizard(columnName); } else { diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java index bed59fe..473da8b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java @@ -208,7 +208,7 @@ public class TemplateApplyPanel extends FramedPanel { ToolBar toolBar = new ToolBar(); toolBar.add(grid); - toolBar.addStyleName(ThemeStyles.getStyle().borderTop()); + toolBar.addStyleName(ThemeStyles.get().style().borderTop()); toolBar.getElement().getStyle().setProperty("borderBottom", "none"); btnApply = new TextButton("Apply"); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java index 342469f..d29dc1b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java @@ -196,7 +196,7 @@ public class TemplateDeletePanel extends FramedPanel { ToolBar toolBar = new ToolBar(); toolBar.add(grid); - toolBar.addStyleName(ThemeStyles.getStyle().borderTop()); + toolBar.addStyleName(ThemeStyles.get().style().borderTop()); toolBar.getElement().getStyle().setProperty("borderBottom", "none"); btnDelete = new TextButton("Delete"); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java index 7d77465..26808d5 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java @@ -202,7 +202,7 @@ public class TemplateOpenPanel extends FramedPanel { ToolBar toolBar = new ToolBar(); toolBar.add(grid); - toolBar.addStyleName(ThemeStyles.getStyle().borderTop()); + toolBar.addStyleName(ThemeStyles.get().style().borderTop()); toolBar.getElement().getStyle().setProperty("borderBottom", "none"); btnOpen = new TextButton("Open"); diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 5e0a741..9d75445 100644 --- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -70,15 +70,19 @@ + + - - + + +