demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 19:55:48 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Changed comparison from equals() to reference (#1817)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-11-14 13:46:03 +01:00 committed by GitHub
parent 8102cffb7f
commit 7cb746ece1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
View File

@ -90,7 +90,7 @@ public class ChannelCommandDescriptionProvider implements CommandDescriptionProv
CommandDescription dynamicCommandDescription = dynamicCommandDescriptionProvider CommandDescription dynamicCommandDescription = dynamicCommandDescriptionProvider
.getCommandDescription(channel, originalCommandDescription, locale); .getCommandDescription(channel, originalCommandDescription, locale);
if (dynamicCommandDescription != null) { if (dynamicCommandDescription != null) {
if (dynamicCommandDescription.equals(originalCommandDescription)) { if (dynamicCommandDescription == originalCommandDescription) {
logger.error( logger.error(
"Dynamic command description matches original command description. DynamicCommandDescriptionProvider implementations must never return the original command description. {} has to be fixed.", "Dynamic command description matches original command description. DynamicCommandDescriptionProvider implementations must never return the original command description. {} has to be fixed.",
dynamicCommandDescription.getClass()); dynamicCommandDescription.getClass());

17
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
View File

@ -100,12 +100,12 @@ public class ChannelStateDescriptionProvider implements StateDescriptionFragment
ChannelType channelType = thingTypeRegistry.getChannelType(channel, locale); ChannelType channelType = thingTypeRegistry.getChannelType(channel, locale);
if (channelType != null) { if (channelType != null) {
stateDescription = channelType.getState(); stateDescription = channelType.getState();
if ((channelType.getItemType() != null) String itemType = channelType.getItemType();
&& ((stateDescription == null) || (stateDescription.getPattern() == null))) { if (itemType != null && (stateDescription == null || stateDescription.getPattern() == null)) {
String pattern = null; String pattern = null;
if (CoreItemFactory.STRING.equalsIgnoreCase(channelType.getItemType())) { if (CoreItemFactory.STRING.equalsIgnoreCase(itemType)) {
pattern = "%s"; pattern = "%s";
} else if (channelType.getItemType().startsWith(CoreItemFactory.NUMBER)) { } else if (itemType.startsWith(CoreItemFactory.NUMBER)) {
pattern = "%.0f"; pattern = "%.0f";
} }
if (pattern != null) { if (pattern != null) {
@ -131,14 +131,15 @@ public class ChannelStateDescriptionProvider implements StateDescriptionFragment
private @Nullable StateDescription getDynamicStateDescription(Channel channel, private @Nullable StateDescription getDynamicStateDescription(Channel channel,
@Nullable StateDescription originalStateDescription, @Nullable Locale locale) { @Nullable StateDescription originalStateDescription, @Nullable Locale locale) {
for (DynamicStateDescriptionProvider provider : dynamicStateDescriptionProviders) { for (DynamicStateDescriptionProvider provider : dynamicStateDescriptionProviders) {
StateDescription stateDescription = provider.getStateDescription(channel, originalStateDescription, locale); StateDescription dynamicStateDescription = provider.getStateDescription(channel, originalStateDescription,
if (stateDescription != null) { locale);
if (stateDescription.equals(originalStateDescription)) { if (dynamicStateDescription != null) {
if (dynamicStateDescription == originalStateDescription) {
logger.error( logger.error(
"Dynamic state description matches original state description. DynamicStateDescriptionProvider implementations must never return the original state description. {} has to be fixed.", "Dynamic state description matches original state description. DynamicStateDescriptionProvider implementations must never return the original state description. {} has to be fixed.",
provider.getClass()); provider.getClass());
} else { } else {
return stateDescription; return dynamicStateDescription;
} }
} }
} }