Revert 4685 modbus internal (openhab#4704)

Signed-off-by: Maximilian Hess <[email protected]>
ne0h · Sep 15, 2019 · 774d919 · 774d919
1 parent c5cd26f
commit 774d919
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Vendor: openHAB
 Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
-Import-Package: 
- org.apache.commons.lang,
+Import-Package: org.apache.commons.lang,
  org.apache.commons.lang.builder,
  org.eclipse.jdt.annotation;resolution:=optional,
  org.eclipse.smarthome.core.library.items,
@@ -18,10 +17,14 @@ Import-Package:
  org.eclipse.smarthome.core.transform,
  org.eclipse.smarthome.core.types,
  org.eclipse.smarthome.config.core,
+ org.openhab.binding.modbus,
+ org.openhab.binding.modbus.handler,
  org.openhab.io.transport.modbus,
  org.openhab.io.transport.modbus.endpoint,
  org.openhab.io.transport.modbus.json,
  org.osgi.framework,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
+Export-Package: org.openhab.binding.modbus,
+ org.openhab.binding.modbus.handler
 Bundle-ActivationPolicy: lazy
diff --git a/...dbus/internal/ModbusBindingConstants.java → ...inding/modbus/ModbusBindingConstants.java b/...dbus/internal/ModbusBindingConstants.java → ...inding/modbus/ModbusBindingConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.modbus.internal;
+package org.openhab.binding.modbus;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 

diff --git a/...dler/EndpointNotInitializedException.java → ...dler/EndpointNotInitializedException.java b/...dler/EndpointNotInitializedException.java → ...dler/EndpointNotInitializedException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.modbus.internal.handler;
+package org.openhab.binding.modbus.handler;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 

diff --git a/...l/handler/ModbusEndpointThingHandler.java → ...s/handler/ModbusEndpointThingHandler.java b/...l/handler/ModbusEndpointThingHandler.java → ...s/handler/ModbusEndpointThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.modbus.internal.handler;
+package org.openhab.binding.modbus.handler;
 
 import java.util.function.Supplier;
 

diff --git a/...bus/src/main/java/org/openhab/binding/modbus/internal/ModbusBindingConstantsInternal.java b/...bus/src/main/java/org/openhab/binding/modbus/internal/ModbusBindingConstantsInternal.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.modbus.internal;
 
-import static org.openhab.binding.modbus.internal.ModbusBindingConstants.BINDING_ID;
+import static org.openhab.binding.modbus.ModbusBindingConstants.BINDING_ID;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../java/org/openhab/binding/modbus/internal/handler/AbstractModbusEndpointThingHandler.java b/.../java/org/openhab/binding/modbus/internal/handler/AbstractModbusEndpointThingHandler.java
@@ -22,6 +22,7 @@
 import org.eclipse.smarthome.core.thing.ThingStatusDetail;
 import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
 import org.eclipse.smarthome.core.types.Command;
+import org.openhab.binding.modbus.handler.ModbusEndpointThingHandler;
 import org.openhab.binding.modbus.internal.ModbusConfigurationException;
 import org.openhab.io.transport.modbus.ModbusManager;
 import org.openhab.io.transport.modbus.ModbusManagerListener;

diff --git a/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
@@ -53,6 +53,8 @@
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
+import org.openhab.binding.modbus.handler.ModbusEndpointThingHandler;
 import org.openhab.binding.modbus.internal.ModbusBindingConstantsInternal;
 import org.openhab.binding.modbus.internal.ModbusConfigurationException;
 import org.openhab.binding.modbus.internal.Transformation;

diff --git a/...c/main/java/org/openhab/binding/modbus/internal/handler/ModbusPollerThingHandlerImpl.java b/...c/main/java/org/openhab/binding/modbus/internal/handler/ModbusPollerThingHandlerImpl.java
@@ -33,6 +33,8 @@
 import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
 import org.eclipse.smarthome.core.thing.binding.ThingHandler;
 import org.eclipse.smarthome.core.types.Command;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
+import org.openhab.binding.modbus.handler.ModbusEndpointThingHandler;
 import org.openhab.binding.modbus.internal.AtomicStampedKeyValue;
 import org.openhab.binding.modbus.internal.ModbusBindingConstantsInternal;
 import org.openhab.binding.modbus.internal.config.ModbusPollerConfiguration;