From 0cf84d28986cdb85ad7a5f2002e69298a13948b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
 <anian.buehler@reutlingen-university.de>
Date: Wed, 10 Nov 2021 11:30:55 +0100
Subject: [PATCH] removed const-var -> replaced by #defines

---
 .../translator/block/didacticnetwork/PsnSetInterval.java    | 1 -
 .../block/numbers/SetterVariableDigitalBlock.java           | 6 +++---
 .../translator/block/numbers/SetterVariableNumberBlock.java | 6 +++---
 .../block/numbers/SetterVariableNumberByteBlock.java        | 6 +++---
 .../block/numbers/SetterVariableNumberFloatBlock.java       | 6 +++---
 .../block/numbers/SetterVariableNumberLongBlock.java        | 6 +++---
 .../numbers/SetterVariableNumberUnsignedLongBlock.java      | 6 +++---
 7 files changed, 18 insertions(+), 19 deletions(-)

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 7ae5b94..9a92899 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 7a7aafc..eb9cad9 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 efbe2f9..b2dc3ac 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 52e3ac0..5fc474c 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 ec6d8e2..a61f771 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 0a6614c..c951cdc 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 5f88760..94a5140 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";
   }
-- 
GitLab