removed const-var -> replaced by #defines

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

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";
 	}

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";
 	}

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";
 	}

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";
   }

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";
   }

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";
   }