From 3c972b9f92d6f6448dbe793ce19791571e9e7ae0 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sun, 2 Feb 2025 14:43:29 +0100 Subject: [PATCH] Fix typos (#18193) * Fix typo: occured * Fix typo: transfered Signed-off-by: Jacob Laursen --- .../philipstv/PhilipsTVConnectionManager.java | 4 ++-- .../OH-INF/i18n/androidtv.properties | 4 ++-- .../handler/BlueGigaBridgeHandler.java | 20 +++++++++---------- .../bluez/internal/BlueZBluetoothDevice.java | 2 +- .../internal/EnoceanBleRockerHandler.java | 2 +- .../internal/BluetoothDiscoveryService.java | 2 +- .../lib/listener/ConnectionListener.java | 2 +- .../handler/EnOceanBridgeHandler.java | 2 +- .../transceiver/EnOceanESP2Transceiver.java | 2 +- .../transceiver/EnOceanESP3Transceiver.java | 2 +- .../transceiver/EnOceanTransceiver.java | 12 +++++------ .../transceiver/TransceiverErrorListener.java | 2 +- .../FlicSimpleclientDiscoveryServiceImpl.java | 2 +- .../handler/FlicDaemonBridgeHandler.java | 2 +- .../OH-INF/i18n/freeboxos.properties | 4 ++-- .../resources/OH-INF/thing/channel-types.xml | 4 ++-- .../ftpupload/internal/ftp/SimpleFtpFile.java | 2 +- .../internal/handler/ICalendarHandler.java | 2 +- .../handler/ICloudAccountBridgeHandler.java | 2 +- .../binding/ihc/internal/ChannelUtils.java | 4 ++-- .../ihc/internal/handler/IhcHandler.java | 10 +++++----- .../binding/ihc/internal/ws/IhcClient.java | 2 +- .../ihc/internal/ws/IhcEventListener.java | 2 +- .../ws/datatypes/WSControllerState.java | 2 +- .../ihc/internal/ws/datatypes/WSFile.java | 2 +- .../internal/ws/datatypes/WSLoginResult.java | 2 +- .../ws/datatypes/WSNumberOfSegments.java | 2 +- .../internal/ws/datatypes/WSProjectInfo.java | 2 +- .../ws/datatypes/WSSegmentationSize.java | 2 +- .../internal/ws/datatypes/WSSystemInfo.java | 2 +- .../ws/datatypes/WSTimeManagerSettings.java | 2 +- .../ihc/internal/ws/http/IhcHttpsClient.java | 2 +- .../ws/projectfile/ProjectFileUtils.java | 4 ++-- .../services/IhcAirlinkManagementService.java | 2 +- .../IhcResourceInteractionService.java | 4 ++-- .../handler/IpCameraGroupHandler.java | 2 +- .../internal/onvif/OnvifConnection.java | 4 ++-- .../internal/rtsp/RtspConnection.java | 2 +- .../internal/handler/BlasterHandler.java | 2 +- .../handler/EthernetBridgeHandler.java | 6 +++--- .../internal/protocol/KodiClientSocket.java | 2 +- .../internal/handler/LgTvSerialHandler.java | 2 +- .../protocol/serial/LGSerialCommunicator.java | 4 ++-- .../internal/connector/LIRCConnector.java | 2 +- .../internal/connector/LIRCEventListener.java | 4 ++-- .../internal/handler/LIRCBridgeHandler.java | 4 ++-- .../binding/loxone/internal/LxWebSocket.java | 2 +- .../internal/handler/MagentaTVControl.java | 2 +- .../auth/OpenHabOAuthTokenRefresher.java | 4 ++-- .../internal/handler/MiIoLumiHandler.java | 2 +- .../protocol/MilightV6SessionManager.java | 2 +- .../protocol/NibeHeatPumpProtocolStates.java | 2 +- .../protocol/nhc2/NhcNotification2.java | 2 +- .../internal/owserver/OwserverConnection.java | 2 +- .../onkyo/internal/handler/OnkyoHandler.java | 2 +- .../model/PlugwiseHAControllerRequest.java | 4 ++-- .../OH-INF/i18n/regoheatpump.properties | 2 +- .../resources/OH-INF/thing/thing-types.xml | 2 +- .../smartmeter/internal/MeterDevice.java | 2 +- .../internal/handler/SncfBridgeHandler.java | 2 +- .../internal/action/TelegramActions.java | 2 +- .../internal/handlers/WLedBridgeHandler.java | 4 ++-- .../internal/handlers/WLedSegmentHandler.java | 2 +- .../binding/ntp/server/SimpleNTPServer.java | 2 +- 64 files changed, 98 insertions(+), 98 deletions(-) diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/philipstv/PhilipsTVConnectionManager.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/philipstv/PhilipsTVConnectionManager.java index 25ac388950b..a8b41647882 100644 --- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/philipstv/PhilipsTVConnectionManager.java +++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/protocol/philipstv/PhilipsTVConnectionManager.java @@ -302,13 +302,13 @@ public class PhilipsTVConnectionManager implements DiscoveryListener { initPairingCodeRetrieval(target); } catch (IOException | NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, - "offline.error-occured-while-presenting-pairing-code"); + "offline.error-occurred-while-presenting-pairing-code"); } } else { boolean hasFailed = initCredentialsRetrieval(target, command.toString()); if (hasFailed) { postUpdateThing(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, - "offline.error-occured-during-retrieval-of-credentials"); + "offline.error-occurred-during-retrieval-of-credentials"); return; } readConfigs(); diff --git a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties index 516cb24bbe4..058d0f4ace3 100644 --- a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties +++ b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/i18n/androidtv.properties @@ -165,8 +165,8 @@ offline.interrupted = Interrupted offline.io-error = I/O Error offline.runtime-exception = Runtime exception offline.user-forced-pin-process = User Forced PIN Process -offline.error-occured-while-presenting-pairing-code = Error occurred while trying to present a Pairing Code on TV -offline.error-occured-during-retrieval-of-credentials = Error occurred during retrieval of credentials +offline.error-occurred-while-presenting-pairing-code = Error occurred while trying to present a Pairing Code on TV +offline.error-occurred-during-retrieval-of-credentials = Error occurred during retrieval of credentials offline.pairing-is-not-configured-yet = Pairing is not configured yet offline.error-occurred-while-trying-to-present-a-pairing-code-on-tv = Error occurred while trying to present a Pairing Code on TV offline.pairing-code-is-available-but-credentials-missing = Pairing Code is available, but credentials missing. Trying to retrieve them diff --git a/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java b/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java index 58a5a1cabef..ef81b390e83 100644 --- a/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java +++ b/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/handler/BlueGigaBridgeHandler.java @@ -514,7 +514,7 @@ public class BlueGigaBridgeHandler extends AbstractBluetoothBridgeHandler { if (t != null) { - logger.warn("Error occured during discovery of {}", device.getAddress(), t); + logger.warn("Error occurred during discovery of {}", device.getAddress(), t); } }); diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ConnectionListener.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ConnectionListener.java index 17be31cdb78..881a3c0e569 100644 --- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ConnectionListener.java +++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ConnectionListener.java @@ -31,7 +31,7 @@ public interface ConnectionListener { */ final String CONNECTION_LOST = "connLost"; /** - * State, if a ssl handshake problem occured while communicating with the digitalSTROM-Server. + * State, if a ssl handshake problem occurred while communicating with the digitalSTROM-Server. */ final String SSL_HANDSHAKE_ERROR = "sslHandshakeError"; /** diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java index cf753df3e29..f733a192e7f 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java @@ -497,7 +497,7 @@ public class EnOceanBridgeHandler extends ConfigStatusBridgeHandler implements T } @Override - public void errorOccured(Throwable exception) { + public void errorOccurred(Throwable exception) { EnOceanTransceiver localTransceiver = transceiver; if (localTransceiver != null) { localTransceiver.shutDown(); diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP2Transceiver.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP2Transceiver.java index 137946ac9d4..a231a401e8c 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP2Transceiver.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP2Transceiver.java @@ -162,7 +162,7 @@ public class EnOceanESP2Transceiver extends EnOceanTransceiver { logger.trace("Unable to process message", ioexception); TransceiverErrorListener localListener = errorListener; if (localListener != null) { - localListener.errorOccured(ioexception); + localListener.errorOccurred(ioexception); } return; } diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP3Transceiver.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP3Transceiver.java index dc07a9bb35a..e04466cb704 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP3Transceiver.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanESP3Transceiver.java @@ -193,7 +193,7 @@ public class EnOceanESP3Transceiver extends EnOceanTransceiver { logger.trace("Unable to process message", ioexception); TransceiverErrorListener localListener = errorListener; if (localListener != null) { - localListener.errorOccured(ioexception); + localListener.errorOccurred(ioexception); } return; } diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java index caa3e68230a..4f463350389 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java @@ -135,7 +135,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { logger.trace("Unable to process message", e); TransceiverErrorListener localListener = errorListener; if (localListener != null) { - localListener.errorOccured(e); + localListener.errorOccurred(e); } return; } @@ -253,7 +253,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { try { localInputStream.close(); } catch (IOException e) { - logger.debug("IOException occured while closing the stream", e); + logger.debug("IOException occurred while closing the stream", e); } } this.readingTask = null; @@ -269,7 +269,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { try { localOutputStream.close(); } catch (IOException e) { - logger.debug("IOException occured while closing the output stream", e); + logger.debug("IOException occurred while closing the output stream", e); } } @@ -278,7 +278,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { try { localInputStream.close(); } catch (IOException e) { - logger.debug("IOException occured while closing the input stream", e); + logger.debug("IOException occurred while closing the input stream", e); } } @@ -315,7 +315,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { try { return localInputStream.read(buffer, 0, length); } catch (IOException e) { - logger.debug("IOException occured while reading the input stream", e); + logger.debug("IOException occurred while reading the input stream", e); return 0; } } else { @@ -327,7 +327,7 @@ public abstract class EnOceanTransceiver implements SerialPortEventListener { } TransceiverErrorListener localListener = errorListener; if (localListener != null) { - localListener.errorOccured(new IOException("Cannot read from null stream")); + localListener.errorOccurred(new IOException("Cannot read from null stream")); } return 0; } diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/TransceiverErrorListener.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/TransceiverErrorListener.java index 692acf0025c..e9c4171466f 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/TransceiverErrorListener.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/transceiver/TransceiverErrorListener.java @@ -21,5 +21,5 @@ import org.eclipse.jdt.annotation.NonNullByDefault; @NonNullByDefault public interface TransceiverErrorListener { - void errorOccured(Throwable exception); + void errorOccurred(Throwable exception); } diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java index 556c927b0cd..70883cebc41 100644 --- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java +++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java @@ -77,7 +77,7 @@ public class FlicSimpleclientDiscoveryServiceImpl extends AbstractDiscoveryServi discoverVerifiedButtons(); } } catch (IOException e) { - logger.warn("Error occured during button discovery", e); + logger.warn("Error occurred during button discovery", e); if (this.scanListener != null) { scanListener.onErrorOccurred(e); } diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java index 796f12f7894..fc20a6bc70f 100644 --- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java +++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java @@ -102,7 +102,7 @@ public class FlicDaemonBridgeHandler extends BaseBridgeHandler { flicClient.close(); logger.debug("Listening to flicd ended"); } catch (IOException e) { - logger.debug("Error occured while listening to flicd", e); + logger.debug("Error occurred while listening to flicd", e); } finally { if (Thread.currentThread().isInterrupted()) { onClientFailure(); diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties index 2eab11d68be..e077cb4bd9b 100644 --- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties +++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties @@ -371,8 +371,8 @@ channel-type.freeboxos.telephony-service.description = Status of the telephony s channel-type.freeboxos.temperature.label = Temperature channel-type.freeboxos.temperature.description = Actual measured temperature of the sensor channel-type.freeboxos.timestamp.label = Timestamp -channel-type.freeboxos.transfer-bytes.label = Transfered Bytes -channel-type.freeboxos.transfer-bytes.description = Total data transfered since last connection +channel-type.freeboxos.transfer-bytes.label = Transferred Bytes +channel-type.freeboxos.transfer-bytes.description = Total data transferred since last connection channel-type.freeboxos.transfer-rate-bps.label = Transfer Rate channel-type.freeboxos.transfer-rate-bps.description = Current transfer rate channel-type.freeboxos.transfer-rate.label = Transfer Rate diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/channel-types.xml index 01aafabbca0..0be15c04aad 100644 --- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/channel-types.xml +++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/channel-types.xml @@ -126,8 +126,8 @@ Number:DataAmount - - Total data transfered since last connection + + Total data transferred since last connection diff --git a/bundles/org.openhab.binding.ftpupload/src/main/java/org/openhab/binding/ftpupload/internal/ftp/SimpleFtpFile.java b/bundles/org.openhab.binding.ftpupload/src/main/java/org/openhab/binding/ftpupload/internal/ftp/SimpleFtpFile.java index d53dbd13cd3..aee5ac6818c 100644 --- a/bundles/org.openhab.binding.ftpupload/src/main/java/org/openhab/binding/ftpupload/internal/ftp/SimpleFtpFile.java +++ b/bundles/org.openhab.binding.ftpupload/src/main/java/org/openhab/binding/ftpupload/internal/ftp/SimpleFtpFile.java @@ -184,7 +184,7 @@ public class SimpleFtpFile implements FtpFile { logger.debug("File len: {}", d.length); return d; } catch (IllegalArgumentException e) { - logger.debug("Exception occured during data conversion: {}", e.getMessage()); + logger.debug("Exception occurred during data conversion: {}", e.getMessage()); } return null; } diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java index 8ed12a91fed..7e7e9574920 100644 --- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java +++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java @@ -268,7 +268,7 @@ public class ICalendarHandler extends BaseBridgeHandler implements CalendarUpdat } catch (IllegalArgumentException | IllegalStateException e) { logger.warn("Event: {}, Command Tag: {} => Unable to push command to target item!", event.title, cmdTag.getFullTag()); - logger.debug("Exception occured while pushing to item!", e); + logger.debug("Exception occurred while pushing to item!", e); } } } 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 97feab59d19..824093d001e 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 @@ -198,7 +198,7 @@ public class ICloudAccountBridgeHandler extends BaseBridgeHandler { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage()); return null; } catch (Exception e) { - logger.debug("Unexpected exception occured", e); + logger.debug("Unexpected exception occurred", e); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage()); return null; } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java index a4b699247af..f677e9d8a80 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java @@ -101,7 +101,7 @@ public class ChannelUtils { } } } catch (RuntimeException e) { - LOGGER.warn("Error occured when adding channels, reason: {}", e.getMessage(), e); + LOGGER.warn("Error occurred when adding channels, reason: {}", e.getMessage(), e); } try { @@ -122,7 +122,7 @@ public class ChannelUtils { } } } catch (RuntimeException e) { - LOGGER.warn("Error occured when adding channels, reason: {}", e.getMessage(), e); + LOGGER.warn("Error occurred when adding channels, reason: {}", e.getMessage(), e); } } else { LOGGER.warn("Project file data doesn't exist, can't automatically create channels!"); diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java index 40f0c0d5eb1..4e53f52cf29 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java @@ -572,7 +572,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { try { projectFile = ProjectFileUtils.readFromFile(filePath); } catch (IhcExecption e) { - logger.debug("Error occured when read project file from file '{}', reason {}", filePath, + logger.debug("Error occurred when read project file from file '{}', reason {}", filePath, e.getMessage(), e); loadProject = true; } @@ -591,7 +591,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { try { ProjectFileUtils.saveToFile(filePath, data); } catch (IhcExecption e) { - logger.warn("Error occured when trying to write data to file '{}', reason {}", filePath, + logger.warn("Error occurred when trying to write data to file '{}', reason {}", filePath, e.getMessage(), e); } projectFile = ProjectFileUtils.converteBytesToDocument(data); @@ -671,7 +671,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { } @Override - public void errorOccured(IhcExecption e) { + public void errorOccurred(IhcExecption e) { logger.warn("Error occurred on communication to IHC controller: {}", e.getMessage(), e); logger.debug("Reconnection request"); setReconnectRequest(true); @@ -724,7 +724,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { } catch (ConversionException e) { logger.warn("Channel param error, reason: {}.", e.getMessage(), e); } catch (RuntimeException e) { - logger.warn("Unknown error occured, reason: {}.", e.getMessage(), e); + logger.warn("Unknown error occurred, reason: {}.", e.getMessage(), e); } }); @@ -875,7 +875,7 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener { }); }); } catch (IhcExecption e) { - logger.debug("Error occured when fetching RF device information, reason: : {} ", e.getMessage(), e); + logger.debug("Error occurred when fetching RF device information, reason: : {} ", e.getMessage(), e); return; } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java index 5b910d4f192..cada0bc14c7 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java @@ -566,7 +566,7 @@ public class IhcClient { private void sendErrorEvent(IhcExecption err) { eventListeners.forEach(listener -> { try { - listener.errorOccured(err); + listener.errorOccurred(err); } catch (RuntimeException e) { logger.debug("Event listener invoking error.", e); } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcEventListener.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcEventListener.java index 44518b9c53b..31fdc40912c 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcEventListener.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcEventListener.java @@ -42,5 +42,5 @@ public interface IhcEventListener { * * @param e IhcException occurred. */ - void errorOccured(IhcExecption e); + void errorOccurred(IhcExecption e); } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSControllerState.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSControllerState.java index 82119df76ec..12795d25652 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSControllerState.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSControllerState.java @@ -64,7 +64,7 @@ public class WSControllerState { } return this; } catch (IOException | XPathExpressionException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSFile.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSFile.java index 3c2123136a1..8259a8d89bd 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSFile.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSFile.java @@ -80,7 +80,7 @@ public class WSFile { .getBytes(); return this; } catch (IOException | XPathExpressionException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSLoginResult.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSLoginResult.java index bf6933c5cc3..44167d21d70 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSLoginResult.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSLoginResult.java @@ -144,7 +144,7 @@ public class WSLoginResult { return this; } catch (IOException | XPathExpressionException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSNumberOfSegments.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSNumberOfSegments.java index 169367534e7..2a9e6ef01be 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSNumberOfSegments.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSNumberOfSegments.java @@ -59,7 +59,7 @@ public class WSNumberOfSegments { setNumberOfSegments(Integer.parseInt(value)); return this; } catch (IOException | XPathExpressionException | NumberFormatException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSProjectInfo.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSProjectInfo.java index f94c3780b30..3031c43fdcf 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSProjectInfo.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSProjectInfo.java @@ -254,7 +254,7 @@ public class WSProjectInfo { return this; } catch (IOException | XPathExpressionException | NumberFormatException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSegmentationSize.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSegmentationSize.java index 76dd04d1698..d9734b633ec 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSegmentationSize.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSegmentationSize.java @@ -59,7 +59,7 @@ public class WSSegmentationSize { setSegmentationSize(Integer.parseInt(value)); return this; } catch (IOException | XPathExpressionException | NumberFormatException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSystemInfo.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSystemInfo.java index 26c28a53f7e..3eb4d20781a 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSystemInfo.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSSystemInfo.java @@ -325,7 +325,7 @@ public class WSSystemInfo { return this; } catch (IOException | XPathExpressionException | NumberFormatException | DateTimeParseException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSTimeManagerSettings.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSTimeManagerSettings.java index 7b29da01410..ac143dacd05 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSTimeManagerSettings.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSTimeManagerSettings.java @@ -143,7 +143,7 @@ public class WSTimeManagerSettings { return this; } catch (IOException | XPathExpressionException | NumberFormatException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/http/IhcHttpsClient.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/http/IhcHttpsClient.java index b4fefbf46c5..531a5687962 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/http/IhcHttpsClient.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/http/IhcHttpsClient.java @@ -120,7 +120,7 @@ public abstract class IhcHttpsClient { return resp; } catch (Exception e) { if (logger.isTraceEnabled()) { - logger.trace("Exception occured (connectionPool={}, clientId={} requestId={}, in {}): {}", + logger.trace("Exception occurred (connectionPool={}, clientId={} requestId={}, in {}): {}", ihcConnectionPool.hashCode(), client.hashCode(), requestId, Duration.between(start, LocalDateTime.now()), e.getMessage()); } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/projectfile/ProjectFileUtils.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/projectfile/ProjectFileUtils.java index e52758e9a9c..dd81989192f 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/projectfile/ProjectFileUtils.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/projectfile/ProjectFileUtils.java @@ -96,7 +96,7 @@ public class ProjectFileUtils { DocumentBuilder builder = factory.newDocumentBuilder(); return builder.parse(new ByteArrayInputStream(data)); } catch (ParserConfigurationException | SAXException | IOException e) { - LOGGER.warn("Error occured when trying to convert data to XML, reason {}", e.getMessage()); + LOGGER.warn("Error occurred when trying to convert data to XML, reason {}", e.getMessage()); } return null; } @@ -134,7 +134,7 @@ public class ProjectFileUtils { } } } catch (RuntimeException e) { - LOGGER.debug("Error occured during project file date comparasion, reason {}.", e.getMessage(), e); + LOGGER.debug("Error occurred during project file date comparasion, reason {}.", e.getMessage(), e); // There is no documentation available for XML content. This is part of inessential feature, so do // nothing, but return false } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementService.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementService.java index 8cd6560af0f..59beb7701ca 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementService.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcAirlinkManagementService.java @@ -67,7 +67,7 @@ public class IhcAirlinkManagementService extends IhcBaseService { } return resourceValueList; } catch (IOException | XPathExpressionException | NumberFormatException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcResourceInteractionService.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcResourceInteractionService.java index 783cae75b56..2cd00e18e10 100644 --- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcResourceInteractionService.java +++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/services/IhcResourceInteractionService.java @@ -84,7 +84,7 @@ public class IhcResourceInteractionService extends IhcBaseService { throw new IhcExecption("No resource value found"); } } catch (XPathExpressionException | NumberFormatException | IOException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } @@ -484,7 +484,7 @@ public class IhcResourceInteractionService extends IhcBaseService { } return resourceValueList; } catch (XPathExpressionException | NumberFormatException | IOException e) { - throw new IhcExecption("Error occured during XML data parsing", e); + throw new IhcExecption("Error occurred during XML data parsing", e); } } } diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java index 0617a70a4f0..6e5e119d128 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraGroupHandler.java @@ -114,7 +114,7 @@ public class IpCameraGroupHandler extends BaseThingHandler { String file = handle.cameraConfig.getFfmpegOutput() + "ipcamera.m3u8"; camerasm3u8 = new String(Files.readAllBytes(Paths.get(file))); } catch (IOException e) { - logger.warn("Error occured fetching a groupDisplay cameras m3u8 file :{}", e.getMessage()); + logger.warn("Error occurred fetching a groupDisplay cameras m3u8 file :{}", e.getMessage()); } return camerasm3u8; } diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java index 9dae930ce32..77bbdc63275 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/onvif/OnvifConnection.java @@ -306,10 +306,10 @@ public class OnvifConnection { } } catch (IndexOutOfBoundsException e) { if (!isConnected) { - logger.debug("IndexOutOfBoundsException occured, camera is not connected via ONVIF: {}", + logger.debug("IndexOutOfBoundsException occurred, camera is not connected via ONVIF: {}", e.getMessage()); } else { - logger.debug("IndexOutOfBoundsException occured, {}", e.getMessage()); + logger.debug("IndexOutOfBoundsException occurred, {}", e.getMessage()); } } return "notfound"; diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/rtsp/RtspConnection.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/rtsp/RtspConnection.java index 9d353526ea9..54f1a91df0e 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/rtsp/RtspConnection.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/rtsp/RtspConnection.java @@ -153,7 +153,7 @@ public class RtspConnection { if (future.isDone() && future.isSuccess()) { Channel ch = future.channel(); ch.writeAndFlush(request); - } else { // an error occured + } else { // an error occurred logger.debug("Could not reach cameras rtsp on port 554."); } } diff --git a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java index 7409265ad6c..c70023cd536 100644 --- a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java +++ b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java @@ -85,7 +85,7 @@ public class BlasterHandler extends BaseThingHandler implements TransceiverStatu if (ircommand.matches(thingCompatibleCommand)) { if (!ethernetBridge.sendIRcommand(ircommand, Led.get((String) getConfig().get(LED)))) { - logger.warn("An error occured whilst sending the infrared command '{}' for Channel '{}'", + logger.warn("An error occurred whilst sending the infrared command '{}' for Channel '{}'", ircommand, channelUID); } } diff --git a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java index d9f8e898fc8..375c161ae59 100644 --- a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java +++ b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java @@ -296,7 +296,7 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei channelUID); } else { logger.warn( - "An error occured whilst sending the infrared command '{}' for Channel '{}'", + "An error occurred whilst sending the infrared command '{}' for Channel '{}'", command, channelUID); } } @@ -687,7 +687,7 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei } } catch (IOException e) { // If some other I/O error occurs - logger.warn("An IO exception occured on channel '{}': {}", aSocketChannel, e.getMessage()); + logger.warn("An IO exception occurred on channel '{}': {}", aSocketChannel, e.getMessage()); error = true; } @@ -754,7 +754,7 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei error = true; } catch (IOException e) { // If some other I/O error occurs - logger.warn("An IO exception occured on channel '{}': {}", aSocketChannel, e.getMessage()); + logger.warn("An IO exception occurred on channel '{}': {}", aSocketChannel, e.getMessage()); error = true; } diff --git a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/protocol/KodiClientSocket.java b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/protocol/KodiClientSocket.java index fe742745c36..47259abc455 100644 --- a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/protocol/KodiClientSocket.java +++ b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/protocol/KodiClientSocket.java @@ -169,7 +169,7 @@ public class KodiClientSocket { @OnWebSocketError public void onError(Throwable error) { - logger.trace("Error occured: {}", error.getMessage()); + logger.trace("Error occurred: {}", error.getMessage()); onClose(0, error.getMessage()); } } diff --git a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/handler/LgTvSerialHandler.java b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/handler/LgTvSerialHandler.java index f69e0259b69..c0de704f8d4 100644 --- a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/handler/LgTvSerialHandler.java +++ b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/handler/LgTvSerialHandler.java @@ -232,7 +232,7 @@ public class LgTvSerialHandler extends BaseThingHandler { try { entry.getValue().execute(entry.getKey(), communicator, null); } catch (IOException e) { - logger.warn("An error occured while sending an update command for {}: {}", entry.getKey(), + logger.warn("An error occurred while sending an update command for {}: {}", entry.getKey(), e.getMessage()); } } diff --git a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/LGSerialCommunicator.java b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/LGSerialCommunicator.java index c18b111335b..470fad7abd6 100644 --- a/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/LGSerialCommunicator.java +++ b/bundles/org.openhab.binding.lgtvserial/src/main/java/org/openhab/binding/lgtvserial/internal/protocol/serial/LGSerialCommunicator.java @@ -136,12 +136,12 @@ public class LGSerialCommunicator { try { input.close(); } catch (IOException e) { - logger.debug("An error occured while closing the serial input stream", e); + logger.debug("An error occurred while closing the serial input stream", e); } try { output.close(); } catch (IOException e) { - logger.debug("An error occured while closing the serial output stream", e); + logger.debug("An error occurred while closing the serial output stream", e); } port.close(); // For some reason, there needs some delay after close so we don't fail to open back the serial device diff --git a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java index 62081d894be..afebe4f0742 100644 --- a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java +++ b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCConnector.java @@ -166,7 +166,7 @@ public class LIRCConnector { public synchronized void sendErrorToListeners(String error) { try { for (LIRCEventListener listener : listeners) { - listener.errorOccured(error); + listener.errorOccurred(error); } } catch (Exception e) { logger.error("Error invoking event listener", e); diff --git a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCEventListener.java b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCEventListener.java index f1fcc603581..ae1ea25f7f4 100644 --- a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCEventListener.java +++ b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/connector/LIRCEventListener.java @@ -42,7 +42,7 @@ public interface LIRCEventListener { * Procedure for receiving information about fatal errors. * * @param error - * Error occured. + * Error occurred. */ - void errorOccured(String error); + void errorOccurred(String error); } diff --git a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/handler/LIRCBridgeHandler.java b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/handler/LIRCBridgeHandler.java index d0c60d9ffd8..89dd942c802 100644 --- a/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/handler/LIRCBridgeHandler.java +++ b/bundles/org.openhab.binding.lirc/src/main/java/org/openhab/binding/lirc/internal/handler/LIRCBridgeHandler.java @@ -191,8 +191,8 @@ public class LIRCBridgeHandler extends BaseBridgeHandler { } @Override - public void errorOccured(String error) { - logger.error("Error occured: {}", error); + public void errorOccurred(String error) { + logger.error("Error occurred: {}", error); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, error); } } diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxWebSocket.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxWebSocket.java index faf2bb6508b..6425d6007d7 100644 --- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxWebSocket.java +++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxWebSocket.java @@ -650,6 +650,6 @@ public class LxWebSocket { */ private void responseTimeout() { logger.debug("[{}] Miniserver response timeout", debugId); - disconnect(LxErrorCode.COMMUNICATION_ERROR, "Miniserver response timeout occured"); + disconnect(LxErrorCode.COMMUNICATION_ERROR, "Miniserver response timeout occurred"); } } diff --git a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVControl.java b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVControl.java index 690081c45f3..b84d3ecb049 100644 --- a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVControl.java +++ b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVControl.java @@ -289,7 +289,7 @@ public class MagentaTVControl { * complete the pairing process. You should see a message like "Connected to * openHAB" on your TV screen. * - * @return true: successful, false: a non-critical error occured, caller handles + * @return true: successful, false: a non-critical error occurred, caller handles * this * @throws MagentaTVException */ diff --git a/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/auth/OpenHabOAuthTokenRefresher.java b/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/auth/OpenHabOAuthTokenRefresher.java index e80c99160d1..16c99121347 100644 --- a/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/auth/OpenHabOAuthTokenRefresher.java +++ b/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/auth/OpenHabOAuthTokenRefresher.java @@ -107,9 +107,9 @@ public final class OpenHabOAuthTokenRefresher implements OAuthTokenRefresher { throw new OAuthException("Access token is not available."); } } catch (org.openhab.core.auth.client.oauth2.OAuthException e) { - throw new OAuthException("An error occured during token refresh: " + e.getMessage(), e); + throw new OAuthException("An error occurred during token refresh: " + e.getMessage(), e); } catch (IOException e) { - throw new OAuthException("A network error occured during token refresh: " + e.getMessage(), e); + throw new OAuthException("A network error occurred during token refresh: " + e.getMessage(), e); } catch (OAuthResponseException e) { throw new OAuthException("Miele cloud service returned an illegal response: " + e.getMessage(), e); } diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoLumiHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoLumiHandler.java index 3fd9a5bfa13..02a7ff483bf 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoLumiHandler.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoLumiHandler.java @@ -144,7 +144,7 @@ public class MiIoLumiHandler extends MiIoBasicHandler { logger.debug("Refresh custom commands for child device {}", getThing().getLabel()); refreshCustomProperties(midevice, false); } else { - logger.debug("Null value occured for device {}: {}", midevice, config); + logger.debug("Null value occurred for device {}: {}", midevice, config); } } catch (Exception e) { logger.debug("Error while performing periodic refresh for '{}': {}", getThing().getUID(), e.getMessage()); diff --git a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/MilightV6SessionManager.java b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/MilightV6SessionManager.java index 06261da2556..bb4ccb36d74 100644 --- a/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/MilightV6SessionManager.java +++ b/bundles/org.openhab.binding.milight/src/main/java/org/openhab/binding/milight/internal/protocol/MilightV6SessionManager.java @@ -601,7 +601,7 @@ public class MilightV6SessionManager implements Runnable, Closeable { // 76 07 5B CD 15 // ASCII string contained: 985b157bf6fc43368a63467ea3b19d0dc .. xlink_dev // Response to the v6 SEARCH and the SEARCH FOR commands to look for new or known devices. - // Our session id will be transfered in this process (!= bridge session id) + // Our session id will be transferred in this process (!= bridge session id) case (byte) 0x18: { boolean eq = ByteBuffer.wrap(bridgeMAC, 0, 6).equals(ByteBuffer.wrap(buffer, 6, 6)); if (eq) { diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/protocol/NibeHeatPumpProtocolStates.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/protocol/NibeHeatPumpProtocolStates.java index 7235de96c1e..c731d9709ff 100644 --- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/protocol/NibeHeatPumpProtocolStates.java +++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/protocol/NibeHeatPumpProtocolStates.java @@ -72,7 +72,7 @@ public enum NibeHeatPumpProtocolStates implements NibeHeatPumpProtocolState { break; } } catch (NibeHeatPumpException e) { - LOGGER.trace("Error occured during parsing message: {}", e.getMessage()); + LOGGER.trace("Error occurred during parsing message: {}", e.getMessage()); context.state(CHECKSUM_FAILURE); } } diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NhcNotification2.java b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NhcNotification2.java index a63c6235615..bc1d6ff3733 100644 --- a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NhcNotification2.java +++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NhcNotification2.java @@ -24,7 +24,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; class NhcNotification2 { String status = ""; String type = ""; - String timeOccured = ""; + String timeOccurred = ""; String uuid = ""; String text = ""; } 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 0483930cae7..bfdd239005a 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 @@ -415,7 +415,7 @@ public class OwserverConnection { } /** - * close the connection to the owserver instance after an error occured. + * close the connection to the owserver instance after an error occurred. * if {@link #CONNECTION_MAX_RETRY} is exceeded, {@link #owserverConnectionState} is set to FAILED * and state is reported to callback. */ diff --git a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java index 0bdbd77ef32..285cbda7609 100644 --- a/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java +++ b/bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/handler/OnkyoHandler.java @@ -551,7 +551,7 @@ public class OnkyoHandler extends OnkyoUpnpHandler implements OnkyoEventListener populateInputs(selectableInputs); } } catch (ParserConfigurationException | SAXException | IOException e) { - logger.debug("Error occured during Info XML parsing.", e); + logger.debug("Error occurred during Info XML parsing.", e); } } diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java index b07b2205737..028c3a23a71 100644 --- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java +++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java @@ -247,12 +247,12 @@ public class PlugwiseHAControllerRequest { try { response = request.send(); } catch (InterruptedException e) { - this.logger.trace("InterruptedException occured {} {}", e.getMessage(), e.getStackTrace()); + this.logger.trace("InterruptedException occurred {} {}", e.getMessage(), e.getStackTrace()); Thread.currentThread().interrupt(); throw new PlugwiseHATimeoutException(e); } catch (TimeoutException e) { if (retries > 0) { - this.logger.debug("TimeoutException occured, remaining retries {}", retries - 1); + this.logger.debug("TimeoutException occurred, remaining retries {}", retries - 1); try { Thread.sleep(RETRY_DELAY_TIMOUT); } catch (InterruptedException ie) { diff --git a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties index d9cf430a401..336b42d1262 100644 --- a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties +++ b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties @@ -141,7 +141,7 @@ channel-type.regoheatpump.lastErrorTimestamp.label = Last Error Date channel-type.regoheatpump.lastErrorTimestamp.description = Information about when last alarm occurred channel-type.regoheatpump.lastErrorTimestamp.state.pattern = %1$td.%1$tm.%1$tY %1$tH:%1$tM:%1$tS channel-type.regoheatpump.lastErrorType.label = Last Error Type -channel-type.regoheatpump.lastErrorType.description = Information about the alarm type that occured last +channel-type.regoheatpump.lastErrorType.description = Information about the alarm type that occurred last channel-type.regoheatpump.lastErrorType.state.option.0 = Sensor radiator return (GT1) channel-type.regoheatpump.lastErrorType.state.option.1 = Outdoor sensor (GT2) channel-type.regoheatpump.lastErrorType.state.option.2 = Sensor hot water (GT3) diff --git a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/thing/thing-types.xml index bfb80673c57..9a6b70138a0 100644 --- a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/thing/thing-types.xml @@ -320,7 +320,7 @@ String - Information about the alarm type that occured last + Information about the alarm type that occurred last Error diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java index a4253ee424c..98a1be27120 100644 --- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java +++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java @@ -182,7 +182,7 @@ public abstract class MeterDevice { connector.openConnection(); }).doOnError(ex -> { if (ex instanceof TimeoutException) { - logger.debug("Timeout occured for {}; {}", getDeviceId(), ex.getMessage()); + logger.debug("Timeout occurred for {}; {}", getDeviceId(), ex.getMessage()); } else { logger.debug("Failed to read: {}. Closing connection and trying again in {} seconds...; {}", ex.getMessage(), RETRY_DELAY, getDeviceId(), ex); diff --git a/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/handler/SncfBridgeHandler.java b/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/handler/SncfBridgeHandler.java index 9537d97f3af..490e101fb9d 100644 --- a/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/handler/SncfBridgeHandler.java +++ b/bundles/org.openhab.binding.sncf/src/main/java/org/openhab/binding/sncf/internal/handler/SncfBridgeHandler.java @@ -129,7 +129,7 @@ public class SncfBridgeHandler extends BaseBridgeHandler { } logger.debug("SNCF Api server responded with status code {}: {}", httpStatus, content); } catch (TimeoutException | ExecutionException e) { - logger.debug("Execution occured : {}", e.getMessage(), e); + logger.debug("Execution occurred : {}", e.getMessage(), e); } catch (InterruptedException e) { logger.debug("Execution interrupted : {}", e.getMessage(), e); Thread.currentThread().interrupt(); diff --git a/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java b/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java index 8cb50b2b43d..39e77932f2d 100644 --- a/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java +++ b/bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java @@ -277,7 +277,7 @@ public class TelegramActions implements ThingActions { try { retMessage = localHandler.execute(sendMessage); } catch (Exception e) { - logger.warn("Exception occured whilst sending message:{}", e.getMessage()); + logger.warn("Exception occurred whilst sending message:{}", e.getMessage()); } if (!evaluateResponse(retMessage)) { return false; diff --git a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java index a68f6f3ac24..2391eb3dcd3 100644 --- a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java +++ b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedBridgeHandler.java @@ -91,7 +91,7 @@ public class WLedBridgeHandler extends BaseBridgeHandler { localAPI.savePreset(position, presetName); } } catch (ApiException e) { - logger.debug("Error occured when trying to save a preset:{}", e.getMessage()); + logger.debug("Error occurred when trying to save a preset:{}", e.getMessage()); } } @@ -221,7 +221,7 @@ public class WLedBridgeHandler extends BaseBridgeHandler { break; } } catch (ApiException e) { - logger.debug("Exception occured when Channel:{}, Command:{}, Error:{}", channelUID.getId(), command, + logger.debug("Exception occurred when Channel:{}, Command:{}, Error:{}", channelUID.getId(), command, e.getMessage()); } } diff --git a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedSegmentHandler.java b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedSegmentHandler.java index e5386e7c209..3e41eedd2ac 100644 --- a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedSegmentHandler.java +++ b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/handlers/WLedSegmentHandler.java @@ -236,7 +236,7 @@ public class WLedSegmentHandler extends BaseThingHandler { break; } } catch (ApiException e) { - logger.debug("Exception occured:{}", e.getMessage()); + logger.debug("Exception occurred:{}", e.getMessage()); } } diff --git a/itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/server/SimpleNTPServer.java b/itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/server/SimpleNTPServer.java index c3661079490..5bfc1f4e6f0 100644 --- a/itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/server/SimpleNTPServer.java +++ b/itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/server/SimpleNTPServer.java @@ -67,7 +67,7 @@ public class SimpleNTPServer { try { socket = new DatagramSocket(port); } catch (SocketException e) { - logger.error("Occured an error {}. Couldn't open a socket on this port:", port, e); + logger.error("Occurred an error {}. Couldn't open a socket on this port:", port, e); } while (isRunning) { try {