[sling-org-apache-sling-provisioning-model] 09/19: SLING-4768 : Sort entries alphabetical in written model

[rombert]

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

rombert pushed a commit to annotated tag 
org.apache.sling.provisioning.model-1.2.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git

commit ee04adc589e1f7630a781ef882a6a2748731bfff
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Jun 1 18:23:34 2015 +0000

    SLING-4768 : Sort entries alphabetical in written model
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1682970
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/provisioning/model/ArtifactGroup.java   | 8 ++++++++
 src/main/java/org/apache/sling/provisioning/model/ItemList.java   | 4 +---
 src/main/java/org/apache/sling/provisioning/model/RunMode.java    | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java 
b/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
index ef38dc2..aa939b3 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.provisioning.model;
 
+import java.util.Collections;
+
 
 /**
  * A artifact group holds a set of artifacts.
@@ -36,6 +38,12 @@ public class ArtifactGroup extends ItemList<Artifact>
         this.level = startLevel;
     }
 
+    @Override
+    public void add(Artifact item) {
+        super.add(item);
+        Collections.sort(super.items);
+    }
+
     /**
      * Get the start level.
      * @return The start level.
diff --git a/src/main/java/org/apache/sling/provisioning/model/ItemList.java 
b/src/main/java/org/apache/sling/provisioning/model/ItemList.java
index c021b4b..8aa2a0a 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ItemList.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ItemList.java
@@ -17,14 +17,13 @@
 package org.apache.sling.provisioning.model;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
 /**
  * Helper class to hold a list of items.
  */
-public class ItemList<T extends Comparable>
+public class ItemList<T>
     extends Commentable
     implements Iterable<T> {
 
@@ -37,7 +36,6 @@ public class ItemList<T extends Comparable>
      */
     public void add(final T item) {
         this.items.add(item);
-        Collections.sort(this.items);
     }
 
     /**
diff --git a/src/main/java/org/apache/sling/provisioning/model/RunMode.java 
b/src/main/java/org/apache/sling/provisioning/model/RunMode.java
index 66a9240..d1fc7cd 100644
--- a/src/main/java/org/apache/sling/provisioning/model/RunMode.java
+++ b/src/main/java/org/apache/sling/provisioning/model/RunMode.java
@@ -213,6 +213,7 @@ public class RunMode
         if ( found == null ) {
             found = new Configuration(pid, factoryPid);
             this.configurations.add(found);
+            Collections.sort(this.configurations.items);
         }
         return found;
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.