diff --git a/pom.xml b/pom.xml
index b267d40..52e2121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -471,7 +471,7 @@
org.gcube.distribution
maven-portal-bom
- LATEST
+ 2.6.0-SNAPSHOT
pom
import
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java
index 817b286..fc50e77 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java
@@ -252,7 +252,7 @@ public class DataMinerManagerController {
UtilsGXT3.alert("Error",
"Failed to start computation "
+ event.getOp().getName()
- + ", the computation id is null");
+ + ", the computation id is null!");
else {
startComputation(computationId,
event.getComputationStatusPanelIndex());
@@ -263,9 +263,8 @@ public class DataMinerManagerController {
public void onFailure(Throwable caught) {
UtilsGXT3.alert("Error",
"Failed to start computation "
- + event.getOp().getName()
- + "
Cause:" + caught.getCause()
- + "
Message:" + caught.getMessage());
+ + event.getOp().getName() + "! "
+ + caught.getLocalizedMessage());
caught.printStackTrace();
}
});
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.css b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.css
deleted file mode 100644
index 05773c0..0000000
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
-*
-*/
-
-.progressWrap {
- border:1px solid;
- overflow:hidden;
- border-color:#65cf6d;
-}
-
-.progressInner {
- height:18px;
- background:repeat-x;
- position:relative;
-}
-
-.progressBar {
- height:18px;
- width:0;
- border-top:1px solid;
- border-bottom:1px solid;
- border-right:1px solid;
-}
-
-.progressText {
- padding:1px 5px;
- overflow:hidden;
- position:absolute;
- left:0;
- text-align:center;
- font-size:11px;
- font-weight:bold;
-}
-
-.progressBar .progressText {
- z-index: 99;
-}
-
-.progressTextBack {
- z-index: 9 !important;
-}
-
-@if user.agent ie6 ie8 ie9 {
- .progressTextBack {
- line-height:15px;
- }
-}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBarAppaearance.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBarAppaearance.java
deleted file mode 100644
index 47c80b0..0000000
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBarAppaearance.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.gcube.portlets.user.dataminermanager.client.custom;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.ImageResource;
-import com.google.gwt.resources.client.ImageResource.ImageOptions;
-import com.google.gwt.resources.client.ImageResource.RepeatStyle;
-import com.sencha.gxt.theme.base.client.progress.ProgressBarDefaultAppearance;
-
-/**
- *
- * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
- *
- */
-public class GreenProgressBarAppaearance extends ProgressBarDefaultAppearance {
-
- public interface GreenProgressBarResources extends ProgressBarResources,
- ClientBundle {
-
- @Source({ "GreenProgressBar.css" })
- @Override
- ProgressBarStyle style();
-
- @Source("green-progress-bg.gif")
- @Override
- @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
- ImageResource bar();
-
- @Source("green-bg.gif")
- @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
- ImageResource innerBar();
- }
-
- public GreenProgressBarAppaearance() {
- super(
- GWT. create(GreenProgressBarResources.class),
- GWT. create(ProgressBarTemplate.class));
- }
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.css b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.css
deleted file mode 100644
index 164ef00..0000000
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
-*
-*/
-
-.progressWrap {
- border:1px solid;
- overflow:hidden;
- border-color:#cf6572;
-}
-
-.progressInner {
- height:18px;
- background:repeat-x;
- position:relative;
-}
-
-.progressBar {
- height:18px;
- width:0;
- border-top:1px solid;
- border-bottom:1px solid;
- border-right:1px solid;
-}
-
-.progressText {
- padding:1px 5px;
- overflow:hidden;
- position:absolute;
- left:0;
- text-align:center;
- font-size:11px;
- font-weight:bold;
-}
-
-.progressBar .progressText {
- z-index: 99;
-}
-
-.progressTextBack {
- z-index: 9 !important;
-}
-
-@if user.agent ie6 ie8 ie9 {
- .progressTextBack {
- line-height:15px;
- }
-}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBarAppaearance.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBarAppaearance.java
deleted file mode 100644
index dd87fea..0000000
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBarAppaearance.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.gcube.portlets.user.dataminermanager.client.custom;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.ImageResource;
-import com.google.gwt.resources.client.ImageResource.ImageOptions;
-import com.google.gwt.resources.client.ImageResource.RepeatStyle;
-import com.sencha.gxt.theme.base.client.progress.ProgressBarDefaultAppearance;
-
-/**
- *
- * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
- *
- */
-public class RedProgressBarAppaearance extends ProgressBarDefaultAppearance {
-
- public interface RedProgressBarResources extends ProgressBarResources,
- ClientBundle {
-
- @Source({"RedProgressBar.css" })
- @Override
- ProgressBarStyle style();
-
- @Source("red-progress-bg.gif")
- @Override
- @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
- ImageResource bar();
-
- @Source("red-bg.gif")
- @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
- ImageResource innerBar();
- }
-
- public RedProgressBarAppaearance() {
- super(
- GWT. create(RedProgressBarResources.class),
- GWT. create(ProgressBarTemplate.class));
-
- }
-
-
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.css b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.css
new file mode 100644
index 0000000..5934b15
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.css
@@ -0,0 +1,40 @@
+/**
+*
+*/
+.progressWrapGreen {
+ border: 1px solid #65cf81;
+}
+
+@sprite .progressInnerGreen {
+ background-color: #e0f3e5;
+ gwt-image: 'innerBarGreen';
+ height: auto;
+}
+
+@sprite .progressBarGreen {
+ background-color: #9ceeb0;
+ gwt-image: 'barGreen';
+ background-repeat: repeat-x;
+ background-position: left center;
+ height: 18px;
+ border-top-color: #d1fdd9;
+ border-bottom-color: #7fe498;
+ border-right-color: #7fe498;
+}
+
+.progressTextGreen {
+ color: #fff;
+ text-align: center;
+ font-size: 11px;
+ font-weight: bold;
+ font-family: sans-serif;
+ padding: 1px 5px;
+ overflow: hidden;
+ position: absolute;
+ z-index: 99;
+}
+
+.progressTextBackGreen {
+ color: #399544 !important;
+ z-index: 9 !important;
+}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.html b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.html
new file mode 100644
index 0000000..84e6165
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.html
@@ -0,0 +1,12 @@
+
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.java
similarity index 70%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.java
index 6f1e250..124b89a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/GreenProgressBar.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.dataminermanager.client.custom;
+package org.gcube.portlets.user.dataminermanager.client.custom.progress;
import com.sencha.gxt.cell.core.client.ProgressBarCell;
import com.sencha.gxt.widget.core.client.ProgressBar;
@@ -12,7 +12,7 @@ import com.sencha.gxt.widget.core.client.ProgressBar;
public class GreenProgressBar extends ProgressBar {
public GreenProgressBar() {
- super(new ProgressBarCell(new GreenProgressBarAppaearance()));
+ super(new ProgressBarCell(new GreenProgressBarAppearance()));
}
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBarAppearance.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBarAppearance.java
new file mode 100644
index 0000000..c9552ae
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBarAppearance.java
@@ -0,0 +1,132 @@
+package org.gcube.portlets.user.dataminermanager.client.custom.progress;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ImageResource.ImageOptions;
+import com.google.gwt.resources.client.ImageResource.RepeatStyle;
+import com.google.gwt.safecss.shared.SafeStyles;
+import com.google.gwt.safecss.shared.SafeStylesUtils;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
+import com.sencha.gxt.cell.core.client.ProgressBarCell.ProgressBarAppearance;
+import com.sencha.gxt.cell.core.client.ProgressBarCell.ProgressBarAppearanceOptions;
+import com.sencha.gxt.core.client.GXT;
+import com.sencha.gxt.core.client.XTemplates;
+import com.sencha.gxt.core.client.util.Format;
+
+/**
+ *
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
+ *
+ */
+public class GreenProgressBarAppearance implements ProgressBarAppearance {
+
+ public interface GreenProgressBarResources {
+
+ ImageResource barGreen();
+
+ ImageResource innerBarGreen();
+
+ GreenProgressBarStyle style();
+
+ }
+
+ public interface GreenProgressBarStyle extends CssResource {
+
+ String progressBarGreen();
+
+ String progressInnerGreen();
+
+ String progressTextGreen();
+
+ String progressTextBackGreen();
+
+ String progressWrapGreen();
+
+ }
+
+ public interface GreenProgressBarTemplate extends XTemplates {
+
+ @XTemplate(source = "GreenProgressBar.html")
+ SafeHtml render(SafeHtml text, GreenProgressBarStyle style,
+ SafeStyles wrapStyles, SafeStyles progressBarStyles,
+ SafeStyles progressTextStyles, SafeStyles widthStyles);
+
+ }
+
+ public interface GreenProgressBarDefaultResources extends
+ GreenProgressBarResources, ClientBundle {
+
+ @Source({ "GreenProgressBar.css" })
+ @Override
+ GreenProgressBarStyle style();
+
+ @Source("green-progress-bg.gif")
+ @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+ @Override
+ ImageResource barGreen();
+
+ @Source("green-bg.gif")
+ @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+ @Override
+ ImageResource innerBarGreen();
+ }
+
+ private final GreenProgressBarStyle style;
+ private GreenProgressBarTemplate template;
+
+
+ public GreenProgressBarAppearance() {
+ this(
+ GWT. create(GreenProgressBarDefaultResources.class),
+ GWT. create(GreenProgressBarTemplate.class));
+ }
+
+ public GreenProgressBarAppearance(GreenProgressBarResources resources,
+ GreenProgressBarTemplate template) {
+ this.style = resources.style();
+ this.style.ensureInjected();
+ this.template = template;
+ }
+
+ @Override
+ public void render(SafeHtmlBuilder sb, Double value,
+ ProgressBarAppearanceOptions options) {
+ value = value == null ? 0 : value;
+ double valueWidth = value * options.getWidth();
+
+ int vw = new Double(valueWidth).intValue();
+
+ String text = options.getProgressText();
+
+ if (text != null) {
+ int v = (int) Math.round(value * 100);
+ text = Format.substitute(text, v);
+ }
+
+ SafeHtml txt;
+ if (text == null) {
+ txt = SafeHtmlUtils.fromSafeConstant(" ");
+ } else {
+ txt = SafeHtmlUtils.fromString(text);
+ }
+
+ int adj = GXT.isIE() ? 4 : 2;
+
+ SafeStyles wrapStyles = SafeStylesUtils.fromTrustedString("width:"
+ + (options.getWidth() - adj) + "px;");
+ SafeStyles progressBarStyles = SafeStylesUtils
+ .fromTrustedString("width:" + vw + "px;");
+ SafeStyles progressTextStyles = SafeStylesUtils
+ .fromTrustedString("width:" + Math.max(vw - 8, 0) + "px;");
+ SafeStyles widthStyles = SafeStylesUtils.fromTrustedString("width:"
+ + (Math.max(0, options.getWidth() - adj)) + "px;");
+ sb.append(template.render(txt, style, wrapStyles, progressBarStyles,
+ progressTextStyles, widthStyles));
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.css b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.css
new file mode 100644
index 0000000..fd36b70
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.css
@@ -0,0 +1,40 @@
+/**
+*
+*/
+.progressWrapRed {
+ border: 1px solid #cf656f;
+}
+
+@sprite .progressInnerRed {
+ background-color: #f3e0e2;
+ gwt-image: 'innerBarRed';
+ height: auto;
+}
+
+@sprite .progressBarRed {
+ background-color: #ee9ca4;
+ gwt-image: 'barRed';
+ background-repeat: repeat-x;
+ background-position: left center;
+ height: 18px;
+ border-top-color: #fdd1d5;
+ border-bottom-color: #e47f88;
+ border-right-color: #e47f88;
+}
+
+.progressTextRed {
+ color: #fff;
+ text-align: center;
+ font-size: 11px;
+ font-weight: bold;
+ font-family: sans-serif;
+ padding: 1px 5px;
+ overflow: hidden;
+ position: absolute;
+ z-index: 99;
+}
+
+.progressTextBackRed {
+ color: #953941 !important;
+ z-index: 9 !important;
+}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.html b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.html
new file mode 100644
index 0000000..918b724
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.html
@@ -0,0 +1,12 @@
+
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.java
similarity index 70%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.java
index d4c7d50..9de57a6 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/RedProgressBar.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.dataminermanager.client.custom;
+package org.gcube.portlets.user.dataminermanager.client.custom.progress;
import com.sencha.gxt.cell.core.client.ProgressBarCell;
import com.sencha.gxt.widget.core.client.ProgressBar;
@@ -12,7 +12,7 @@ import com.sencha.gxt.widget.core.client.ProgressBar;
public class RedProgressBar extends ProgressBar {
public RedProgressBar() {
- super(new ProgressBarCell(new RedProgressBarAppaearance()));
+ super(new ProgressBarCell(new RedProgressBarAppearance()));
}
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBarAppearance.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBarAppearance.java
new file mode 100644
index 0000000..44795fb
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBarAppearance.java
@@ -0,0 +1,132 @@
+package org.gcube.portlets.user.dataminermanager.client.custom.progress;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ImageResource.ImageOptions;
+import com.google.gwt.resources.client.ImageResource.RepeatStyle;
+import com.google.gwt.safecss.shared.SafeStyles;
+import com.google.gwt.safecss.shared.SafeStylesUtils;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
+import com.sencha.gxt.cell.core.client.ProgressBarCell.ProgressBarAppearance;
+import com.sencha.gxt.cell.core.client.ProgressBarCell.ProgressBarAppearanceOptions;
+import com.sencha.gxt.core.client.GXT;
+import com.sencha.gxt.core.client.XTemplates;
+import com.sencha.gxt.core.client.util.Format;
+
+/**
+ *
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
+ *
+ */
+public class RedProgressBarAppearance implements ProgressBarAppearance {
+
+ public interface RedProgressBarResources {
+
+ ImageResource barRed();
+
+ ImageResource innerBarRed();
+
+ RedProgressBarStyle style();
+
+ }
+
+ public interface RedProgressBarStyle extends CssResource {
+
+ String progressBarRed();
+
+ String progressInnerRed();
+
+ String progressTextRed();
+
+ String progressTextBackRed();
+
+ String progressWrapRed();
+
+ }
+
+ public interface RedProgressBarTemplate extends XTemplates {
+
+ @XTemplate(source = "RedProgressBar.html")
+ SafeHtml render(SafeHtml text, RedProgressBarStyle style,
+ SafeStyles wrapStyles, SafeStyles progressBarStyles,
+ SafeStyles progressTextStyles, SafeStyles widthStyles);
+
+ }
+
+ public interface RedProgressBarDefaultResources extends
+ RedProgressBarResources, ClientBundle {
+
+ @Source({ "RedProgressBar.css" })
+ @Override
+ RedProgressBarStyle style();
+
+ @Source("red-progress-bg.gif")
+ @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+ @Override
+ ImageResource barRed();
+
+ @Source("red-bg.gif")
+ @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+ @Override
+ ImageResource innerBarRed();
+ }
+
+ private final RedProgressBarStyle style;
+ private RedProgressBarTemplate template;
+
+
+ public RedProgressBarAppearance() {
+ this(
+ GWT. create(RedProgressBarDefaultResources.class),
+ GWT. create(RedProgressBarTemplate.class));
+ }
+
+ public RedProgressBarAppearance(RedProgressBarResources resources,
+ RedProgressBarTemplate template) {
+ this.style = resources.style();
+ this.style.ensureInjected();
+ this.template = template;
+ }
+
+ @Override
+ public void render(SafeHtmlBuilder sb, Double value,
+ ProgressBarAppearanceOptions options) {
+ value = value == null ? 0 : value;
+ double valueWidth = value * options.getWidth();
+
+ int vw = new Double(valueWidth).intValue();
+
+ String text = options.getProgressText();
+
+ if (text != null) {
+ int v = (int) Math.round(value * 100);
+ text = Format.substitute(text, v);
+ }
+
+ SafeHtml txt;
+ if (text == null) {
+ txt = SafeHtmlUtils.fromSafeConstant(" ");
+ } else {
+ txt = SafeHtmlUtils.fromString(text);
+ }
+
+ int adj = GXT.isIE() ? 4 : 2;
+
+ SafeStyles wrapStyles = SafeStylesUtils.fromTrustedString("width:"
+ + (options.getWidth() - adj) + "px;");
+ SafeStyles progressBarStyles = SafeStylesUtils
+ .fromTrustedString("width:" + vw + "px;");
+ SafeStyles progressTextStyles = SafeStylesUtils
+ .fromTrustedString("width:" + Math.max(vw - 8, 0) + "px;");
+ SafeStyles widthStyles = SafeStylesUtils.fromTrustedString("width:"
+ + (Math.max(0, options.getWidth() - adj)) + "px;");
+ sb.append(template.render(txt, style, wrapStyles, progressBarStyles,
+ progressTextStyles, widthStyles));
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/green-bg.gif b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/green-bg.gif
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/green-bg.gif
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/green-bg.gif
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/green-progress-bg.gif b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/green-progress-bg.gif
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/green-progress-bg.gif
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/green-progress-bg.gif
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/red-bg.gif b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/red-bg.gif
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/red-bg.gif
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/red-bg.gif
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/red-progress-bg.gif b/src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/red-progress-bg.gif
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/red-progress-bg.gif
rename to src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/red-progress-bg.gif
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
index 09fea7e..6b16aa2 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
@@ -56,12 +56,11 @@ public class ComputationOutputPanel extends SimpleContainer {
v = new VerticalLayoutContainer();
add(v);
- // request for a jobItem linked with the computationId (or jobId)
+ // request resource by ComputationId
DataMinerPortletServiceAsync.INSTANCE.getResourceByComputationId(computationId,
new AsyncCallback() {
@Override
public void onSuccess(Resource result) {
- // unmask();
showOutputInfo(result);
}
@@ -76,12 +75,11 @@ public class ComputationOutputPanel extends SimpleContainer {
}
});
-
- // this.mask("Loading Result Info...");
}
/**
- * @param jobOutput
+ *
+ * @param resource
*/
private void showOutputInfo(Resource resource) {
try {
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
index e13b966..47a4a56 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
@@ -260,7 +260,7 @@ public class ComputationParametersPanel extends SimpleContainer {
"Column parameter \""
+ p.getName()
+ " refers to a tabular parameter that doesn't exists ("
- + tabParamName + ")\"", null);
+ + tabParamName + ")\"");
}
}
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
index b96ca6d..df9816d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
@@ -9,8 +9,8 @@ import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus.Status;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
-import org.gcube.portlets.user.dataminermanager.client.custom.GreenProgressBar;
-import org.gcube.portlets.user.dataminermanager.client.custom.RedProgressBar;
+import org.gcube.portlets.user.dataminermanager.client.custom.progress.GreenProgressBar;
+import org.gcube.portlets.user.dataminermanager.client.custom.progress.RedProgressBar;
import org.gcube.portlets.user.dataminermanager.client.events.CancelComputationExecutionRequestEvent;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
@@ -135,7 +135,6 @@ public class ComputationStatusPanel extends SimpleContainer {
//TODO
progressBar =new GreenProgressBar();
progressBar.updateProgress(1, "Computation Complete");
- progressBar.addStyleName("progressBar-complete");
vert.insert(progressBar, index, new VerticalLayoutData(1, -1, new Margins(20)));
showOutput();
@@ -156,7 +155,6 @@ public class ComputationStatusPanel extends SimpleContainer {
progressBar =new RedProgressBar();
progressBar.updateProgress(1, "Computation Fail");
progressBar.getElement().getStyle().setMarginBottom(36, Unit.PX);
- progressBar.addStyleName("progressBar-failed");
vert.insert(progressBar, index, new VerticalLayoutData(1, -1, new Margins(20)));
}
@@ -207,7 +205,6 @@ public class ComputationStatusPanel extends SimpleContainer {
progressBar =new RedProgressBar();
progressBar.updateProgress(1, "Failed to get the status");
progressBar.getElement().getStyle().setMarginBottom(36, Unit.PX);
- progressBar.addStyleName("progressBar-failed");
vert.insert(progressBar, index, new VerticalLayoutData(1, -1, new Margins(20)));
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
index ff434b5..1d4f4d0 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
@@ -1,13 +1,10 @@
package org.gcube.portlets.user.dataminermanager.client.rpc;
import java.util.List;
-import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ImagesResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.MapResource;
import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
@@ -27,44 +24,17 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@RemoteServiceRelativePath("dataminerman")
public interface DataMinerPortletService extends RemoteService {
- /*
- // get tables info belongs to a given templates set (for relative user)
- public List getTableItems(List templates)
- throws Exception;
- */
- public List getFileItems(List templates)
- throws Exception;
-
- public Resource getResourceByComputationId(ComputationId computationId);
-
- public Map getParametersMapByComputationId(ComputationId computationId) throws ServiceException;
-
-
- public Map getMapFromMapResource(MapResource mapResource)
- throws Exception;
-
- // Map getImagesInfoFromImagesResource(ImagesResource
- // imgsRes) throws Exception;
-
- public String saveImage(ComputationId computationId, ImagesResource imageResource)
- throws Exception;
-
-
- /**
- * Dataminer
- *
- */
public UserInfo hello() throws ServiceException;
public List getOperatorsClassifications()
- throws Exception;
+ throws ServiceException;
- public List getParameters(Operator operator) throws Exception;
+ public List getParameters(Operator operator) throws ServiceException;
- public ComputationId startComputation(Operator op) throws Exception;
+ public ComputationId startComputation(Operator op) throws ServiceException;
public ComputationStatus getComputationStatus(ComputationId computationId)
- throws Exception;
+ throws ServiceException;
public ComputationId resubmit(ComputationId computationId) throws ServiceException;
@@ -83,4 +53,6 @@ public interface DataMinerPortletService extends RemoteService {
public void deleteItem(ItemDescription itemDescription)
throws ServiceException;
+ public Resource getResourceByComputationId(ComputationId computationId) throws ServiceException;
+
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
index 2309496..f33cf57 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
@@ -1,13 +1,10 @@
package org.gcube.portlets.user.dataminermanager.client.rpc;
import java.util.List;
-import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ImagesResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.MapResource;
import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
@@ -22,59 +19,34 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
/**
*
- * @author Giancarlo Panichi
- * email: g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
*
*/
public interface DataMinerPortletServiceAsync {
-
+
public static DataMinerPortletServiceAsync INSTANCE = (DataMinerPortletServiceAsync) GWT
.create(DataMinerPortletService.class);
- /*
- void getTableItems(List templates,
- AsyncCallback> callback);
- */
- void getFileItems(List templates,
- AsyncCallback> callback);
-
-
- void getResourceByComputationId(ComputationId computationId,
- AsyncCallback callback);
-
- void getMapFromMapResource(MapResource mapResource,
- AsyncCallback