From 121baa19ecdce3de3838834ea406a238ee3191b2 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Tue, 18 Aug 2015 01:26:15 +0200 Subject: [PATCH] Move AbstractSerialDeviceSupport et al from bt package into serial package --- .../gadgetbridge/service/devices/pebble/PebbleIoThread.java | 4 ++-- .../gadgetbridge/service/devices/pebble/PebbleProtocol.java | 2 +- .../gadgetbridge/service/devices/pebble/PebbleSupport.java | 6 +++--- .../service/{bt => serial}/AbstractSerialDeviceSupport.java | 2 +- .../service/{bt => serial}/GBDeviceIoThread.java | 2 +- .../service/{bt => serial}/GBDeviceProtocol.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{bt => serial}/AbstractSerialDeviceSupport.java (99%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{bt => serial}/GBDeviceIoThread.java (91%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{bt => serial}/GBDeviceProtocol.java (96%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java index 69d49379a..4721ca33c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java @@ -28,8 +28,8 @@ import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleInstallable; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; -import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread; -import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceIoThread; +import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import nodomain.freeyourgadget.gadgetbridge.util.GB; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java index 7ff1785d6..cf6619136 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java @@ -24,7 +24,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand; -import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol; public class PebbleProtocol extends GBDeviceProtocol { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java index 77ae6217b..0d2f26ab9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java @@ -5,9 +5,9 @@ import android.net.Uri; import java.util.ArrayList; import nodomain.freeyourgadget.gadgetbridge.model.Alarm; -import nodomain.freeyourgadget.gadgetbridge.service.bt.AbstractSerialDeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread; -import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.serial.AbstractSerialDeviceSupport; +import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceIoThread; +import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol; public class PebbleSupport extends AbstractSerialDeviceSupport { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractSerialDeviceSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java index 89e0afb92..9220a6b3a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractSerialDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.bt; +package nodomain.freeyourgadget.gadgetbridge.service.serial; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java similarity index 91% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java index 6a5666e69..31be6f02f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.bt; +package nodomain.freeyourgadget.gadgetbridge.service.serial; import android.content.Context; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java index 0066a9143..b5fe9ba77 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.bt; +package nodomain.freeyourgadget.gadgetbridge.service.serial; import java.util.UUID;