diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporter.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporter.java index 7a41c56..9931c21 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporter.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporter.java @@ -61,7 +61,7 @@ public class StatAlgoImporter implements EntryPoint { } protected void loadMainPanel() { - StatAlgoImporterResources.INSTANCE.srCSS().ensureInjected(); + StatAlgoImporterResources.INSTANCE.saiStyles().ensureInjected(); // ScriptInjector.fromString(AccountingManagerResources.INSTANCE.jqueryJs().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject(); StatAlgoImporterController controller = new StatAlgoImporterController(); diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java index 30ba669..c278dcc 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java @@ -33,6 +33,10 @@ public class CodeParser { if (parameter.contains("<-")) { String[] varDescription = parameter.split("<-"); + String checkDataTypeValue=varDescription[1].trim(); + if (checkDataTypeValue.endsWith(";")) + checkDataTypeValue = checkDataTypeValue.substring(0, + checkDataTypeValue.length() - 1); String defaultValue = varDescription[1].trim(); if (defaultValue.endsWith(";")) defaultValue = defaultValue.substring(0, @@ -45,11 +49,15 @@ public class CodeParser { selectedRowsVariables = new InputOutputVariables( varDescription[0].trim(), varDescription[0].trim(), - defaultValue, checkDataType(varDescription[1].trim()), + defaultValue, checkDataType(checkDataTypeValue), ioType, parameter); } else { if (parameter.contains("=")) { String[] varDescription = parameter.split("="); + String checkDataTypeValue=varDescription[1].trim(); + if (checkDataTypeValue.endsWith(";")) + checkDataTypeValue = checkDataTypeValue.substring(0, + checkDataTypeValue.length() - 1); String defaultValue = varDescription[1].trim(); if (defaultValue.endsWith(";")) defaultValue = defaultValue.substring(0, @@ -61,7 +69,7 @@ public class CodeParser { defaultValue.length() - 1); selectedRowsVariables = new InputOutputVariables( varDescription[0].trim(), varDescription[0].trim(), - defaultValue, checkDataType(varDescription[1].trim()), + defaultValue, checkDataType(checkDataTypeValue), ioType, parameter); } else { diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css new file mode 100644 index 0000000..ad2a3d4 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css @@ -0,0 +1,9 @@ +@CHARSET "UTF-8"; + + +.ribbon { + line-height: 13px; + font-size: 11px; +} + + diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterCSS.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.java similarity index 84% rename from src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterCSS.java rename to src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.java index 2b33ca9..8c974b1 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterCSS.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.java @@ -11,10 +11,11 @@ import com.google.gwt.resources.client.CssResource; * g.panichi@isti.cnr.it * */ -public interface StatAlgoImporterCSS extends CssResource { +public interface SAIStyles extends CssResource { @ClassName("ribbon") public String getRibbon(); - + + } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css deleted file mode 100644 index 6e90020..0000000 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css +++ /dev/null @@ -1,12 +0,0 @@ -@CHARSET "UTF-8"; - - -.ribbon { - line-height: 13px; - font-size: 11px; -} - - -#drop_target_inner { - background-image: url("statalgoimporter/images/explorer_dragndrop.png") !important; -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java index c7cf4e9..631cdc2 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java @@ -19,8 +19,8 @@ public interface StatAlgoImporterResources extends ClientBundle { public static final StatAlgoImporterResources INSTANCE = GWT .create(StatAlgoImporterResources.class); - @Source("StatAlgoImporter.css") - StatAlgoImporterCSS srCSS(); + @Source("SAIStyles.css") + SAIStyles saiStyles(); @Source("WikiLink.txt") ExternalTextResource wikiLink(); diff --git a/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css b/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css new file mode 100644 index 0000000..ad2a3d4 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css @@ -0,0 +1,9 @@ +@CHARSET "UTF-8"; + + +.ribbon { + line-height: 13px; + font-size: 11px; +} + + diff --git a/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css b/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css deleted file mode 100644 index 4232406..0000000 --- a/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css +++ /dev/null @@ -1,11 +0,0 @@ -@CHARSET "UTF-8"; - - -.ribbon { - line-height: 13px; - font-size: 11px; -} - -#drop_target_inner { - background-image: url("statalgoimporter/images/explorer_dragndrop.png") !important; -} \ No newline at end of file diff --git a/src/main/webapp/StatAlgoImporter.css b/src/main/webapp/StatAlgoImporter.css index 00f0d46..42f1e09 100644 --- a/src/main/webapp/StatAlgoImporter.css +++ b/src/main/webapp/StatAlgoImporter.css @@ -5,3 +5,6 @@ }*/ +#drop_target_inner { + background-image: url("statalgoimporter/images/upload_128.png") !important; +} \ No newline at end of file diff --git a/src/main/webapp/statalgoimporter/images/explorer_dragndrop.png b/src/main/webapp/statalgoimporter/images/explorer_dragndrop.png deleted file mode 100644 index 0f1ac75..0000000 Binary files a/src/main/webapp/statalgoimporter/images/explorer_dragndrop.png and /dev/null differ diff --git a/src/main/webapp/statalgoimporter/images/upload_128.png b/src/main/webapp/statalgoimporter/images/upload_128.png new file mode 100644 index 0000000..758cfce Binary files /dev/null and b/src/main/webapp/statalgoimporter/images/upload_128.png differ