diff --git a/.classpath b/.classpath index b95af1b..5392fa2 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -45,5 +45,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 62d34de..784929a 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,9 @@ + + Added the project folder path update in the open operation + [ticket #12977] + + Updated support to StorageHub [ticket #11724] @@ -6,13 +11,15 @@ Updated to StorageHub [ticket #11724] - Added Status control in Algorithm Generator [ticket #11750] + Added Status control in Algorithm Generator [ticket #11750] + Added System parameters support [ticket #11768] Added support to Private algorithms [ticket #10779] Added user name to algorithms descriptions in SAI publication - [ticket #10705] + [ticket #10705] + Fixed Set Main behavior in case of R [ticket #10523] diff --git a/pom.xml b/pom.xml index 339b6f2..00bf52a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user statistical-algorithms-importer - 1.13.0-SNAPSHOT + 1.13.1-SNAPSHOT war diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java index 937cb7d..62543b9 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java @@ -17,6 +17,7 @@ import org.gcube.portlets.user.statisticalalgorithmsimporter.client.rpc.StatAlgo import org.gcube.portlets.user.statisticalalgorithmsimporter.client.type.SessionExpiredType; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.type.StatAlgoImporterRibbonType; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.upload.CodeUploadDialog; +import org.gcube.portlets.user.statisticalalgorithmsimporter.client.utils.BrowserWindowSupport; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.utils.UtilsGXT3; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.Constants; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.exception.StatAlgoImporterSessionExpiredException; @@ -32,7 +33,6 @@ import com.google.gwt.resources.client.ResourceException; import com.google.gwt.resources.client.TextResource; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox; import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer; @@ -304,7 +304,10 @@ public class StatAlgoImporterController { public void onSuccess(TextResource r) { String s = r.getText(); - Window.open(s, "Statistical Algorithms Importer Wiki", ""); + //Window.open(s, "Statistical Algorithms Importer Wiki", ""); + BrowserWindowSupport browserWindowSupport = BrowserWindowSupport.open("", "_blank", ""); + browserWindowSupport.setUrl(s); + } }); } catch (ResourceException e) { diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/BrowserWindowSupport.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/utils/BrowserWindowSupport.java similarity index 85% rename from src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/BrowserWindowSupport.java rename to src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/utils/BrowserWindowSupport.java index 6ca9a9e..b0dcada 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/BrowserWindowSupport.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/utils/BrowserWindowSupport.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.statisticalalgorithmsimporter.client.workspace; +package org.gcube.portlets.user.statisticalalgorithmsimporter.client.utils; import com.google.gwt.core.client.JavaScriptObject; @@ -19,11 +19,11 @@ public class BrowserWindowSupport extends JavaScriptObject { return $wnd.open(url, target, options); }-*/; - public native void close() /*-{ + public final native void close() /*-{ this.close(); }-*/; - public native void setUrl(String url) /*-{ + public final native void setUrl(String url) /*-{ if (this.location) { this.location = url; } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/DownloadWidget.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/DownloadWidget.java index 8343c77..b4abf05 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/DownloadWidget.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/workspace/DownloadWidget.java @@ -4,6 +4,7 @@ import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.event.SessionExpiredEvent; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.rpc.StatAlgoImporterServiceAsync; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.type.SessionExpiredType; +import org.gcube.portlets.user.statisticalalgorithmsimporter.client.utils.BrowserWindowSupport; import org.gcube.portlets.user.statisticalalgorithmsimporter.client.utils.UtilsGXT3; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.Constants; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.exception.StatAlgoImporterSessionExpiredException;