From 95cd4ef237ca0a91a9a1ad7791ca6765c50702c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Korima?= <tomas.korima@certicon.cz>
Date: Fri, 16 Jul 2021 14:34:53 +0200
Subject: [PATCH] Null-safe Dragmanager

functioning null-safe code
---
 api/pom.xml                                   |  2 +-
 core/pom.xml                                  |  2 +-
 .../core/selections/SelectionDragManager.java | 21 +++++++++++++++----
 demo/pom.xml                                  |  2 +-
 model/pom.xml                                 |  2 +-
 pom.xml                                       |  4 ++--
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 60b14648..ebf98443 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.tesis.dynaware</groupId>
 		<artifactId>de.tesis.dynaware.grapheditor</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 	<name>${component.name}::API</name>
 
diff --git a/core/pom.xml b/core/pom.xml
index 6b2302e4..79ec4797 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.tesis.dynaware</groupId>
 		<artifactId>de.tesis.dynaware.grapheditor</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 	<name>${component.name}::Core</name>
 
diff --git a/core/src/main/java/de/tesis/dynaware/grapheditor/core/selections/SelectionDragManager.java b/core/src/main/java/de/tesis/dynaware/grapheditor/core/selections/SelectionDragManager.java
index 3af17d3b..1418fcd5 100644
--- a/core/src/main/java/de/tesis/dynaware/grapheditor/core/selections/SelectionDragManager.java
+++ b/core/src/main/java/de/tesis/dynaware/grapheditor/core/selections/SelectionDragManager.java
@@ -5,6 +5,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import javafx.beans.value.ChangeListener;
 import javafx.scene.layout.Region;
@@ -274,7 +275,10 @@ private void addPositionListeners(final Region master, final GModel model) {
                 if (nodeSkin.isSelected() && !nodeSkin.getRoot().equals(master)) {
 
                     final Region slave1 = nodeSkin.getRoot();
-                    slave1.setLayoutX((Double) n + nodeLayoutXOffsets.get(node));
+                    Double offset = nodeLayoutXOffsets.get(node);
+                    if(offset != null) {
+                        slave1.setLayoutX((Double) n + offset);
+                    }
                 }
             }
 
@@ -287,7 +291,10 @@ private void addPositionListeners(final Region master, final GModel model) {
                     if (jointSkin.isSelected() && !jointSkin.getRoot().equals(master)) {
 
                         final Region slave2 = jointSkin.getRoot();
-                        slave2.setLayoutX((Double) n + jointLayoutXOffsets.get(joint));
+                        Double offset = jointLayoutXOffsets.get(joint);
+                        if(offset != null) {
+                            slave2.setLayoutX((Double) n + offset);
+                        }
                     }
                 }
             }
@@ -302,7 +309,10 @@ private void addPositionListeners(final Region master, final GModel model) {
                 if (nodeSkin.isSelected() && !nodeSkin.getRoot().equals(master)) {
 
                     final Region slave1 = nodeSkin.getRoot();
-                    slave1.setLayoutY((Double) n + nodeLayoutYOffsets.get(node));
+                    Double offset = nodeLayoutYOffsets.get(node);
+                    if(offset != null) {
+                        slave1.setLayoutY((Double) n + offset);
+                    }
                 }
             }
 
@@ -315,7 +325,10 @@ private void addPositionListeners(final Region master, final GModel model) {
                     if (jointSkin.isSelected() && !jointSkin.getRoot().equals(master)) {
 
                         final Region slave2 = jointSkin.getRoot();
-                        slave2.setLayoutY((Double) n + jointLayoutYOffsets.get(joint));
+                        Double offset = jointLayoutYOffsets.get(joint);
+                        if(offset != null) {
+                            slave2.setLayoutY((Double) n + offset);
+                        }
                     }
                 }
             }
diff --git a/demo/pom.xml b/demo/pom.xml
index f85d8889..6b279820 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.tesis.dynaware</groupId>
 		<artifactId>de.tesis.dynaware.grapheditor</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 	<name>${component.name}::Demo</name>
 
diff --git a/model/pom.xml b/model/pom.xml
index f559b873..44978fb6 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.tesis.dynaware</groupId>
 		<artifactId>de.tesis.dynaware.grapheditor</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 	<name>${component.name}::Model</name>
 
diff --git a/pom.xml b/pom.xml
index c0bd446f..204c53f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<name>${component.name}</name>
 	<groupId>de.tesis.dynaware</groupId>
 	<artifactId>de.tesis.dynaware.grapheditor</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 	<packaging>pom</packaging>
 
 	<description>A library for creating and editing graph-like diagrams in JavaFX</description>
@@ -41,7 +41,7 @@
 
 	<properties>
 		<component.name>Graph Editor</component.name>
-		<manifest.bundle.version>1.3.1-${maven.build.timestamp}</manifest.bundle.version>
+		<manifest.bundle.version>1.3.2-${maven.build.timestamp}</manifest.bundle.version>
 		<maven.build.timestamp.format>yyyymmddhhmm</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<compiler.version>1.8</compiler.version>