diff --git a/bundles/org.openhab.binding.adorne/.classpath b/bundles/org.openhab.binding.adorne/.classpath index a5d95095ccaaf..1a0c5608f3440 100644 --- a/bundles/org.openhab.binding.adorne/.classpath +++ b/bundles/org.openhab.binding.adorne/.classpath @@ -28,5 +28,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032d4..0000000000000 --- a/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.amazondashbutton/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032d4..0000000000000 --- a/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.dlinksmarthome/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.goecharger/.classpath b/bundles/org.openhab.binding.goecharger/.classpath index e74dbb099f67d..a5d95095ccaaf 100755 --- a/bundles/org.openhab.binding.goecharger/.classpath +++ b/bundles/org.openhab.binding.goecharger/.classpath @@ -1,49 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.helios/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.helios/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032d4..0000000000000 --- a/bundles/org.openhab.binding.helios/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.helios/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.helios/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.helios/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.hpprinter/.classpath b/bundles/org.openhab.binding.hpprinter/.classpath index 39abf1c5e9102..a5d95095ccaaf 100644 --- a/bundles/org.openhab.binding.hpprinter/.classpath +++ b/bundles/org.openhab.binding.hpprinter/.classpath @@ -28,22 +28,5 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPStatus.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPStatus.java index 3fe86c8858c3a..c35b77179f511 100644 --- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPStatus.java +++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/api/HPStatus.java @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -31,7 +32,7 @@ public class HPStatus { private static final Map STATUS_MESSAGES = initializeStatus(); - private final String printerStatus; + private final @Nullable String printerStatus; public HPStatus(Document document) { NodeList nodes = document.getDocumentElement().getElementsByTagName("psdyn:Status"); @@ -61,7 +62,7 @@ private static Map initializeStatus() { return statusMap; } - public String getPrinterStatus() { - return STATUS_MESSAGES.getOrDefault(printerStatus, printerStatus); + public @Nullable String getPrinterStatus() { + return STATUS_MESSAGES.get(printerStatus); } } diff --git a/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java b/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java index 0ce7a7e58493b..5170bd3b2d60d 100644 --- a/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java +++ b/bundles/org.openhab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudAccountBridgeHandler.java @@ -117,7 +117,7 @@ public void dispose() { } public void findMyDevice(String deviceId) throws IOException { - if(connection == null) { + if (connection == null) { logger.debug("Can't send Find My Device request, because connection is null!"); return; } @@ -136,13 +136,13 @@ private void startHandler() { try { logger.debug("iCloud bridge starting handler ..."); ICloudAccountThingConfiguration config = getConfigAs(ICloudAccountThingConfiguration.class); - final String appleId = config.appleId; - final String password = config.password; - if(appleId != null || password != null) { - connection = new ICloudConnection(appleId, password); - } - else { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Apple ID/Password is not set!"); + final String localAppleId = config.appleId; + final String localPassword = config.password; + if (localAppleId != null && localPassword != null) { + connection = new ICloudConnection(localAppleId, localPassword); + } else { + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, + "Apple ID/Password is not set!"); return; } refreshJob = scheduler.scheduleWithFixedDelay(this::refreshData, 0, config.refreshTimeInMinutes, MINUTES); @@ -167,7 +167,7 @@ public void refreshData() { try { ICloudAccountDataResponse iCloudData = deviceInformationParser.parse(json); - if(iCloudData == null) { + if (iCloudData == null) { return; } int statusCode = Integer.parseUnsignedInt(iCloudData.getICloudAccountStatusCode()); diff --git a/bundles/org.openhab.binding.innogysmarthome/.classpath b/bundles/org.openhab.binding.innogysmarthome/.classpath index 66499b2691224..1e90622db6085 100644 --- a/bundles/org.openhab.binding.innogysmarthome/.classpath +++ b/bundles/org.openhab.binding.innogysmarthome/.classpath @@ -39,5 +39,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java index 169258249476f..3ce5b6b78ebbd 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java @@ -20,6 +20,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -191,19 +192,21 @@ public final List getReadSpec(Configuration configuration) throws K } public final @Nullable InboundSpec getListenSpec(Configuration configuration, GroupAddress groupAddress) { - return getAllGAKeys().stream() + Optional result = getAllGAKeys().stream() .map(key -> new ListenSpecImpl(parse((String) configuration.get(key)), getDefaultDPT(key))) .filter(spec -> !spec.getGroupAddresses().isEmpty()) - .filter(spec -> spec.getGroupAddresses().contains(groupAddress)).findFirst().orElse(null); + .filter(spec -> spec.getGroupAddresses().contains(groupAddress)).findFirst(); + return result.isPresent() ? result.get() : null; } protected abstract String getDefaultDPT(String gaConfigKey); public final @Nullable OutboundSpec getResponseSpec(Configuration configuration, GroupAddress groupAddress, Type type) throws KNXFormatException { - return getAllGAKeys().stream() + Optional result = getAllGAKeys().stream() .map(key -> new ReadResponseSpecImpl(parse((String) configuration.get(key)), getDefaultDPT(key), type)) - .filter(spec -> groupAddress.equals(spec.getGroupAddress())).findFirst().orElse(null); + .filter(spec -> groupAddress.equals(spec.getGroupAddress())).findFirst(); + return result.isPresent() ? result.get() : null; } @Override diff --git a/bundles/org.openhab.binding.lgwebos/.classpath b/bundles/org.openhab.binding.lgwebos/.classpath index 91356226c1031..d9d5781e78700 100644 --- a/bundles/org.openhab.binding.lgwebos/.classpath +++ b/bundles/org.openhab.binding.lgwebos/.classpath @@ -28,5 +28,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.linuxinput/.project b/bundles/org.openhab.binding.linuxinput/.project index 7ff6828107364..3371a6039a23a 100644 --- a/bundles/org.openhab.binding.linuxinput/.project +++ b/bundles/org.openhab.binding.linuxinput/.project @@ -1,6 +1,6 @@ - org.openhab.binding.astro + org.openhab.binding.linuxinput diff --git a/bundles/org.openhab.binding.logreader/.classpath b/bundles/org.openhab.binding.logreader/.classpath index 90f9930589be9..fe9ce049bd73d 100644 --- a/bundles/org.openhab.binding.logreader/.classpath +++ b/bundles/org.openhab.binding.logreader/.classpath @@ -6,12 +6,7 @@ - - - - - - + @@ -26,6 +21,7 @@ + diff --git a/bundles/org.openhab.binding.loxone/.classpath b/bundles/org.openhab.binding.loxone/.classpath index 7737f39c03922..e4e8378010c11 100644 --- a/bundles/org.openhab.binding.loxone/.classpath +++ b/bundles/org.openhab.binding.loxone/.classpath @@ -18,7 +18,12 @@ - + + + + + + diff --git a/bundles/org.openhab.binding.millheat/.classpath b/bundles/org.openhab.binding.millheat/.classpath index a5d95095ccaaf..1a0c5608f3440 100644 --- a/bundles/org.openhab.binding.millheat/.classpath +++ b/bundles/org.openhab.binding.millheat/.classpath @@ -28,5 +28,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647eef851..0000000000000 --- a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec6fc0a9..0000000000000 --- a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.mqtt.generic/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99956411..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec6fc0a9..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homeassistant/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647eef851..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec6fc0a9..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.mqtt.homie/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99956411..0000000000000 --- a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec6fc0a9..0000000000000 --- a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.mqtt/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.networkupstools/.classpath b/bundles/org.openhab.binding.networkupstools/.classpath index 28eb6e75a21bb..99c9b95851b89 100644 --- a/bundles/org.openhab.binding.networkupstools/.classpath +++ b/bundles/org.openhab.binding.networkupstools/.classpath @@ -39,5 +39,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/owserver/OwserverConnection.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/owserver/OwserverConnection.java index 80b954f33f6f8..7e092c64b748d 100644 --- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/owserver/OwserverConnection.java +++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/owserver/OwserverConnection.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -116,24 +117,27 @@ public void stop() { * * @return a list of device ids */ - public List getDirectory(String basePath) throws OwException { + public @NonNullByDefault({}) List getDirectory(String basePath) throws OwException { OwserverPacket requestPacket = new OwserverPacket(OwserverMessageType.DIRALL, basePath); OwserverPacket returnPacket = request(requestPacket); if ((returnPacket.getReturnCode() != -1) && returnPacket.hasPayload()) { connectionErrorCounter = 0; - return Arrays.stream(returnPacket.getPayloadString().split(",")).map(s -> { - try { - return new SensorId(s); - } catch (IllegalArgumentException e) { - return null; - } - }).filter(s -> s != null).collect(Collectors.toList()); + return Arrays.stream(returnPacket.getPayloadString().split(",")).map(this::stringToSensorId) + .filter(Objects::nonNull).collect(Collectors.toList()); } else { throw new OwException("invalid of empty packet"); } } + private @Nullable SensorId stringToSensorId(String s) { + try { + return new SensorId(s); + } catch (IllegalArgumentException e) { + return null; + } + } + /** * check sensor presence * diff --git a/bundles/org.openhab.binding.sensibo/.classpath b/bundles/org.openhab.binding.sensibo/.classpath new file mode 100644 index 0000000000000..002ad570e2e58 --- /dev/null +++ b/bundles/org.openhab.binding.sensibo/.classpath @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.sensibo/.project b/bundles/org.openhab.binding.sensibo/.project new file mode 100644 index 0000000000000..3885765c4b987 --- /dev/null +++ b/bundles/org.openhab.binding.sensibo/.project @@ -0,0 +1,23 @@ + + + org.openhab.binding.sensibo + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/bundles/org.openhab.binding.smartmeter/.classpath b/bundles/org.openhab.binding.smartmeter/.classpath index 581b05c1a76d3..fe9ce049bd73d 100644 --- a/bundles/org.openhab.binding.smartmeter/.classpath +++ b/bundles/org.openhab.binding.smartmeter/.classpath @@ -6,12 +6,7 @@ - - - - - - + @@ -19,13 +14,14 @@ + - + diff --git a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.core.resources.prefs b/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032d4..0000000000000 --- a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec6fc0a9..0000000000000 --- a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.m2e.core.prefs b/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/bundles/org.openhab.binding.synopanalyzer/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/bundles/org.openhab.binding.telegram/.classpath b/bundles/org.openhab.binding.telegram/.classpath index 5d788f3a5f722..e0d54b38dac99 100644 --- a/bundles/org.openhab.binding.telegram/.classpath +++ b/bundles/org.openhab.binding.telegram/.classpath @@ -28,22 +28,5 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.binding.tplinksmarthome/.classpath b/bundles/org.openhab.binding.tplinksmarthome/.classpath index 7737f39c03922..e4e8378010c11 100644 --- a/bundles/org.openhab.binding.tplinksmarthome/.classpath +++ b/bundles/org.openhab.binding.tplinksmarthome/.classpath @@ -18,7 +18,12 @@ - + + + + + + diff --git a/bundles/org.openhab.binding.valloxmv/.classpath b/bundles/org.openhab.binding.valloxmv/.classpath index 39abf1c5e9102..a5d95095ccaaf 100644 --- a/bundles/org.openhab.binding.valloxmv/.classpath +++ b/bundles/org.openhab.binding.valloxmv/.classpath @@ -28,22 +28,5 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.binding.velux/.classpath b/bundles/org.openhab.binding.velux/.classpath new file mode 100644 index 0000000000000..a5d95095ccaaf --- /dev/null +++ b/bundles/org.openhab.binding.velux/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.openhab.binding.velux/.project b/bundles/org.openhab.binding.velux/.project new file mode 100644 index 0000000000000..e49cf15609981 --- /dev/null +++ b/bundles/org.openhab.binding.velux/.project @@ -0,0 +1,23 @@ + + + org.openhab.binding.velux + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/bundles/org.openhab.binding.xmppclient/.classpath b/bundles/org.openhab.binding.xmppclient/.classpath index 39abf1c5e9102..a5d95095ccaaf 100644 --- a/bundles/org.openhab.binding.xmppclient/.classpath +++ b/bundles/org.openhab.binding.xmppclient/.classpath @@ -28,22 +28,5 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.openhab.binding.yamahareceiver/.classpath b/bundles/org.openhab.binding.yamahareceiver/.classpath index a5d95095ccaaf..1a0c5608f3440 100644 --- a/bundles/org.openhab.binding.yamahareceiver/.classpath +++ b/bundles/org.openhab.binding.yamahareceiver/.classpath @@ -28,5 +28,11 @@ + + + + + + diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceDescriptorXML.java b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceDescriptorXML.java index f1b4684b34915..8ebbb9ac64996 100644 --- a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceDescriptorXML.java +++ b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/DeviceDescriptorXML.java @@ -164,7 +164,7 @@ public void load(XMLConnection con) { unitName = descNode.getAttributes().getNamedItem("Unit_Name").getTextContent(); system = buildFeatureLookup(descNode, "Unit", tag -> tag, (tag, e) -> new SystemDescriptor(e)) - .getOrDefault("System", null); // there will be only one System entry + .getOrDefault("System", this.system); // there will be only one System entry zones = buildFeatureLookup(descNode, "Subunit", tag -> YamahaUtils.tryParseEnum(Zone.class, tag), (zone, e) -> new ZoneDescriptor(zone, e)); diff --git a/bundles/org.openhab.binding.zoneminder/.classpath b/bundles/org.openhab.binding.zoneminder/.classpath index be8ecc494d521..615608997a6c5 100644 --- a/bundles/org.openhab.binding.zoneminder/.classpath +++ b/bundles/org.openhab.binding.zoneminder/.classpath @@ -20,7 +20,6 @@ - diff --git a/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.core.resources.prefs b/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb123ec3..0000000000000 --- a/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.m2e.core.prefs b/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb238..0000000000000 --- a/itests/org.openhab.binding.mqtt.homie.tests/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1