From 0584c82a7278df13942242752725667df50c13a1 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:27:07 +0100
Subject: [PATCH] reorganized psn-Blocks from communication to didaktic network

---
 .../PsnBrokerBlock.java                       |  2 +-
 .../PsnCallbackBlock.java                     |  2 +-
 .../PsnClientBlock.java                       |  2 +-
 .../PsnDataToSendBlock.java                   |  2 +-
 .../PsnHandleNetBlock.java                    |  2 +-
 .../PsnPublishBlock.java                      |  2 +-
 .../PsnPublishOnChangeBlock.java              |  5 ++--
 .../PsnPublishOnChangeBoolBlock.java          |  2 +-
 .../PsnSetInterval.java                       |  2 +-
 .../PsnSubscribeBlock.java                    |  2 +-
 .../PsnUnsubscribeBlock.java                  |  2 +-
 .../ardublock/block/block-mapping.properties  | 26 +++++++++----------
 12 files changed, 26 insertions(+), 25 deletions(-)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnBrokerBlock.java (96%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnCallbackBlock.java (98%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnClientBlock.java (97%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnDataToSendBlock.java (94%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnHandleNetBlock.java (94%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnPublishBlock.java (96%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnPublishOnChangeBlock.java (88%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnPublishOnChangeBoolBlock.java (96%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnSetInterval.java (95%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnSubscribeBlock.java (95%)
 rename src/main/java/com/ardublock/translator/block/{communication => didacticnetwork}/PsnUnsubscribeBlock.java (95%)

diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java
similarity index 96%
rename from src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java
index 7a361a4..8134f55 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnBrokerBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnBrokerBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java
similarity index 98%
rename from src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java
index 8c733a8..7ff453b 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnCallbackBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnCallbackBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import java.util.ResourceBundle;
 
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java
similarity index 97%
rename from src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java
index 68b708a..383e044 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnClientBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnClientBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java
similarity index 94%
rename from src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java
index cede9e3..fe17f56 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnDataToSendBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnDataToSendBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java
similarity index 94%
rename from src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java
index a0df4ef..da5422b 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnHandleNetBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnHandleNetBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java
similarity index 96%
rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java
index f692239..42fd13c 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java
similarity index 88%
rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java
index cbdebbf..c8a6947 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
@@ -32,6 +32,7 @@ public class PsnPublishOnChangeBlock extends TranslatorBlock
 		//String name = tb_name.toCode().replaceAll("\\s*_.new\\b\\s*\"", "").replaceAll("\"", "");
 		String topic = tb_topic.toCode().replaceAll("\\s*_.new\\b\\s*", "");
 		String data = tb_data.toCode().replaceAll("\\s*_.new\\b\\s*", "");
+		String threshold = tb_threshold.toCode().replaceAll("\\s*_.new\\b\\s*", "");
 		
 		//TODO: test f check for VarBlock is needed
 		if(!(tb_topic instanceof StringBlock)) {
@@ -41,6 +42,6 @@ public class PsnPublishOnChangeBlock extends TranslatorBlock
 			data = data.replaceAll("\"", "");
 		}
 		
-		return name + ".publishOnChange("+topic+", "+data+", "+tb_threshold+");";
+		return name + ".publishOnChange("+topic+", "+data+", "+threshold+");";
 	}
 }
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java
similarity index 96%
rename from src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java
index 75c772e..f5611ca 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnPublishOnChangeBoolBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnPublishOnChangeBoolBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java
similarity index 95%
rename from src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java
index 39f2196..7ae5b94 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnSetInterval.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSetInterval.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java
similarity index 95%
rename from src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java
index 47b1491..ad1f825 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnSubscribeBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnSubscribeBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java
similarity index 95%
rename from src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java
rename to src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java
index 9cf43a4..a38210e 100644
--- a/src/main/java/com/ardublock/translator/block/communication/PsnUnsubscribeBlock.java
+++ b/src/main/java/com/ardublock/translator/block/didacticnetwork/PsnUnsubscribeBlock.java
@@ -1,4 +1,4 @@
-package com.ardublock.translator.block.communication;
+package com.ardublock.translator.block.didacticnetwork;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
diff --git a/src/main/resources/com/ardublock/block/block-mapping.properties b/src/main/resources/com/ardublock/block/block-mapping.properties
index 4a3f53e..320108d 100644
--- a/src/main/resources/com/ardublock/block/block-mapping.properties
+++ b/src/main/resources/com/ardublock/block/block-mapping.properties
@@ -252,19 +252,19 @@ tele_read_data_frame=com.ardublock.translator.block.communication.TelegramReadDa
 mqtt_set_frame=com.ardublock.translator.block.communication.MQTTSetFrameBlock
 mqtt_read_frame=com.ardublock.translator.block.communication.MQTTReadFrameBlock
 
-psn_broker=com.ardublock.translator.block.communication.PsnBrokerBlock
-psn_client=com.ardublock.translator.block.communication.PsnClientBlock
-psn_callback=com.ardublock.translator.block.communication.PsnCallbackBlock
-psn_handle_network=com.ardublock.translator.block.communication.PsnHandleNetBlock
-psn_data_to_send=com.ardublock.translator.block.communication.PsnDataToSendBlock
-psn_set_interval=com.ardublock.translator.block.communication.PsnSetInterval
-psn_publish=com.ardublock.translator.block.communication.PsnPublishBlock
-psn_publish_analog=com.ardublock.translator.block.communication.PsnPublishBlock
-psn_publish_digital=com.ardublock.translator.block.communication.PsnPublishBlock
-psn_publish_onchange=com.ardublock.translator.block.communication.PsnPublishOnChangeBlock
-psn_publish_onchange_bool=com.ardublock.translator.block.communication.PsnPublishOnChangeBoolBlock
-psn_subscribe=com.ardublock.translator.block.communication.PsnSubscribeBlock
-psn_unsubscribe=com.ardublock.translator.block.communication.PsnUnsubscribeBlock
+psn_broker=com.ardublock.translator.block.didacticnetwork.PsnBrokerBlock
+psn_client=com.ardublock.translator.block.didacticnetwork.PsnClientBlock
+psn_callback=com.ardublock.translator.block.didacticnetwork.PsnCallbackBlock
+psn_handle_network=com.ardublock.translator.block.didacticnetwork.PsnHandleNetBlock
+psn_data_to_send=com.ardublock.translator.block.didacticnetwork.PsnDataToSendBlock
+psn_set_interval=com.ardublock.translator.block.didacticnetwork.PsnSetInterval
+psn_publish=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
+psn_publish_analog=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
+psn_publish_digital=com.ardublock.translator.block.didacticnetwork.PsnPublishBlock
+psn_publish_onchange=com.ardublock.translator.block.didacticnetwork.PsnPublishOnChangeBlock
+psn_publish_onchange_bool=com.ardublock.translator.block.didacticnetwork.PsnPublishOnChangeBoolBlock
+psn_subscribe=com.ardublock.translator.block.didacticnetwork.PsnSubscribeBlock
+psn_unsubscribe=com.ardublock.translator.block.didacticnetwork.PsnUnsubscribeBlock
 
 #STORAGE
 #****************************
-- 
GitLab