From 0c8ad1cfba99852469a556a49026180165a0f03c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 20 Jan 2016 09:45:44 +0000 Subject: [PATCH] 1452: Implement a GUI for StatMan Algorithms Importer Task-Url: https://support.d4science.org/issues/1452 Fixed Parser git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@122337 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/StatAlgoImporter.java | 2 +- .../client/codeparser/CodeParser.java | 12 ++++++++++-- .../client/resource/SAIStyles.css | 9 +++++++++ .../{StatAlgoImporterCSS.java => SAIStyles.java} | 5 +++-- .../client/resource/StatAlgoImporter.css | 12 ------------ .../resource/StatAlgoImporterResources.java | 4 ++-- .../client/resource/SAIStyles.css | 9 +++++++++ .../client/resource/StatAlgoImporter.css | 11 ----------- src/main/webapp/StatAlgoImporter.css | 3 +++ .../images/explorer_dragndrop.png | Bin 1268 -> 0 bytes .../statalgoimporter/images/upload_128.png | Bin 0 -> 3488 bytes 11 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css rename src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/{StatAlgoImporterCSS.java => SAIStyles.java} (84%) delete mode 100644 src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css create mode 100644 src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/SAIStyles.css delete mode 100644 src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporter.css delete mode 100644 src/main/webapp/statalgoimporter/images/explorer_dragndrop.png create mode 100644 src/main/webapp/statalgoimporter/images/upload_128.png 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 0f1ac752622e3c44fcea7f702f331a2b497b0e81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1268 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