[nifi] branch support/nifi-1.x updated: NIFI-12237 change label height and width from POSITION to SIZE difference (#7889)

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 33773c772e NIFI-12237 change label height and width from POSITION to 
SIZE difference (#7889)
33773c772e is described below

commit 33773c772ee693e8fe52c76c86011a05eb8a03eb
Author: Michael Moser <mose...@apache.org>
AuthorDate: Wed Oct 18 12:56:19 2023 -0400

    NIFI-12237 change label height and width from POSITION to SIZE difference 
(#7889)
---
 .../nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java | 3 +++
 .../main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java | 5 +++++
 .../org/apache/nifi/registry/flow/diff/StandardFlowComparator.java   | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
index 3fc4e4b1bf..b0f1bc6ea7 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
@@ -71,6 +71,9 @@ public class ConciseEvolvingDifferenceDescriptor implements 
DifferenceDescriptor
             case POSITION_CHANGED:
                 description = "Position was changed";
                 break;
+            case SIZE_CHANGED:
+                description = "Size was changed";
+                break;
             case BENDPOINTS_CHANGED:
                 description = "Connection Bendpoints changed";
                 break;
diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
index 219aff4642..b54fd5dd00 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
@@ -205,6 +205,11 @@ public enum DifferenceType {
      */
     POSITION_CHANGED("Position Changed"),
 
+    /**
+     * The height and/or width size of the component is different in each of 
the flows
+     */
+    SIZE_CHANGED("Size Changed"),
+
     /**
      * The stylistic configuration of the component is different in each of 
the flows
      */
diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
index be21d97069..4762c03bf5 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
@@ -441,8 +441,8 @@ public class StandardFlowComparator implements 
FlowComparator {
         }
 
         addIfDifferent(differences, DifferenceType.LABEL_VALUE_CHANGED, 
labelA, labelB, VersionedLabel::getLabel);
-        addIfDifferent(differences, DifferenceType.POSITION_CHANGED, labelA, 
labelB, VersionedLabel::getHeight);
-        addIfDifferent(differences, DifferenceType.POSITION_CHANGED, labelA, 
labelB, VersionedLabel::getWidth);
+        addIfDifferent(differences, DifferenceType.SIZE_CHANGED, labelA, 
labelB, VersionedLabel::getHeight);
+        addIfDifferent(differences, DifferenceType.SIZE_CHANGED, labelA, 
labelB, VersionedLabel::getWidth);
         addIfDifferent(differences, DifferenceType.STYLE_CHANGED, labelA, 
labelB, VersionedLabel::getStyle);
         addIfDifferent(differences, DifferenceType.ZINDEX_CHANGED, labelA, 
labelB, VersionedLabel::getzIndex);
     }