diff --git a/bundles/binding/org.openhab.binding.tinkerforge/README.md b/bundles/binding/org.openhab.binding.tinkerforge/README.md
index f8dfd30b672..b71cfeb7c9a 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/README.md
+++ b/bundles/binding/org.openhab.binding.tinkerforge/README.md
@@ -2882,6 +2882,7 @@ After that, the switch must be triggered to start the scanning again.
| delayAfterScan | The delay after a nfc tag was read and the next autoscan is triggered. | any time in ms e.g. 3000(default) |
| resetOldValues | Resets the values of all subdevices, when a new tag is read. | True(default), False |
| triggeredScan | If set to true, the scan for tags is triggered via *ON* command. Otherwise it is scanned permanently for tags. | False(default), True |
+| clearValuesOnError | If set to true, each time no tag is read due to an error or when no tag is available, the item states are set to UNDEF | False(default), True |
| subdevice | description |
|-----------|-------------|
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/model/tinkerforge.xcore b/bundles/binding/org.openhab.binding.tinkerforge/model/tinkerforge.xcore
index 189434a6b4b..2cef2b7e0e5 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/model/tinkerforge.xcore
+++ b/bundles/binding/org.openhab.binding.tinkerforge/model/tinkerforge.xcore
@@ -1453,6 +1453,7 @@ class BrickletOLEDConfiguration extends TFConfig {
}
class NFCConfiguration extends TFConfig{
+ boolean clearValuesOnError = "false"
boolean resetOldValues = "true"
boolean triggeredScan = "false"
int delayAfterScan = "3000"
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/ModelPackage.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/ModelPackage.java
index 9d307d3a781..e5adb16910b 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/ModelPackage.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/ModelPackage.java
@@ -32878,6 +32878,16 @@ public interface ModelPackage extends EPackage {
*/
int NFC_CONFIGURATION = 217;
+ /**
+ * The feature id for the 'Clear Values On Error' attribute.
+ *
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR = TF_CONFIG_FEATURE_COUNT + 0;
+
/**
* The feature id for the 'Reset Old Values' attribute.
*
@@ -32886,7 +32896,7 @@ public interface ModelPackage extends EPackage {
* @generated
* @ordered
*/
- int NFC_CONFIGURATION__RESET_OLD_VALUES = TF_CONFIG_FEATURE_COUNT + 0;
+ int NFC_CONFIGURATION__RESET_OLD_VALUES = TF_CONFIG_FEATURE_COUNT + 1;
/**
* The feature id for the 'Triggered Scan' attribute.
@@ -32896,7 +32906,7 @@ public interface ModelPackage extends EPackage {
* @generated
* @ordered
*/
- int NFC_CONFIGURATION__TRIGGERED_SCAN = TF_CONFIG_FEATURE_COUNT + 1;
+ int NFC_CONFIGURATION__TRIGGERED_SCAN = TF_CONFIG_FEATURE_COUNT + 2;
/**
* The feature id for the 'Delay After Scan' attribute.
@@ -32906,7 +32916,7 @@ public interface ModelPackage extends EPackage {
* @generated
* @ordered
*/
- int NFC_CONFIGURATION__DELAY_AFTER_SCAN = TF_CONFIG_FEATURE_COUNT + 2;
+ int NFC_CONFIGURATION__DELAY_AFTER_SCAN = TF_CONFIG_FEATURE_COUNT + 3;
/**
* The number of structural features of the 'NFC Configuration' class.
@@ -32916,7 +32926,7 @@ public interface ModelPackage extends EPackage {
* @generated
* @ordered
*/
- int NFC_CONFIGURATION_FEATURE_COUNT = TF_CONFIG_FEATURE_COUNT + 3;
+ int NFC_CONFIGURATION_FEATURE_COUNT = TF_CONFIG_FEATURE_COUNT + 4;
/**
* The number of operations of the 'NFC Configuration' class.
@@ -42941,6 +42951,20 @@ public interface ModelPackage extends EPackage {
*/
EClass getNFCConfiguration();
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isClearValuesOnError Clear Values On
+ * Error}'.
+ *
+ *
+ *
+ * @return the meta object for the attribute 'Clear Values On Error'.
+ * @see org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isClearValuesOnError()
+ * @see #getNFCConfiguration()
+ * @generated
+ */
+ EAttribute getNFCConfiguration_ClearValuesOnError();
+
/**
* Returns the meta object for the attribute
* '{@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isResetOldValues Reset Old
@@ -51381,6 +51405,15 @@ interface Literals {
*/
EClass NFC_CONFIGURATION = eINSTANCE.getNFCConfiguration();
+ /**
+ * The meta object literal for the 'Clear Values On Error' attribute feature.
+ *
+ *
+ *
+ * @generated
+ */
+ EAttribute NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR = eINSTANCE.getNFCConfiguration_ClearValuesOnError();
+
/**
* The meta object literal for the 'Reset Old Values' attribute feature.
*
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/NFCConfiguration.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/NFCConfiguration.java
index 555fc0c1c07..5d3ed481c11 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/NFCConfiguration.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/NFCConfiguration.java
@@ -11,6 +11,8 @@
* The following features are supported:
*
*
+ * - {@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isClearValuesOnError Clear Values On
+ * Error}
* - {@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isResetOldValues Reset Old
* Values}
* - {@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isTriggeredScan Triggered
@@ -24,6 +26,37 @@
* @generated
*/
public interface NFCConfiguration extends TFConfig {
+ /**
+ * Returns the value of the 'Clear Values On Error' attribute.
+ * The default value is
"false"
.
+ *
+ *
+ * If the meaning of the 'Clear Values On Error' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ *
+ * @return the value of the 'Clear Values On Error' attribute.
+ * @see #setClearValuesOnError(boolean)
+ * @see org.openhab.binding.tinkerforge.internal.model.ModelPackage#getNFCConfiguration_ClearValuesOnError()
+ * @model default="false" unique="false"
+ * @generated
+ */
+ boolean isClearValuesOnError();
+
+ /**
+ * Sets the value of the
+ * '{@link org.openhab.binding.tinkerforge.internal.model.NFCConfiguration#isClearValuesOnError Clear Values On
+ * Error}' attribute.
+ *
+ *
+ *
+ * @param value the new value of the 'Clear Values On Error' attribute.
+ * @see #isClearValuesOnError()
+ * @generated
+ */
+ void setClearValuesOnError(boolean value);
+
/**
* Returns the value of the 'Reset Old Values' attribute.
* The default value is "true"
.
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickdImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickdImpl.java
index 28ecd8a805c..5f301e742ac 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickdImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickdImpl.java
@@ -142,7 +142,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -153,7 +153,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -164,7 +164,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -175,7 +175,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -186,7 +186,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getHost() Host}' attribute.
*
*
- *
+ *
* @see #getHost()
* @generated
* @ordered
@@ -197,7 +197,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getHost() Host}' attribute.
*
*
- *
+ *
* @see #getHost()
* @generated
* @ordered
@@ -208,7 +208,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getPort() Port}' attribute.
*
*
- *
+ *
* @see #getPort()
* @generated
* @ordered
@@ -219,7 +219,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getPort() Port}' attribute.
*
*
- *
+ *
* @see #getPort()
* @generated
* @ordered
@@ -230,7 +230,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getAuthkey() Authkey}' attribute.
*
*
- *
+ *
* @see #getAuthkey()
* @generated
* @ordered
@@ -241,7 +241,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getAuthkey() Authkey}' attribute.
*
*
- *
+ *
* @see #getAuthkey()
* @generated
* @ordered
@@ -252,7 +252,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getIsConnected() Is Connected}' attribute.
*
*
- *
+ *
* @see #getIsConnected()
* @generated
* @ordered
@@ -263,7 +263,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getIsConnected() Is Connected}' attribute.
*
*
- *
+ *
* @see #getIsConnected()
* @generated
* @ordered
@@ -274,7 +274,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #isAutoReconnect() Auto Reconnect}' attribute.
*
*
- *
+ *
* @see #isAutoReconnect()
* @generated
* @ordered
@@ -285,7 +285,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #isAutoReconnect() Auto Reconnect}' attribute.
*
*
- *
+ *
* @see #isAutoReconnect()
* @generated
* @ordered
@@ -296,7 +296,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #isReconnected() Reconnected}' attribute.
*
*
- *
+ *
* @see #isReconnected()
* @generated
* @ordered
@@ -307,7 +307,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #isReconnected() Reconnected}' attribute.
*
*
- *
+ *
* @see #isReconnected()
* @generated
* @ordered
@@ -318,7 +318,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getConnectedCounter() Connected Counter}' attribute.
*
*
- *
+ *
* @see #getConnectedCounter()
* @generated
* @ordered
@@ -330,7 +330,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getConnectedCounter() Connected Counter}' attribute.
*
*
- *
+ *
* @see #getConnectedCounter()
* @generated
* @ordered
@@ -341,7 +341,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The default value of the '{@link #getTimeout() Timeout}' attribute.
*
*
- *
+ *
* @see #getTimeout()
* @generated
* @ordered
@@ -352,7 +352,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getTimeout() Timeout}' attribute.
*
*
- *
+ *
* @see #getTimeout()
* @generated
* @ordered
@@ -363,7 +363,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
* The cached value of the '{@link #getMdevices() Mdevices}' containment reference list.
*
*
- *
+ *
* @see #getMdevices()
* @generated
* @ordered
@@ -375,7 +375,7 @@ public class MBrickdImpl extends MinimalEObjectImpl.Container implements MBrickd
/**
*
*
- *
+ *
* @generated
*/
protected MBrickdImpl() {
@@ -385,7 +385,7 @@ protected MBrickdImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -396,7 +396,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -407,22 +407,21 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__LOGGER, oldLogger, logger));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -433,23 +432,22 @@ public IPConnection getIpConnection() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setIpConnection(IPConnection newIpConnection) {
IPConnection oldIpConnection = ipConnection;
ipConnection = newIpConnection;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__IP_CONNECTION, oldIpConnection,
ipConnection));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -460,22 +458,21 @@ public String getHost() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setHost(String newHost) {
String oldHost = host;
host = newHost;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__HOST, oldHost, host));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -486,22 +483,21 @@ public int getPort() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPort(int newPort) {
int oldPort = port;
port = newPort;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__PORT, oldPort, port));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -512,22 +508,21 @@ public String getAuthkey() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setAuthkey(String newAuthkey) {
String oldAuthkey = authkey;
authkey = newAuthkey;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__AUTHKEY, oldAuthkey, authkey));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -538,23 +533,22 @@ public HighLowValue getIsConnected() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setIsConnected(HighLowValue newIsConnected) {
HighLowValue oldIsConnected = isConnected;
isConnected = newIsConnected;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__IS_CONNECTED, oldIsConnected,
isConnected));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -565,23 +559,22 @@ public boolean isAutoReconnect() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setAutoReconnect(boolean newAutoReconnect) {
boolean oldAutoReconnect = autoReconnect;
autoReconnect = newAutoReconnect;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__AUTO_RECONNECT,
oldAutoReconnect, autoReconnect));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -592,23 +585,22 @@ public boolean isReconnected() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setReconnected(boolean newReconnected) {
boolean oldReconnected = reconnected;
reconnected = newReconnected;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__RECONNECTED, oldReconnected,
reconnected));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -619,23 +611,22 @@ public DecimalValue getConnectedCounter() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setConnectedCounter(DecimalValue newConnectedCounter) {
DecimalValue oldConnectedCounter = connectedCounter;
connectedCounter = newConnectedCounter;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__CONNECTED_COUNTER,
oldConnectedCounter, connectedCounter));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -646,22 +637,21 @@ public int getTimeout() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setTimeout(int newTimeout) {
int oldTimeout = timeout;
timeout = newTimeout;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__TIMEOUT, oldTimeout, timeout));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -676,34 +666,32 @@ public EList> getMdevices() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public Ecosystem getEcosystem() {
- if (eContainerFeatureID() != ModelPackage.MBRICKD__ECOSYSTEM) {
+ if (eContainerFeatureID() != ModelPackage.MBRICKD__ECOSYSTEM)
return null;
- }
return (Ecosystem) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public Ecosystem basicGetEcosystem() {
- if (eContainerFeatureID() != ModelPackage.MBRICKD__ECOSYSTEM) {
+ if (eContainerFeatureID() != ModelPackage.MBRICKD__ECOSYSTEM)
return null;
- }
return (Ecosystem) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetEcosystem(Ecosystem newEcosystem, NotificationChain msgs) {
@@ -714,32 +702,27 @@ public NotificationChain basicSetEcosystem(Ecosystem newEcosystem, NotificationC
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEcosystem(Ecosystem newEcosystem) {
if (newEcosystem != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MBRICKD__ECOSYSTEM && newEcosystem != null)) {
- if (EcoreUtil.isAncestor(this, newEcosystem)) {
+ if (EcoreUtil.isAncestor(this, newEcosystem))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- }
NotificationChain msgs = null;
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newEcosystem != null) {
+ if (newEcosystem != null)
msgs = ((InternalEObject) newEcosystem).eInverseAdd(this, ModelPackage.ECOSYSTEM__MBRICKDS,
Ecosystem.class, msgs);
- }
msgs = basicSetEcosystem(newEcosystem, msgs);
- if (msgs != null) {
+ if (msgs != null)
msgs.dispatch();
- }
- } else if (eNotificationRequired()) {
+ } else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKD__ECOSYSTEM, newEcosystem,
newEcosystem));
- }
}
/**
@@ -1235,7 +1218,7 @@ public MBaseDevice getDevice(String uid) {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -1245,9 +1228,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
case ModelPackage.MBRICKD__MDEVICES:
return ((InternalEList) (InternalEList>) getMdevices()).basicAdd(otherEnd, msgs);
case ModelPackage.MBRICKD__ECOSYSTEM:
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
return basicSetEcosystem((Ecosystem) otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -1256,7 +1238,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1273,7 +1255,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1289,7 +1271,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1318,9 +1300,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MBRICKD__MDEVICES:
return getMdevices();
case ModelPackage.MBRICKD__ECOSYSTEM:
- if (resolve) {
+ if (resolve)
return getEcosystem();
- }
return basicGetEcosystem();
}
return super.eGet(featureID, resolve, coreType);
@@ -1329,7 +1310,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -1380,7 +1361,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1429,7 +1410,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1468,7 +1449,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1492,14 +1473,13 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if (eIsProxy())
return super.toString();
- }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletLCD128x64Impl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletLCD128x64Impl.java
index cc3c4294de9..85da801c2e8 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletLCD128x64Impl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletLCD128x64Impl.java
@@ -81,7 +81,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -91,7 +91,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -101,7 +101,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -111,7 +111,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -121,7 +121,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -131,7 +131,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -141,7 +141,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -151,7 +151,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -161,7 +161,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getTinkerforgeDevice() Tinkerforge Device}' attribute.
*
*
- *
+ *
* @see #getTinkerforgeDevice()
* @generated
* @ordered
@@ -171,7 +171,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -181,7 +181,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -191,7 +191,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getConnectedUid() Connected Uid}' attribute.
*
*
- *
+ *
* @see #getConnectedUid()
* @generated
* @ordered
@@ -201,7 +201,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getConnectedUid() Connected Uid}' attribute.
*
*
- *
+ *
* @see #getConnectedUid()
* @generated
* @ordered
@@ -211,7 +211,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getPosition() Position}' attribute.
*
*
- *
+ *
* @see #getPosition()
* @generated
* @ordered
@@ -221,7 +221,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getPosition() Position}' attribute.
*
*
- *
+ *
* @see #getPosition()
* @generated
* @ordered
@@ -231,7 +231,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getDeviceIdentifier() Device Identifier}' attribute.
*
*
- *
+ *
* @see #getDeviceIdentifier()
* @generated
* @ordered
@@ -241,7 +241,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getDeviceIdentifier() Device Identifier}' attribute.
*
*
- *
+ *
* @see #getDeviceIdentifier()
* @generated
* @ordered
@@ -251,7 +251,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getName() Name}' attribute.
*
*
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -261,7 +261,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getName() Name}' attribute.
*
*
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -271,7 +271,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getText() Text}' attribute.
*
*
- *
+ *
* @see #getText()
* @generated
* @ordered
@@ -281,7 +281,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getText() Text}' attribute.
*
*
- *
+ *
* @see #getText()
* @generated
* @ordered
@@ -291,7 +291,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getMsubdevices() Msubdevices}' containment reference list.
*
*
- *
+ *
* @see #getMsubdevices()
* @generated
* @ordered
@@ -301,7 +301,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -311,7 +311,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -322,7 +322,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getPositionPrefix() Position Prefix}' attribute.
*
*
- *
+ *
* @see #getPositionPrefix()
* @generated
* @ordered
@@ -332,7 +332,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getPositionPrefix() Position Prefix}' attribute.
*
*
- *
+ *
* @see #getPositionPrefix()
* @generated
* @ordered
@@ -342,7 +342,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The default value of the '{@link #getPositionSuffix() Position Suffix}' attribute.
*
*
- *
+ *
* @see #getPositionSuffix()
* @generated
* @ordered
@@ -352,7 +352,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
* The cached value of the '{@link #getPositionSuffix() Position Suffix}' attribute.
*
*
- *
+ *
* @see #getPositionSuffix()
* @generated
* @ordered
@@ -365,7 +365,7 @@ public class MBrickletLCD128x64Impl extends MinimalEObjectImpl.Container impleme
/**
*
*
- *
+ *
* @generated
*/
protected MBrickletLCD128x64Impl() {
@@ -375,7 +375,7 @@ protected MBrickletLCD128x64Impl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -386,7 +386,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -397,23 +397,22 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__LOGGER, oldLogger,
logger));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -424,22 +423,21 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__UID, oldUid, uid));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -450,23 +448,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__POLL, oldPoll,
poll));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -477,23 +474,22 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__ENABLED_A,
oldEnabledA, enabledA));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -504,23 +500,22 @@ public BrickletLCD128x64 getTinkerforgeDevice() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setTinkerforgeDevice(BrickletLCD128x64 newTinkerforgeDevice) {
BrickletLCD128x64 oldTinkerforgeDevice = tinkerforgeDevice;
tinkerforgeDevice = newTinkerforgeDevice;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__TINKERFORGE_DEVICE,
oldTinkerforgeDevice, tinkerforgeDevice));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -531,23 +526,22 @@ public IPConnection getIpConnection() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setIpConnection(IPConnection newIpConnection) {
IPConnection oldIpConnection = ipConnection;
ipConnection = newIpConnection;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__IP_CONNECTION,
oldIpConnection, ipConnection));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -558,23 +552,22 @@ public String getConnectedUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setConnectedUid(String newConnectedUid) {
String oldConnectedUid = connectedUid;
connectedUid = newConnectedUid;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__CONNECTED_UID,
oldConnectedUid, connectedUid));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -585,23 +578,22 @@ public char getPosition() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPosition(char newPosition) {
char oldPosition = position;
position = newPosition;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__POSITION,
oldPosition, position));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -612,23 +604,22 @@ public int getDeviceIdentifier() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setDeviceIdentifier(int newDeviceIdentifier) {
int oldDeviceIdentifier = deviceIdentifier;
deviceIdentifier = newDeviceIdentifier;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__DEVICE_IDENTIFIER,
oldDeviceIdentifier, deviceIdentifier));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -639,50 +630,47 @@ public String getName() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setName(String newName) {
String oldName = name;
name = newName;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__NAME, oldName,
name));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickd getBrickd() {
- if (eContainerFeatureID() != ModelPackage.MBRICKLET_LCD12_8X64__BRICKD) {
+ if (eContainerFeatureID() != ModelPackage.MBRICKLET_LCD12_8X64__BRICKD)
return null;
- }
return (MBrickd) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickd basicGetBrickd() {
- if (eContainerFeatureID() != ModelPackage.MBRICKLET_LCD12_8X64__BRICKD) {
+ if (eContainerFeatureID() != ModelPackage.MBRICKLET_LCD12_8X64__BRICKD)
return null;
- }
return (MBrickd) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetBrickd(MBrickd newBrickd, NotificationChain msgs) {
@@ -693,38 +681,33 @@ public NotificationChain basicSetBrickd(MBrickd newBrickd, NotificationChain msg
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setBrickd(MBrickd newBrickd) {
if (newBrickd != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MBRICKLET_LCD12_8X64__BRICKD && newBrickd != null)) {
- if (EcoreUtil.isAncestor(this, newBrickd)) {
+ if (EcoreUtil.isAncestor(this, newBrickd))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- }
NotificationChain msgs = null;
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newBrickd != null) {
+ if (newBrickd != null)
msgs = ((InternalEObject) newBrickd).eInverseAdd(this, ModelPackage.MBRICKD__MDEVICES, MBrickd.class,
msgs);
- }
msgs = basicSetBrickd(newBrickd, msgs);
- if (msgs != null) {
+ if (msgs != null)
msgs.dispatch();
- }
- } else if (eNotificationRequired()) {
+ } else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__BRICKD, newBrickd,
newBrickd));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -735,23 +718,22 @@ public String getText() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setText(String newText) {
String oldText = text;
text = newText;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__TEXT, oldText,
text));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -773,7 +755,7 @@ public Class> getInverseFeatureClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -784,7 +766,7 @@ public String getDeviceType() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -795,23 +777,22 @@ public String getPositionPrefix() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPositionPrefix(String newPositionPrefix) {
String oldPositionPrefix = positionPrefix;
positionPrefix = newPositionPrefix;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__POSITION_PREFIX,
oldPositionPrefix, positionPrefix));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -822,17 +803,16 @@ public String getPositionSuffix() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPositionSuffix(String newPositionSuffix) {
String oldPositionSuffix = positionSuffix;
positionSuffix = newPositionSuffix;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_LCD12_8X64__POSITION_SUFFIX,
oldPositionSuffix, positionSuffix));
- }
}
/**
@@ -935,7 +915,7 @@ public void disable() {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -943,9 +923,8 @@ public void disable() {
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MBRICKLET_LCD12_8X64__BRICKD:
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
return basicSetBrickd((MBrickd) otherEnd, msgs);
case ModelPackage.MBRICKLET_LCD12_8X64__MSUBDEVICES:
return ((InternalEList) (InternalEList>) getMsubdevices()).basicAdd(otherEnd, msgs);
@@ -956,7 +935,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -973,7 +952,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -988,7 +967,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1015,9 +994,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MBRICKLET_LCD12_8X64__NAME:
return getName();
case ModelPackage.MBRICKLET_LCD12_8X64__BRICKD:
- if (resolve) {
+ if (resolve)
return getBrickd();
- }
return basicGetBrickd();
case ModelPackage.MBRICKLET_LCD12_8X64__TEXT:
return getText();
@@ -1036,7 +1014,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -1096,7 +1074,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1154,7 +1132,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1203,7 +1181,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1230,7 +1208,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1257,7 +1235,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1284,7 +1262,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1312,14 +1290,13 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if (eIsProxy())
return super.toString();
- }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletNFCImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletNFCImpl.java
index 27706a7d315..48b38677849 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletNFCImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MBrickletNFCImpl.java
@@ -92,7 +92,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -103,7 +103,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -114,7 +114,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -125,7 +125,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -136,7 +136,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -147,7 +147,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -158,7 +158,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -169,7 +169,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -180,7 +180,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getTinkerforgeDevice() Tinkerforge Device}' attribute.
*
*
- *
+ *
* @see #getTinkerforgeDevice()
* @generated
* @ordered
@@ -191,7 +191,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -202,7 +202,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getIpConnection() Ip Connection}' attribute.
*
*
- *
+ *
* @see #getIpConnection()
* @generated
* @ordered
@@ -213,7 +213,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getConnectedUid() Connected Uid}' attribute.
*
*
- *
+ *
* @see #getConnectedUid()
* @generated
* @ordered
@@ -224,7 +224,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getConnectedUid() Connected Uid}' attribute.
*
*
- *
+ *
* @see #getConnectedUid()
* @generated
* @ordered
@@ -235,7 +235,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getPosition() Position}' attribute.
*
*
- *
+ *
* @see #getPosition()
* @generated
* @ordered
@@ -246,7 +246,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getPosition() Position}' attribute.
*
*
- *
+ *
* @see #getPosition()
* @generated
* @ordered
@@ -257,7 +257,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getDeviceIdentifier() Device Identifier}' attribute.
*
*
- *
+ *
* @see #getDeviceIdentifier()
* @generated
* @ordered
@@ -268,7 +268,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getDeviceIdentifier() Device Identifier}' attribute.
*
*
- *
+ *
* @see #getDeviceIdentifier()
* @generated
* @ordered
@@ -279,7 +279,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getName() Name}' attribute.
*
*
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -290,7 +290,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getName() Name}' attribute.
*
*
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -301,7 +301,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getMsubdevices() Msubdevices}' containment reference list.
*
*
- *
+ *
* @see #getMsubdevices()
* @generated
* @ordered
@@ -312,7 +312,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getTfConfig() Tf Config}' containment reference.
*
*
- *
+ *
* @see #getTfConfig()
* @generated
* @ordered
@@ -323,7 +323,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -334,7 +334,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -345,7 +345,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getTextSubId() Text Sub Id}' attribute.
*
*
- *
+ *
* @see #getTextSubId()
* @generated
* @ordered
@@ -356,7 +356,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getTextSubId() Text Sub Id}' attribute.
*
*
- *
+ *
* @see #getTextSubId()
* @generated
* @ordered
@@ -367,7 +367,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getUriSubId() Uri Sub Id}' attribute.
*
*
- *
+ *
* @see #getUriSubId()
* @generated
* @ordered
@@ -378,7 +378,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getUriSubId() Uri Sub Id}' attribute.
*
*
- *
+ *
* @see #getUriSubId()
* @generated
* @ordered
@@ -389,7 +389,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getIdSubId() Id Sub Id}' attribute.
*
*
- *
+ *
* @see #getIdSubId()
* @generated
* @ordered
@@ -400,7 +400,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getIdSubId() Id Sub Id}' attribute.
*
*
- *
+ *
* @see #getIdSubId()
* @generated
* @ordered
@@ -411,7 +411,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The default value of the '{@link #getTriggerSubId() Trigger Sub Id}' attribute.
*
*
- *
+ *
* @see #getTriggerSubId()
* @generated
* @ordered
@@ -422,7 +422,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
* The cached value of the '{@link #getTriggerSubId() Trigger Sub Id}' attribute.
*
*
- *
+ *
* @see #getTriggerSubId()
* @generated
* @ordered
@@ -437,7 +437,7 @@ public class MBrickletNFCImpl extends MinimalEObjectImpl.Container implements MB
/**
*
*
- *
+ *
* @generated
*/
protected MBrickletNFCImpl() {
@@ -447,7 +447,7 @@ protected MBrickletNFCImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -458,7 +458,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -469,22 +469,23 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__LOGGER, oldLogger,
logger));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -495,21 +496,22 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__UID, oldUid, uid));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -520,21 +522,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__POLL, oldPoll, poll));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -545,22 +548,23 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__ENABLED_A, oldEnabledA,
enabledA));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -571,22 +575,23 @@ public BrickletNFC getTinkerforgeDevice() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setTinkerforgeDevice(BrickletNFC newTinkerforgeDevice) {
BrickletNFC oldTinkerforgeDevice = tinkerforgeDevice;
tinkerforgeDevice = newTinkerforgeDevice;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__TINKERFORGE_DEVICE,
oldTinkerforgeDevice, tinkerforgeDevice));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -597,22 +602,23 @@ public IPConnection getIpConnection() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setIpConnection(IPConnection newIpConnection) {
IPConnection oldIpConnection = ipConnection;
ipConnection = newIpConnection;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__IP_CONNECTION,
oldIpConnection, ipConnection));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -623,22 +629,23 @@ public String getConnectedUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setConnectedUid(String newConnectedUid) {
String oldConnectedUid = connectedUid;
connectedUid = newConnectedUid;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__CONNECTED_UID,
oldConnectedUid, connectedUid));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -649,22 +656,23 @@ public char getPosition() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPosition(char newPosition) {
char oldPosition = position;
position = newPosition;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__POSITION, oldPosition,
position));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -675,22 +683,23 @@ public int getDeviceIdentifier() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setDeviceIdentifier(int newDeviceIdentifier) {
int oldDeviceIdentifier = deviceIdentifier;
deviceIdentifier = newDeviceIdentifier;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__DEVICE_IDENTIFIER,
oldDeviceIdentifier, deviceIdentifier));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -701,46 +710,49 @@ public String getName() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setName(String newName) {
String oldName = name;
name = newName;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__NAME, oldName, name));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickd getBrickd() {
- if (eContainerFeatureID() != ModelPackage.MBRICKLET_NFC__BRICKD)
+ if (eContainerFeatureID() != ModelPackage.MBRICKLET_NFC__BRICKD) {
return null;
+ }
return (MBrickd) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickd basicGetBrickd() {
- if (eContainerFeatureID() != ModelPackage.MBRICKLET_NFC__BRICKD)
+ if (eContainerFeatureID() != ModelPackage.MBRICKLET_NFC__BRICKD) {
return null;
+ }
return (MBrickd) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetBrickd(MBrickd newBrickd, NotificationChain msgs) {
@@ -751,33 +763,38 @@ public NotificationChain basicSetBrickd(MBrickd newBrickd, NotificationChain msg
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setBrickd(MBrickd newBrickd) {
if (newBrickd != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MBRICKLET_NFC__BRICKD && newBrickd != null)) {
- if (EcoreUtil.isAncestor(this, newBrickd))
+ if (EcoreUtil.isAncestor(this, newBrickd)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
- if (newBrickd != null)
+ }
+ if (newBrickd != null) {
msgs = ((InternalEObject) newBrickd).eInverseAdd(this, ModelPackage.MBRICKD__MDEVICES, MBrickd.class,
msgs);
+ }
msgs = basicSetBrickd(newBrickd, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__BRICKD, newBrickd,
newBrickd));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -799,7 +816,7 @@ public Class> getInverseFeatureClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -810,7 +827,7 @@ public NFCConfiguration getTfConfig() {
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetTfConfig(NFCConfiguration newTfConfig, NotificationChain msgs) {
@@ -819,10 +836,11 @@ public NotificationChain basicSetTfConfig(NFCConfiguration newTfConfig, Notifica
if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
ModelPackage.MBRICKLET_NFC__TF_CONFIG, oldTfConfig, newTfConfig);
- if (msgs == null)
+ if (msgs == null) {
msgs = notification;
- else
+ } else {
msgs.add(notification);
+ }
}
return msgs;
}
@@ -830,31 +848,35 @@ public NotificationChain basicSetTfConfig(NFCConfiguration newTfConfig, Notifica
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setTfConfig(NFCConfiguration newTfConfig) {
if (newTfConfig != tfConfig) {
NotificationChain msgs = null;
- if (tfConfig != null)
+ if (tfConfig != null) {
msgs = ((InternalEObject) tfConfig).eInverseRemove(this,
EOPPOSITE_FEATURE_BASE - ModelPackage.MBRICKLET_NFC__TF_CONFIG, null, msgs);
- if (newTfConfig != null)
+ }
+ if (newTfConfig != null) {
msgs = ((InternalEObject) newTfConfig).eInverseAdd(this,
EOPPOSITE_FEATURE_BASE - ModelPackage.MBRICKLET_NFC__TF_CONFIG, null, msgs);
+ }
msgs = basicSetTfConfig(newTfConfig, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MBRICKLET_NFC__TF_CONFIG, newTfConfig,
newTfConfig));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -865,7 +887,7 @@ public String getDeviceType() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -876,7 +898,7 @@ public String getTextSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -887,7 +909,7 @@ public String getUriSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -898,7 +920,7 @@ public String getIdSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1087,8 +1109,10 @@ public void readerStateChanged(int state, boolean idle) {
requestTagIDAfterWait();
}
} else if (state == BrickletNFC.READER_STATE_REQUEST_TAG_ID_ERROR) {
+ clearValuesOnErrorIfNeeded();
requestTagID();
} else if (state == BrickletNFC.READER_STATE_REQUEST_NDEF_ERROR) {
+ clearValuesOnErrorIfNeeded();
requestTagID();
}
}
@@ -1103,6 +1127,13 @@ private void requestTagIDAfterWait() {
requestTagID();
}
+ private void clearValuesOnErrorIfNeeded() {
+ if (tfConfig.isClearValuesOnError()) {
+ notifyNFCTagInfoListeners(null);
+ notifyNDEFRecordListeners(null);
+ }
+ }
+
private void readNDEF() {
try {
// tinkerforge creates buffer for each read request
@@ -1176,7 +1207,7 @@ public void disable() {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -1184,8 +1215,9 @@ public void disable() {
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MBRICKLET_NFC__BRICKD:
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetBrickd((MBrickd) otherEnd, msgs);
case ModelPackage.MBRICKLET_NFC__MSUBDEVICES:
return ((InternalEList) (InternalEList>) getMsubdevices()).basicAdd(otherEnd, msgs);
@@ -1196,7 +1228,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1215,7 +1247,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1230,7 +1262,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1257,8 +1289,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MBRICKLET_NFC__NAME:
return getName();
case ModelPackage.MBRICKLET_NFC__BRICKD:
- if (resolve)
+ if (resolve) {
return getBrickd();
+ }
return basicGetBrickd();
case ModelPackage.MBRICKLET_NFC__MSUBDEVICES:
return getMsubdevices();
@@ -1281,7 +1314,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -1335,7 +1368,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1387,7 +1420,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1439,7 +1472,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1466,7 +1499,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1493,7 +1526,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1518,7 +1551,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -1557,13 +1590,14 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MLCD128x64BacklightImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MLCD128x64BacklightImpl.java
index fe684c5d726..60e9b86a22e 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MLCD128x64BacklightImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MLCD128x64BacklightImpl.java
@@ -59,7 +59,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getSwitchState() Switch State}' attribute.
*
*
- *
+ *
* @see #getSwitchState()
* @generated
* @ordered
@@ -70,7 +70,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getSwitchState() Switch State}' attribute.
*
*
- *
+ *
* @see #getSwitchState()
* @generated
* @ordered
@@ -81,7 +81,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -92,7 +92,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -103,7 +103,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -114,7 +114,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -125,7 +125,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -136,7 +136,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -147,7 +147,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -158,7 +158,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -169,7 +169,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -180,7 +180,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -191,7 +191,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The default value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -202,7 +202,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
* The cached value of the '{@link #getDeviceType() Device Type}' attribute.
*
*
- *
+ *
* @see #getDeviceType()
* @generated
* @ordered
@@ -212,7 +212,7 @@ public class MLCD128x64BacklightImpl extends MinimalEObjectImpl.Container implem
/**
*
*
- *
+ *
* @generated
*/
protected MLCD128x64BacklightImpl() {
@@ -222,7 +222,7 @@ protected MLCD128x64BacklightImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -233,7 +233,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -244,23 +244,22 @@ public OnOffValue getSwitchState() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSwitchState(OnOffValue newSwitchState) {
OnOffValue oldSwitchState = switchState;
switchState = newSwitchState;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__SWITCH_STATE,
oldSwitchState, switchState));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -271,23 +270,22 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__LOGGER, oldLogger,
logger));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -298,23 +296,22 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__UID, oldUid,
uid));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -325,23 +322,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__POLL, oldPoll,
poll));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -352,23 +348,22 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__ENABLED_A,
oldEnabledA, enabledA));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -379,50 +374,47 @@ public String getSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSubId(String newSubId) {
String oldSubId = subId;
subId = newSubId;
- if (eNotificationRequired()) {
+ if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__SUB_ID, oldSubId,
subId));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickletLCD128x64 getMbrick() {
- if (eContainerFeatureID() != ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK) {
+ if (eContainerFeatureID() != ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK)
return null;
- }
return (MBrickletLCD128x64) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickletLCD128x64 basicGetMbrick() {
- if (eContainerFeatureID() != ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK) {
+ if (eContainerFeatureID() != ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK)
return null;
- }
return (MBrickletLCD128x64) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetMbrick(MBrickletLCD128x64 newMbrick, NotificationChain msgs) {
@@ -433,38 +425,33 @@ public NotificationChain basicSetMbrick(MBrickletLCD128x64 newMbrick, Notificati
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setMbrick(MBrickletLCD128x64 newMbrick) {
if (newMbrick != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK && newMbrick != null)) {
- if (EcoreUtil.isAncestor(this, newMbrick)) {
+ if (EcoreUtil.isAncestor(this, newMbrick))
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- }
NotificationChain msgs = null;
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newMbrick != null) {
+ if (newMbrick != null)
msgs = ((InternalEObject) newMbrick).eInverseAdd(this, ModelPackage.MSUB_DEVICE_HOLDER__MSUBDEVICES,
MSubDeviceHolder.class, msgs);
- }
msgs = basicSetMbrick(newMbrick, msgs);
- if (msgs != null) {
+ if (msgs != null)
msgs.dispatch();
- }
- } else if (eNotificationRequired()) {
+ } else if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK, newMbrick,
newMbrick));
- }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -548,16 +535,15 @@ public void fetchSwitchState() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK:
- if (eInternalContainer() != null) {
+ if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- }
return basicSetMbrick((MBrickletLCD128x64) otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -566,7 +552,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -581,7 +567,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -597,7 +583,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -616,9 +602,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MLCD12_8X64_BACKLIGHT__SUB_ID:
return getSubId();
case ModelPackage.MLCD12_8X64_BACKLIGHT__MBRICK:
- if (resolve) {
+ if (resolve)
return getMbrick();
- }
return basicGetMbrick();
case ModelPackage.MLCD12_8X64_BACKLIGHT__DEVICE_TYPE:
return getDeviceType();
@@ -629,7 +614,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -663,7 +648,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -697,7 +682,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -726,7 +711,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -767,7 +752,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -808,7 +793,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -843,7 +828,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -871,14 +856,13 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy()) {
+ if (eIsProxy())
return super.toString();
- }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (switchState: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCIDImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCIDImpl.java
index 4c7a8c3ae28..816e068585d 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCIDImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCIDImpl.java
@@ -49,7 +49,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -60,7 +60,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -71,7 +71,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -82,7 +82,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -93,7 +93,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -104,7 +104,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -115,7 +115,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -126,7 +126,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -137,7 +137,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The default value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -148,7 +148,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -159,7 +159,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
* The cached value of the '{@link #getSensorValue() Sensor Value}' attribute.
*
*
- *
+ *
* @see #getSensorValue()
* @generated
* @ordered
@@ -171,7 +171,7 @@ public class MNFCIDImpl extends MinimalEObjectImpl.Container implements MNFCID {
/**
*
*
- *
+ *
* @generated
*/
protected MNFCIDImpl() {
@@ -181,7 +181,7 @@ protected MNFCIDImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -192,7 +192,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -203,21 +203,22 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__LOGGER, oldLogger, logger));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -228,21 +229,22 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__UID, oldUid, uid));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -253,21 +255,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__POLL, oldPoll, poll));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -278,22 +281,23 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__ENABLED_A, oldEnabledA,
enabledA));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -304,46 +308,49 @@ public String getSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSubId(String newSubId) {
String oldSubId = subId;
subId = newSubId;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__SUB_ID, oldSubId, subId));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickletNFC getMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFCID__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFCID__MBRICK) {
return null;
+ }
return (MBrickletNFC) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickletNFC basicGetMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFCID__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFCID__MBRICK) {
return null;
+ }
return (MBrickletNFC) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChain msgs) {
@@ -354,32 +361,37 @@ public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChai
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setMbrick(MBrickletNFC newMbrick) {
if (newMbrick != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MNFCID__MBRICK && newMbrick != null)) {
- if (EcoreUtil.isAncestor(this, newMbrick))
+ if (EcoreUtil.isAncestor(this, newMbrick)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
- if (newMbrick != null)
+ }
+ if (newMbrick != null) {
msgs = ((InternalEObject) newMbrick).eInverseAdd(this, ModelPackage.MSUB_DEVICE_HOLDER__MSUBDEVICES,
MSubDeviceHolder.class, msgs);
+ }
msgs = basicSetMbrick(newMbrick, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__MBRICK, newMbrick, newMbrick));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -390,16 +402,17 @@ public StringValue getSensorValue() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSensorValue(StringValue newSensorValue) {
StringValue oldSensorValue = sensorValue;
sensorValue = newSensorValue;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFCID__SENSOR_VALUE, oldSensorValue,
sensorValue));
+ }
}
/**
@@ -421,7 +434,16 @@ public void fetchSensorValue() {
*/
@Override
public void handleTagInfo(NFCTagInfo tagInfo) {
- setSensorValue(new StringValue(tagInfo.getTagIdAsHex()));
+ if (tagInfo == null && nfcConfiguration.isClearValuesOnError()) {
+ setSensorValue(null);
+ return;
+ }
+
+ if (tagInfo == null) {
+ logger.error("ignoring reader error");
+ } else {
+ setSensorValue(new StringValue(tagInfo.getTagIdAsHex()));
+ }
}
/**
@@ -464,15 +486,16 @@ public void disable() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MNFCID__MBRICK:
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetMbrick((MBrickletNFC) otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -481,7 +504,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -496,7 +519,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -512,7 +535,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -529,8 +552,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MNFCID__SUB_ID:
return getSubId();
case ModelPackage.MNFCID__MBRICK:
- if (resolve)
+ if (resolve) {
return getMbrick();
+ }
return basicGetMbrick();
case ModelPackage.MNFCID__SENSOR_VALUE:
return getSensorValue();
@@ -541,7 +565,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -575,7 +599,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -609,7 +633,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -636,7 +660,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -661,7 +685,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -686,7 +710,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -713,7 +737,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -741,13 +765,14 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCTextImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCTextImpl.java
index 89b3d45e6b6..dfbb54eab2b 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCTextImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCTextImpl.java
@@ -53,7 +53,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -64,7 +64,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -75,7 +75,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -86,7 +86,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -97,7 +97,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -108,7 +108,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -119,7 +119,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -130,7 +130,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -141,7 +141,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The default value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -152,7 +152,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -163,7 +163,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
* The cached value of the '{@link #getSensorValue() Sensor Value}' attribute.
*
*
- *
+ *
* @see #getSensorValue()
* @generated
* @ordered
@@ -175,7 +175,7 @@ public class MNFCTextImpl extends MinimalEObjectImpl.Container implements MNFCTe
/**
*
*
- *
+ *
* @generated
*/
protected MNFCTextImpl() {
@@ -185,7 +185,7 @@ protected MNFCTextImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -196,7 +196,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -207,21 +207,22 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__LOGGER, oldLogger, logger));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -232,21 +233,22 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__UID, oldUid, uid));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -257,21 +259,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__POLL, oldPoll, poll));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -282,22 +285,23 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__ENABLED_A, oldEnabledA,
enabledA));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -308,46 +312,49 @@ public String getSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSubId(String newSubId) {
String oldSubId = subId;
subId = newSubId;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__SUB_ID, oldSubId, subId));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickletNFC getMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFC_TEXT__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFC_TEXT__MBRICK) {
return null;
+ }
return (MBrickletNFC) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickletNFC basicGetMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFC_TEXT__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFC_TEXT__MBRICK) {
return null;
+ }
return (MBrickletNFC) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChain msgs) {
@@ -358,33 +365,38 @@ public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChai
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setMbrick(MBrickletNFC newMbrick) {
if (newMbrick != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MNFC_TEXT__MBRICK && newMbrick != null)) {
- if (EcoreUtil.isAncestor(this, newMbrick))
+ if (EcoreUtil.isAncestor(this, newMbrick)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
- if (newMbrick != null)
+ }
+ if (newMbrick != null) {
msgs = ((InternalEObject) newMbrick).eInverseAdd(this, ModelPackage.MSUB_DEVICE_HOLDER__MSUBDEVICES,
MSubDeviceHolder.class, msgs);
+ }
msgs = basicSetMbrick(newMbrick, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__MBRICK, newMbrick,
newMbrick));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -395,16 +407,17 @@ public StringValue getSensorValue() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSensorValue(StringValue newSensorValue) {
StringValue oldSensorValue = sensorValue;
sensorValue = newSensorValue;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_TEXT__SENSOR_VALUE, oldSensorValue,
sensorValue));
+ }
}
/**
@@ -426,6 +439,16 @@ public void fetchSensorValue() {
*/
@Override
public void handleNDEFRecord(NDEFRecord record) {
+ if (record == null && nfcConfiguration.isClearValuesOnError()) {
+ setSensorValue(null);
+ return;
+ }
+
+ if (record == null && !nfcConfiguration.isClearValuesOnError()) {
+ logger.error("ignoring reader error");
+ return;
+ }
+
Optional textValue = getOptionalTextFromRecord(record);
if (!setTextValueIfPresent(textValue) && nfcConfiguration.isResetOldValues()) {
// resets the current state
@@ -496,15 +519,16 @@ public void disable() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MNFC_TEXT__MBRICK:
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetMbrick((MBrickletNFC) otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -513,7 +537,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -528,7 +552,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -544,7 +568,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -561,8 +585,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MNFC_TEXT__SUB_ID:
return getSubId();
case ModelPackage.MNFC_TEXT__MBRICK:
- if (resolve)
+ if (resolve) {
return getMbrick();
+ }
return basicGetMbrick();
case ModelPackage.MNFC_TEXT__SENSOR_VALUE:
return getSensorValue();
@@ -573,7 +598,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -608,7 +633,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -642,7 +667,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -669,7 +694,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -694,7 +719,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -719,7 +744,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -746,7 +771,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -774,13 +799,14 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCUriImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCUriImpl.java
index c3df565725f..66ffd8ec74f 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCUriImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/MNFCUriImpl.java
@@ -52,7 +52,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The default value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -63,7 +63,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #getLogger() Logger}' attribute.
*
*
- *
+ *
* @see #getLogger()
* @generated
* @ordered
@@ -74,7 +74,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The default value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -85,7 +85,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #getUid() Uid}' attribute.
*
*
- *
+ *
* @see #getUid()
* @generated
* @ordered
@@ -96,7 +96,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The default value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -107,7 +107,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #isPoll() Poll}' attribute.
*
*
- *
+ *
* @see #isPoll()
* @generated
* @ordered
@@ -118,7 +118,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The default value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -129,7 +129,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #getEnabledA() Enabled A}' attribute.
*
*
- *
+ *
* @see #getEnabledA()
* @generated
* @ordered
@@ -140,7 +140,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The default value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -151,7 +151,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #getSubId() Sub Id}' attribute.
*
*
- *
+ *
* @see #getSubId()
* @generated
* @ordered
@@ -162,7 +162,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
* The cached value of the '{@link #getSensorValue() Sensor Value}' attribute.
*
*
- *
+ *
* @see #getSensorValue()
* @generated
* @ordered
@@ -174,7 +174,7 @@ public class MNFCUriImpl extends MinimalEObjectImpl.Container implements MNFCUri
/**
*
*
- *
+ *
* @generated
*/
protected MNFCUriImpl() {
@@ -184,7 +184,7 @@ protected MNFCUriImpl() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -195,7 +195,7 @@ protected EClass eStaticClass() {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -206,21 +206,22 @@ public Logger getLogger() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setLogger(Logger newLogger) {
Logger oldLogger = logger;
logger = newLogger;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__LOGGER, oldLogger, logger));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -231,21 +232,22 @@ public String getUid() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setUid(String newUid) {
String oldUid = uid;
uid = newUid;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__UID, oldUid, uid));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -256,21 +258,22 @@ public boolean isPoll() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setPoll(boolean newPoll) {
boolean oldPoll = poll;
poll = newPoll;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__POLL, oldPoll, poll));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -281,22 +284,23 @@ public AtomicBoolean getEnabledA() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setEnabledA(AtomicBoolean newEnabledA) {
AtomicBoolean oldEnabledA = enabledA;
enabledA = newEnabledA;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__ENABLED_A, oldEnabledA,
enabledA));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -307,46 +311,49 @@ public String getSubId() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSubId(String newSubId) {
String oldSubId = subId;
subId = newSubId;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__SUB_ID, oldSubId, subId));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
public MBrickletNFC getMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFC_URI__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFC_URI__MBRICK) {
return null;
+ }
return (MBrickletNFC) eContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public MBrickletNFC basicGetMbrick() {
- if (eContainerFeatureID() != ModelPackage.MNFC_URI__MBRICK)
+ if (eContainerFeatureID() != ModelPackage.MNFC_URI__MBRICK) {
return null;
+ }
return (MBrickletNFC) eInternalContainer();
}
/**
*
*
- *
+ *
* @generated
*/
public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChain msgs) {
@@ -357,32 +364,37 @@ public NotificationChain basicSetMbrick(MBrickletNFC newMbrick, NotificationChai
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setMbrick(MBrickletNFC newMbrick) {
if (newMbrick != eInternalContainer()
|| (eContainerFeatureID() != ModelPackage.MNFC_URI__MBRICK && newMbrick != null)) {
- if (EcoreUtil.isAncestor(this, newMbrick))
+ if (EcoreUtil.isAncestor(this, newMbrick)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
- if (newMbrick != null)
+ }
+ if (newMbrick != null) {
msgs = ((InternalEObject) newMbrick).eInverseAdd(this, ModelPackage.MSUB_DEVICE_HOLDER__MSUBDEVICES,
MSubDeviceHolder.class, msgs);
+ }
msgs = basicSetMbrick(newMbrick, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__MBRICK, newMbrick, newMbrick));
+ }
}
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -393,16 +405,17 @@ public StringValue getSensorValue() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public void setSensorValue(StringValue newSensorValue) {
StringValue oldSensorValue = sensorValue;
sensorValue = newSensorValue;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MNFC_URI__SENSOR_VALUE, oldSensorValue,
sensorValue));
+ }
}
/**
@@ -424,6 +437,16 @@ public void fetchSensorValue() {
*/
@Override
public void handleNDEFRecord(NDEFRecord record) {
+ if (record == null && nfcConfiguration.isClearValuesOnError()) {
+ setSensorValue(null);
+ return;
+ }
+
+ if (record == null && !nfcConfiguration.isClearValuesOnError()) {
+ logger.error("ignoring reader error");
+ return;
+ }
+
Optional uriValue = getOptionalUriFromRecord(record);
if (!setUriValueIfPresent(uriValue) && nfcConfiguration.isResetOldValues()) {
// resets the current state
@@ -492,15 +515,16 @@ public void disable() {
/**
*
*
- *
+ *
* @generated
*/
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelPackage.MNFC_URI__MBRICK:
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetMbrick((MBrickletNFC) otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -509,7 +533,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -524,7 +548,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -540,7 +564,7 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -557,8 +581,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
case ModelPackage.MNFC_URI__SUB_ID:
return getSubId();
case ModelPackage.MNFC_URI__MBRICK:
- if (resolve)
+ if (resolve) {
return getMbrick();
+ }
return basicGetMbrick();
case ModelPackage.MNFC_URI__SENSOR_VALUE:
return getSensorValue();
@@ -569,7 +594,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -603,7 +628,7 @@ public void eSet(int featureID, Object newValue) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -637,7 +662,7 @@ public void eUnset(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -664,7 +689,7 @@ public boolean eIsSet(int featureID) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -689,7 +714,7 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -714,7 +739,7 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -741,7 +766,7 @@ public int eDerivedOperationID(int baseOperationID, Class> baseClass) {
/**
*
*
- *
+ *
* @generated
*/
@Override
@@ -769,13 +794,14 @@ public Object eInvoke(int operationID, EList> arguments) throws InvocationTarg
/**
*
*
- *
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
StringBuilder result = new StringBuilder(super.toString());
result.append(" (logger: ");
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/ModelPackageImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/ModelPackageImpl.java
index af55ed50a2f..f911cc8c3ac 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/ModelPackageImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/ModelPackageImpl.java
@@ -9870,7 +9870,7 @@ public EClass getNFCConfiguration() {
*
* @generated
*/
- public EAttribute getNFCConfiguration_ResetOldValues() {
+ public EAttribute getNFCConfiguration_ClearValuesOnError() {
return (EAttribute) nfcConfigurationEClass.getEStructuralFeatures().get(0);
}
@@ -9880,7 +9880,7 @@ public EAttribute getNFCConfiguration_ResetOldValues() {
*
* @generated
*/
- public EAttribute getNFCConfiguration_TriggeredScan() {
+ public EAttribute getNFCConfiguration_ResetOldValues() {
return (EAttribute) nfcConfigurationEClass.getEStructuralFeatures().get(1);
}
@@ -9890,10 +9890,20 @@ public EAttribute getNFCConfiguration_TriggeredScan() {
*
* @generated
*/
- public EAttribute getNFCConfiguration_DelayAfterScan() {
+ public EAttribute getNFCConfiguration_TriggeredScan() {
return (EAttribute) nfcConfigurationEClass.getEStructuralFeatures().get(2);
}
+ /**
+ *
+ *
+ *
+ * @generated
+ */
+ public EAttribute getNFCConfiguration_DelayAfterScan() {
+ return (EAttribute) nfcConfigurationEClass.getEStructuralFeatures().get(3);
+ }
+
/**
*
*
@@ -11945,6 +11955,7 @@ public void createPackageContents() {
createEAttribute(brickletOLEDConfigurationEClass, BRICKLET_OLED_CONFIGURATION__INVERT);
nfcConfigurationEClass = createEClass(NFC_CONFIGURATION);
+ createEAttribute(nfcConfigurationEClass, NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR);
createEAttribute(nfcConfigurationEClass, NFC_CONFIGURATION__RESET_OLD_VALUES);
createEAttribute(nfcConfigurationEClass, NFC_CONFIGURATION__TRIGGERED_SCAN);
createEAttribute(nfcConfigurationEClass, NFC_CONFIGURATION__DELAY_AFTER_SCAN);
@@ -15539,6 +15550,9 @@ public void initializePackageContents() {
initEClass(nfcConfigurationEClass, NFCConfiguration.class, "NFCConfiguration", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getNFCConfiguration_ClearValuesOnError(), theEcorePackage.getEBoolean(), "clearValuesOnError",
+ "false", 0, 1, NFCConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getNFCConfiguration_ResetOldValues(), theEcorePackage.getEBoolean(), "resetOldValues", "true", 0,
1, NFCConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
!IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/NFCConfigurationImpl.java b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/NFCConfigurationImpl.java
index b6120ea3feb..5c09c41e50b 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/NFCConfigurationImpl.java
+++ b/bundles/binding/org.openhab.binding.tinkerforge/src/main/java/org/openhab/binding/tinkerforge/internal/model/impl/NFCConfigurationImpl.java
@@ -20,6 +20,8 @@
* The following features are implemented:
*
*
+ * - {@link org.openhab.binding.tinkerforge.internal.model.impl.NFCConfigurationImpl#isClearValuesOnError Clear
+ * Values On Error}
* - {@link org.openhab.binding.tinkerforge.internal.model.impl.NFCConfigurationImpl#isResetOldValues Reset Old
* Values}
* - {@link org.openhab.binding.tinkerforge.internal.model.impl.NFCConfigurationImpl#isTriggeredScan Triggered
@@ -31,6 +33,28 @@
* @generated
*/
public class NFCConfigurationImpl extends MinimalEObjectImpl.Container implements NFCConfiguration {
+ /**
+ * The default value of the '{@link #isClearValuesOnError() Clear Values On Error}' attribute.
+ *
+ *
+ *
+ * @see #isClearValuesOnError()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean CLEAR_VALUES_ON_ERROR_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isClearValuesOnError() Clear Values On Error}' attribute.
+ *
+ *
+ *
+ * @see #isClearValuesOnError()
+ * @generated
+ * @ordered
+ */
+ protected boolean clearValuesOnError = CLEAR_VALUES_ON_ERROR_EDEFAULT;
+
/**
* The default value of the '{@link #isResetOldValues() Reset Old Values}' attribute.
*
@@ -118,6 +142,30 @@ protected EClass eStaticClass() {
return ModelPackage.Literals.NFC_CONFIGURATION;
}
+ /**
+ *
+ *
+ *
+ * @generated
+ */
+ public boolean isClearValuesOnError() {
+ return clearValuesOnError;
+ }
+
+ /**
+ *
+ *
+ *
+ * @generated
+ */
+ public void setClearValuesOnError(boolean newClearValuesOnError) {
+ boolean oldClearValuesOnError = clearValuesOnError;
+ clearValuesOnError = newClearValuesOnError;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR,
+ oldClearValuesOnError, clearValuesOnError));
+ }
+
/**
*
*
@@ -199,6 +247,8 @@ public void setDelayAfterScan(int newDelayAfterScan) {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case ModelPackage.NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR:
+ return isClearValuesOnError();
case ModelPackage.NFC_CONFIGURATION__RESET_OLD_VALUES:
return isResetOldValues();
case ModelPackage.NFC_CONFIGURATION__TRIGGERED_SCAN:
@@ -218,6 +268,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case ModelPackage.NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR:
+ setClearValuesOnError((Boolean) newValue);
+ return;
case ModelPackage.NFC_CONFIGURATION__RESET_OLD_VALUES:
setResetOldValues((Boolean) newValue);
return;
@@ -240,6 +293,9 @@ public void eSet(int featureID, Object newValue) {
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case ModelPackage.NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR:
+ setClearValuesOnError(CLEAR_VALUES_ON_ERROR_EDEFAULT);
+ return;
case ModelPackage.NFC_CONFIGURATION__RESET_OLD_VALUES:
setResetOldValues(RESET_OLD_VALUES_EDEFAULT);
return;
@@ -262,6 +318,8 @@ public void eUnset(int featureID) {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case ModelPackage.NFC_CONFIGURATION__CLEAR_VALUES_ON_ERROR:
+ return clearValuesOnError != CLEAR_VALUES_ON_ERROR_EDEFAULT;
case ModelPackage.NFC_CONFIGURATION__RESET_OLD_VALUES:
return resetOldValues != RESET_OLD_VALUES_EDEFAULT;
case ModelPackage.NFC_CONFIGURATION__TRIGGERED_SCAN:
@@ -284,7 +342,9 @@ public String toString() {
return super.toString();
StringBuilder result = new StringBuilder(super.toString());
- result.append(" (resetOldValues: ");
+ result.append(" (clearValuesOnError: ");
+ result.append(clearValuesOnError);
+ result.append(", resetOldValues: ");
result.append(resetOldValues);
result.append(", triggeredScan: ");
result.append(triggeredScan);