Added sorting of channels by name on reading new configuration.

ppieczul · Jun 10, 2017 · 814f433 · 814f433
1 parent ee53f80
commit 814f433
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Loxone Binding
 Bundle-SymbolicName: org.openhab.binding.loxone;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.1.0.10
+Bundle-Version: 2.1.0.11
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Import-Package: 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.openhab.binding</groupId>
   <artifactId>org.openhab.binding.loxone</artifactId>
-  <version>2.1.0-10</version>
+  <version>2.1.0-11</version>
 
   <name>Loxone Binding</name>
   <packaging>eclipse-plugin</packaging>

diff --git a/src/main/java/org/openhab/binding/loxone/handler/LoxoneMiniserverHandler.java b/src/main/java/org/openhab/binding/loxone/handler/LoxoneMiniserverHandler.java
@@ -17,6 +17,7 @@
 import java.nio.channels.Channels;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -256,6 +257,13 @@ public void onNewConfig(LxServer server) {
             }
         }
 
+        channels.sort(new Comparator<Channel>() {
+            @Override
+            public int compare(Channel c1, Channel c2) {
+                return c1.getLabel().compareTo(c2.getLabel());
+            }
+        });
+
         builder.withChannels(channels);
         updateThing(builder.build());
     }