From c223b6a48d4d5f2d9bfe3a588fcd9ecc39ed71b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
<anian.buehler@reutlingen-university.de>
Date: Wed, 27 Jan 2021 13:44:00 +0100
Subject: [PATCH] code and commend without string-blocks
---
.../translator/block/code/CodeBlock.java | 4 ++-
.../translator/block/code/CodeHeadBlock.java | 6 +++-
.../translator/block/code/CommentBlock.java | 10 ++++++-
.../block/code/CommentHeadBlock.java | 10 +++++++
.../com/ardublock/block/ardublock.properties | 4 +--
.../com/ardublock/block/ardublock.xml | 28 +++++++++----------
.../ardublock/block/ardublock_de.properties | 4 +--
7 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ardublock/translator/block/code/CodeBlock.java b/src/main/java/com/ardublock/translator/block/code/CodeBlock.java
index 1dce608..83932e6 100644
--- a/src/main/java/com/ardublock/translator/block/code/CodeBlock.java
+++ b/src/main/java/com/ardublock/translator/block/code/CodeBlock.java
@@ -15,6 +15,7 @@ public class CodeBlock extends TranslatorBlock
@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
+ /*Old version with String-Blocks
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
String ret = translatorBlock.toCode();
//remove " from StringBlock but leave " from user input
@@ -23,6 +24,7 @@ public class CodeBlock extends TranslatorBlock
}else {
ret = ret.replaceAll("\"", "")+"\n";
}
- return ret;
+ */
+ return label;
}
}
diff --git a/src/main/java/com/ardublock/translator/block/code/CodeHeadBlock.java b/src/main/java/com/ardublock/translator/block/code/CodeHeadBlock.java
index 23ba359..3d077b4 100644
--- a/src/main/java/com/ardublock/translator/block/code/CodeHeadBlock.java
+++ b/src/main/java/com/ardublock/translator/block/code/CodeHeadBlock.java
@@ -15,6 +15,7 @@ public class CodeHeadBlock extends TranslatorBlock
@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
+ /*Old version with String-Blocks
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
String ret = translatorBlock.toCode();
//remove " from StringBlock but leave " from user input
@@ -22,8 +23,11 @@ public class CodeHeadBlock extends TranslatorBlock
ret = ret.replaceAll("\"\"", "\"")+"\n";//.replaceAll("\"", "")+"\n";
}else {
ret = ret.replaceAll("\"", "")+"\n";
- }
+ }
translator.addDefinitionCommand(ret);
+ */
+ translator.addDefinitionCommand(label);
return "";
+
}
}
diff --git a/src/main/java/com/ardublock/translator/block/code/CommentBlock.java b/src/main/java/com/ardublock/translator/block/code/CommentBlock.java
index 4a3bc97..524d566 100644
--- a/src/main/java/com/ardublock/translator/block/code/CommentBlock.java
+++ b/src/main/java/com/ardublock/translator/block/code/CommentBlock.java
@@ -17,10 +17,18 @@ public class CommentBlock extends TranslatorBlock
@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
+ /*Old version with String-Blocks
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
String comment = translatorBlock.toCode().replaceAll("\"", "");
String ret = "\n//"+ comment+"\n";
- return ret;
+ return ret;*/
+
+ if(label.startsWith("//")){
+ return "\n"+ label+"\n";
+ }
+ else {
+ return "\n//"+ label+"\n";
+ }
}
@Override
diff --git a/src/main/java/com/ardublock/translator/block/code/CommentHeadBlock.java b/src/main/java/com/ardublock/translator/block/code/CommentHeadBlock.java
index d1795cb..f014a9d 100644
--- a/src/main/java/com/ardublock/translator/block/code/CommentHeadBlock.java
+++ b/src/main/java/com/ardublock/translator/block/code/CommentHeadBlock.java
@@ -18,11 +18,21 @@ public class CommentHeadBlock extends TranslatorBlock
@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
+ /*Old version with String-Blocks
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
String comment = translatorBlock.toCode().replaceAll("\"", "");
String ret = "\n//"+ comment+"\n";
translator.addDefinitionCommand(ret);
return "";
+ */
+
+ if(label.startsWith("//")){
+ translator.addDefinitionCommand( "\n"+ label+"\n");
+ }
+ else {
+ translator.addDefinitionCommand("\n//"+ label+"\n");
+ }
+ return "";
}
@Override
diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
index 0dd8141..6b81154 100644
--- a/src/main/resources/com/ardublock/block/ardublock.properties
+++ b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -795,9 +795,9 @@ bg.codeDivider2=| c-code insert |
bg.program_comment=program description
bg.code_head=add code on Head
-bg.code_comment_head=add comment // to program head
+bg.code_comment_head=//add comment to program head
bg.code_loop=add code
-bg.code_comment= add comment //
+bg.code_comment= //add comment
bg.program_comment.description=Add information about the program
bg.code_loop.description=Add custom code
diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml
index 540c353..7009af6 100644
--- a/src/main/resources/com/ardublock/block/ardublock.xml
+++ b/src/main/resources/com/ardublock/block/ardublock.xml
@@ -2531,7 +2531,7 @@
<BlockGenus name="codeDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.codeDivider1" color="150 150 150" />
<BlockGenus name="codeDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.codeDivider2" color="150 150 150" />
- <BlockGenus name="program_comment" kind="command" color="0 176 80" initlabel="bg.program_comment" is-starter="yes" is-terminator="yes" label-unique="no">
+ <BlockGenus name="program_comment" kind="command" color="58 65 65" initlabel="bg.program_comment" is-starter="yes" is-terminator="yes" label-unique="no">
<description>
<text>add comment</text>
</description>
@@ -2548,52 +2548,52 @@
<BlockConnector connector-type="string" connector-kind="socket" />
<BlockConnector connector-type="string" connector-kind="socket" />
<BlockConnector connector-type="string" connector-kind="socket" label="bc.prog_date">
- <DefaultArg genus-name="string" label="01.01.2019" />
+ <DefaultArg genus-name="string" label="01.01.2021" />
</BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="bc.prog_version">
<DefaultArg genus-name="number" label="0.1" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
- <BlockGenus name="code_loop" kind="command" color="0 176 80" initlabel="bg.code_loop">
+ <BlockGenus name="code_loop" kind="command" color="0 176 80" editable-label="yes" initlabel="bg.code_loop">
<description>
<text>add custom code</text>
</description>
- <BlockConnectors>
+ <!-- <BlockConnectors>
<BlockConnector connector-type="string" connector-kind="socket">
<DefaultArg genus-name="string" label="i = 1;" />
</BlockConnector>
- </BlockConnectors>
+ </BlockConnectors>-->
</BlockGenus>
- <BlockGenus name="code_head" kind="command" color="0 176 80" initlabel="bg.code_head">
+ <BlockGenus name="code_head" kind="command" color="0 176 80" editable-label="yes" initlabel="bg.code_head">
<description>
<text>add custom code</text>
</description>
- <BlockConnectors>
+ <!--<BlockConnectors>
<BlockConnector connector-type="string" connector-kind="socket">
<DefaultArg genus-name="string" label="int i = 0;" />
</BlockConnector>
- </BlockConnectors>
+ </BlockConnectors>-->
</BlockGenus>
- <BlockGenus name="code_comment_head" kind="command" color="0 176 80" initlabel="bg.code_comment_head">
+ <BlockGenus name="code_comment_head" kind="command" color="58 65 65" editable-label="yes" initlabel="bg.code_comment_head">
<description>
<text>add comment to program head</text>
</description>
- <BlockConnectors>
+ <!-- <BlockConnectors>
<BlockConnector connector-type="string" connector-kind="socket">
<DefaultArg genus-name="string" label="Kommentartext;" />
</BlockConnector>
- </BlockConnectors>
+ </BlockConnectors>-->
</BlockGenus>
- <BlockGenus name="code_comment" kind="command" color="0 176 80" initlabel="bg.code_comment">
+ <BlockGenus name="code_comment" kind="command" color="58 65 65" editable-label="yes" initlabel="bg.code_comment">
<description>
<text>add comment</text>
</description>
- <BlockConnectors>
+ <!-- <BlockConnectors>
<BlockConnector connector-type="string" connector-kind="socket">
<DefaultArg genus-name="string" label="Kommentartext" />
</BlockConnector>
- </BlockConnectors>
+ </BlockConnectors>-->
</BlockGenus>
</BlockGenuses>
diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties
index 39b0844..059f372 100644
--- a/src/main/resources/com/ardublock/block/ardublock_de.properties
+++ b/src/main/resources/com/ardublock/block/ardublock_de.properties
@@ -791,9 +791,9 @@ bg.codeDivider2=| C-Code einfuegen |
bg.program_comment=Programmkopf
bg.code_head=Code im globalen Bereich
-bg.code_comment_head=Kommentar im globalen Bereich einfuegen
+bg.code_comment_head=//Kommentar im globalen Bereich einfuegen
bg.code_loop=Code einfuegen
-bg.code_comment=Kommentar einfuegen
+bg.code_comment=//Kommentar einfuegen
bg.program_comment.description=Programmbeschreibung und Informationen als Kommentar anfügen
bg.code_loop.description=Code an dieser Stelle einfügen
--
GitLab