diff --git a/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java index 7ae5b94e1651b4cd51feca3ddd6bfd84bf174f46..9a92899e75df4378725a05edb0e315830d42607c 100644 --- a/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java +++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java @@ -4,7 +4,6 @@ import com.ardublock.translator.Translator; import com.ardublock.translator.block.TranslatorBlock; import com.ardublock.translator.block.exception.SocketNullException; import com.ardublock.translator.block.exception.SubroutineNotDeclaredException; -import com.ardublock.translator.block.numbers.StringBlock; public class PsnSetInterval extends TranslatorBlock diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableDigitalBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableDigitalBlock.java index 7a7aafcf7405ca19ec63a60a693f04240a0950a9..eb9cad9d104c975b5f6f03af6fa89f7715eef657 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableDigitalBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableDigitalBlock.java @@ -35,7 +35,7 @@ public class SetterVariableDigitalBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableDigitalBlock) && !(tb_Name instanceof LocalVariableDigitalBlock) && !(tb_Name instanceof ConstantDigitalBlock)) { + if (!(tb_Name instanceof VariableDigitalBlock) && !(tb_Name instanceof LocalVariableDigitalBlock)) {// && !(tb_Name instanceof ConstantDigitalBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.digital_var_slot")); } @@ -57,7 +57,7 @@ public class SetterVariableDigitalBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantDigitalBlock) ){ + /*else if ((tb_Name instanceof ConstantDigitalBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -71,7 +71,7 @@ public class SetterVariableDigitalBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; } diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberBlock.java index efbe2f9826077ca4332410c24cf35f28ea075b72..b2dc3acf8deed70b3791af852be43335257d20d4 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberBlock.java @@ -35,7 +35,7 @@ public class SetterVariableNumberBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock) && !(tb_Name instanceof ConstantNumberBlock)) { + if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock)){// && !(tb_Name instanceof ConstantNumberBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_var_slot")); } @@ -56,7 +56,7 @@ public class SetterVariableNumberBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantNumberBlock) ){ + /*else if ((tb_Name instanceof ConstantNumberBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -66,7 +66,7 @@ public class SetterVariableNumberBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; } diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberByteBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberByteBlock.java index 52e3ac0d028c97387c150a18ac3d1ab9a97c2e36..5fc474c946359884d940c641b24edf87f075f612 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberByteBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberByteBlock.java @@ -30,7 +30,7 @@ public class SetterVariableNumberByteBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock) && !(tb_Name instanceof ConstantNumberBlock)) { + if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock)){// && !(tb_Name instanceof ConstantNumberBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_var_slot")); } @@ -52,7 +52,7 @@ public class SetterVariableNumberByteBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantNumberBlock) ){ + /*else if ((tb_Name instanceof ConstantNumberBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -62,7 +62,7 @@ public class SetterVariableNumberByteBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; } diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberFloatBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberFloatBlock.java index ec6d8e21cf7be13277658230bf4bd756a256f911..a61f7715cd959ae64982985629b3590481428948 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberFloatBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberFloatBlock.java @@ -31,7 +31,7 @@ public class SetterVariableNumberFloatBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock) && !(tb_Name instanceof ConstantNumberBlock)) { + if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock)){// && !(tb_Name instanceof ConstantNumberBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_var_slot")); } @@ -53,7 +53,7 @@ public class SetterVariableNumberFloatBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantNumberBlock) ){ + /*else if ((tb_Name instanceof ConstantNumberBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -63,7 +63,7 @@ public class SetterVariableNumberFloatBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; } diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberLongBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberLongBlock.java index 0a6614ccf72642c6e274e19c2222fb7083ad1855..c951cdc276362c01c46ed2d6f855e0f3629eeb49 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberLongBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberLongBlock.java @@ -31,7 +31,7 @@ public class SetterVariableNumberLongBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock) && !(tb_Name instanceof ConstantNumberBlock)) { + if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock)){// && !(tb_Name instanceof ConstantNumberBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_var_slot")); } @@ -52,7 +52,7 @@ public class SetterVariableNumberLongBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantNumberBlock) ){ + /*else if ((tb_Name instanceof ConstantNumberBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -62,7 +62,7 @@ public class SetterVariableNumberLongBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; } diff --git a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberUnsignedLongBlock.java b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberUnsignedLongBlock.java index 5f887607b79888fb84a1720f73e0319353e9d827..94a514011b11d291c6402edc9708f77bd5b50d50 100644 --- a/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberUnsignedLongBlock.java +++ b/src/main/java/com/ardublock/translator/block/numbers/SetterVariableNumberUnsignedLongBlock.java @@ -31,7 +31,7 @@ public class SetterVariableNumberUnsignedLongBlock extends TranslatorBlock TranslatorBlock tb_Value = this.getRequiredTranslatorBlockAtSocket(1); String value = tb_Value.toCode().replaceAll(regex, ""); - if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock) && !(tb_Name instanceof ConstantNumberBlock)) { + if (!(tb_Name instanceof VariableNumberBlock) && !(tb_Name instanceof LocalVariableNumberBlock)){// && !(tb_Name instanceof ConstantNumberBlock)) { throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_var_slot")); } @@ -53,7 +53,7 @@ public class SetterVariableNumberUnsignedLongBlock extends TranslatorBlock } } //CONSTANT - else if ((tb_Name instanceof ConstantNumberBlock) ){ + /*else if ((tb_Name instanceof ConstantNumberBlock) ){ if(variableName.contains(newMarker)){ variableName = variableName.replaceAll(regex, ""); translator.addNumberVariable(variableName, variableName); //remove the "new" Tag after declaration @@ -63,7 +63,7 @@ public class SetterVariableNumberUnsignedLongBlock extends TranslatorBlock throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.number_const_write")); } return ""; //Break without return value if CONST is used - } + }*/ return variableName + " = " + value + suffix + ";\n"; }