public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[insteon] sort the channels by channel id so they show up sorted in the ui (#8966)

Browse Source 
Signed-off-by: Rob Nielsen <rob.nielsen@yahoo.com>
This commit is contained in:
robnielsen 2020-11-11 13:29:55 -06:00 committed by GitHub
parent 258f709ab8
commit 3c3e9adbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java
View File

@ -226,8 +226,7 @@ public class InsteonDeviceHandler extends BaseThingHandler {
return; return;
} }
StringBuilder channelList = new StringBuilder(); Map<String, Channel> channelMap = new HashMap<>();
List<Channel> channels = new ArrayList<>();
String thingId = getThing().getUID().getAsString(); String thingId = getThing().getUID().getAsString();
for (String channelId : ALL_CHANNEL_IDS) { for (String channelId : ALL_CHANNEL_IDS) {
String feature = channelId.toLowerCase(); String feature = channelId.toLowerCase();
@ -272,7 +271,7 @@ public class InsteonDeviceHandler extends BaseThingHandler {
for (Channel channel : thing.getChannels()) { for (Channel channel : thing.getChannels()) {
String id = channel.getUID().getId(); String id = channel.getUID().getId();
if (id.startsWith(InsteonBindingConstants.BROADCAST_ON_OFF)) { if (id.startsWith(InsteonBindingConstants.BROADCAST_ON_OFF)) {
addChannel(channel, id, channels, channelList); channelMap.put(id, channel);
broadcastChannels.add(id); broadcastChannels.add(id);
} }
} }
@ -295,7 +294,7 @@ public class InsteonDeviceHandler extends BaseThingHandler {
.createChannelBuilder(channelUID, channelTypeUID).withLabel(id) .createChannelBuilder(channelUID, channelTypeUID).withLabel(id)
.build(); .build();
addChannel(channel, id, channels, channelList); channelMap.put(id, channel);
broadcastChannels.add(id); broadcastChannels.add(id);
} }
} else { } else {
@ -323,7 +322,7 @@ public class InsteonDeviceHandler extends BaseThingHandler {
channel = callback.createChannelBuilder(channelUID, channelTypeUID).build(); channel = callback.createChannelBuilder(channelUID, channelTypeUID).build();
} }
addChannel(channel, channelId, channels, channelList); channelMap.put(channelId, channel);
} }
} else { } else {
logger.debug("{} is a feature group for {}. It will not be added as a channel.", feature, logger.debug("{} is a feature group for {}. It will not be added as a channel.", feature,
@ -332,8 +331,24 @@ public class InsteonDeviceHandler extends BaseThingHandler {
} }
} }
if (!channels.isEmpty() || device.isModem()) { if (!channelMap.isEmpty() || device.isModem()) {
if (!channels.isEmpty()) { List<Channel> channels = new ArrayList<>();
StringBuilder channelList = new StringBuilder();
if (!channelMap.isEmpty()) {
List<String> channelIds = new ArrayList<>(channelMap.keySet());
Collections.sort(channelIds);
channelIds.forEach(channelId -> {
Channel channel = channelMap.get(channelId);
if (channel != null) {
channels.add(channel);
if (channelList.length() > 0) {
channelList.append(", ");
}
channelList.append(channelId);
}
});
updateThing(editThing().withChannels(channels).build()); updateThing(editThing().withChannels(channels).build());
} }
@ -367,15 +382,6 @@ public class InsteonDeviceHandler extends BaseThingHandler {
}); });
} }
private void addChannel(Channel channel, String channelId, List<Channel> channels, StringBuilder channelList) {
channels.add(channel);
if (channelList.length() > 0) {
channelList.append(", ");
}
channelList.append(channelId);
}
@Override @Override
public void dispose() { public void dispose() {
InsteonDeviceConfiguration config = this.config; InsteonDeviceConfiguration config = this.config;