From 4cee192bf19f04ceb4ec7cb94fdcf66eb8cac02a Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Fri, 12 Oct 2018 16:49:25 +0200
Subject: [PATCH] Move HierarchicalNameComparator to
org.fortiss.tooling.kernel.utils
* This is neither tooling.base nor UI specific
* Retain GREEN ratings since there is no change in the code (only the
class comment has slightly been updated)
Issue-Ref: 3223
Issue-Url: https://af3-developer.fortiss.org/issues/3223
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/base/ui/annotation/.ratings | 1 -
.../tooling/base/ui/annotation/editingsupport/.ratings | 2 +-
.../ui/annotation/editingsupport/LabelValueMapping.java | 2 +-
.../tooling/base/ui/annotation/view/generic/.ratings | 2 +-
.../view/generic/HierarchicalNameViewerComparator.java | 4 ++--
.../src/org/fortiss/tooling/kernel/utils/.ratings | 1 +
.../tooling/kernel/utils}/HierarchicalNameComparator.java | 6 +++---
7 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/.ratings
rename {org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation => org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils}/HierarchicalNameComparator.java (94%)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/.ratings
deleted file mode 100644
index c969d7cd1..000000000
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/.ratings
+++ /dev/null
@@ -1 +0,0 @@
-HierarchicalNameComparator.java 479dc1a3da772e551d15cbfb0d820cce87c15d63 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/.ratings
index e5c979070..4fba611b1 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/.ratings
@@ -5,7 +5,7 @@ EditingSupportFactory.java 03123559abc2952e417e6180b9364c2f5ecff4a3 GREEN
ElementCommentEditingSupport.java 4be366924a040caf3f80e35b383e796e84aedcac GREEN
ElementEditingSupportBase.java a6360f99ee149276f0fbd299820ebd1c9731ea97 GREEN
ElementNameEditingSupport.java 0dcaecf4ba5f8ddefa3ccb7d6f4e4506f7f09b26 GREEN
-LabelValueMapping.java 54bf09ebd23039827a72dfbe9edb3d117f2db607 GREEN
+LabelValueMapping.java 51fa603929b0e89f5fb2d757761746bd773ba371 GREEN
MultiSelectionCellEditor.java cac4a63137203ea90777b8ff971c945a457165c2 GREEN
MultiSelectionEditingSupport.java c9d45d09c2d64518d58e6e62254804608638a0ed GREEN
TextEditingSupport.java e761ea393816f23ca41157f2a9a9a8d8ef30b858 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
index 54bf09ebd..51fa60392 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.EReference;
import org.fortiss.tooling.base.annotation.valueprovider.EStructuralFeatureDescriptor;
import org.fortiss.tooling.base.annotation.valueprovider.EStructuralFeatureDescriptor.EReferenceScope;
import org.fortiss.tooling.base.model.element.IAnnotatedSpecification;
-import org.fortiss.tooling.base.ui.annotation.HierarchicalNameComparator;
import org.fortiss.tooling.kernel.model.IIdLabeled;
import org.fortiss.tooling.kernel.model.INamedElement;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
+import org.fortiss.tooling.kernel.utils.HierarchicalNameComparator;
/**
* Translates between the labels shown in a GUI and actual model elements (=values) (e.g.,
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
index 98070c396..d9bd0b9aa 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/.ratings
@@ -1,3 +1,3 @@
ColumnHandle.java 8fc5f04cbb0127e5df8c7a9e3b2620502bf93716 GREEN
GenericAnnotationView.java 9ece325e33056bc866aa842a7be5e0be3db84fe0 GREEN
-HierarchicalNameViewerComparator.java 393f888a671d788c05650d17c937b76dda8a0f43 GREEN
+HierarchicalNameViewerComparator.java c12e9216387618c518f7e7c15d21179a86aad472 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
index 393f888a6..c12e92163 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
@@ -15,14 +15,14 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui.annotation.view.generic;
-import static org.fortiss.tooling.base.ui.annotation.HierarchicalNameComparator.compareByNameIdHashCode;
+import static org.fortiss.tooling.kernel.utils.HierarchicalNameComparator.compareByNameIdHashCode;
import java.util.Comparator;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.fortiss.tooling.base.annotation.AnnotationEntry;
-import org.fortiss.tooling.base.ui.annotation.HierarchicalNameComparator;
+import org.fortiss.tooling.kernel.utils.HierarchicalNameComparator;
/**
* {@link ViewerComparator} that sorts rows according to hierarchy level. Elements within one
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings
index cf66d0bab..7990a2299 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings
+++ b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings
@@ -4,6 +4,7 @@ EMFResourceUtils.java 979d0e1f4f66a2b3e715d2da0ebef6493f547fd7 GREEN
EcoreSerializerBase.java 0a0c2969d793d2e68094c55c8f7b0a662ef6e5d5 GREEN
EcoreUtils.java ffb428de083b536cd06e875e75484706f2149c2a GREEN
ExtensionPointUtils.java 7ce63242b49eb9a7cd4eaadd223f5ebce1dfd75b GREEN
+HierarchicalNameComparator.java 7bd2d55a57374134ba210852ff94956886947a32 GREEN
IdentifierUtils.java fff43dc4e84cdd89c3ece4f5d9d89aec4b0749c2 GREEN
JavaUtils.java 65cdadfb9137a240ad59992eacf53a15b7f20804 GREEN
KernelModelElementUtils.java a7fa0e2596e06195634e3163b23fa376b2420920 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/HierarchicalNameComparator.java
similarity index 94%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java
rename to org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/HierarchicalNameComparator.java
index 479dc1a3d..7bd2d55a5 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java
+++ b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/HierarchicalNameComparator.java
@@ -13,7 +13,7 @@
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
-package org.fortiss.tooling.base.ui.annotation;
+package org.fortiss.tooling.kernel.utils;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getModelElementAncestor;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.getModelElementLevel;
@@ -23,8 +23,8 @@ import org.fortiss.tooling.kernel.model.IIdLabeled;
import org.fortiss.tooling.kernel.model.INamedElement;
/**
- * Comparator that sorts rows according to hierarchy level. Elements within one hierarchy level
- * are sorted by name.
+ * Comparator whose {@link #compare(EObject, EObject)} method sorts {@link EObject} model elements
+ * according to hierarchy level. Elements within one hierarchy level are sorted by name.
*
* @author eder, diewald, barner
*/
--
GitLab