add test device

Author: Daniel Türk

api/src/main/java/net/wbz/selectrix4java/api/device/AbstractDevice.java

@@ -141,8 +141,6 @@ public Void call() throws Exception {
      */
     abstract public void doDisconnect() throws DeviceAccessException;
 
-//    abstract public boolean isConnected();
-
     /**
      * Get {@link net.wbz.selectrix4java.api.bus.BusAddress} to read the data value or send new values.
      * <p/>
@@ -203,7 +201,6 @@ public synchronized BlockModule getBlockModule(byte... addresses) throws DeviceA
         return blockModules.get(busAddress);
     }
 
-
     public synchronized FeedbackBlockModule getFeedbackBlockModule(byte address, byte feedbackAddress, byte... additionalAddresses) throws DeviceAccessException {
         BusAddress busAddress = getBusAddress(1, address);
         if (!blockModules.containsKey(busAddress)) {
@@ -239,10 +236,8 @@ public boolean getRailVoltage() throws DeviceAccessException {
     public void setRailVoltage(boolean state) throws DeviceAccessException {
         BusAddress busAddress = getBusAddress(1, (byte) 127);
         if (state) {
-//            busAddress.setBit(6);
             busAddress.setBit(8);
         } else {
-//            busAddress.clearBit(6);
             busAddress.clearBit(8);
         }
         busAddress.send();

api/src/main/java/net/wbz/selectrix4java/api/device/Device.java

@@ -12,9 +12,9 @@
  */
 public interface Device extends Serializable {
 
-    void addDeviceConnectionListener(DeviceConnectionListener listener);
+    public void addDeviceConnectionListener(DeviceConnectionListener listener);
 
-    void removeDeviceConnectionListener(DeviceConnectionListener listener);
+    public void removeDeviceConnectionListener(DeviceConnectionListener listener);
 
     /**
      * Create connection of the device.
@@ -33,7 +33,7 @@ public interface Device extends Serializable {
      */
     public boolean isConnected();
 
-    BlockModule getBlockModule(byte... addresses) throws DeviceAccessException;
+    public BlockModule getBlockModule(byte... addresses) throws DeviceAccessException;
 
     public boolean getRailVoltage() throws DeviceAccessException;
 

manager/pom.xml

@@ -25,6 +25,17 @@
             <artifactId>selectrix4java-serial</artifactId>
             <version>${project.version}</version>
         </dependency>
+  <dependency>
+            <groupId>net.wbz.selectrix4java</groupId>
+            <artifactId>selectrix4java-test</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.9-RC1</version>
+        </dependency>
     </dependencies>
 
     <build>

manager/src/main/java/net/wbz/selectrix4java/manager/DeviceManager.java

@@ -6,20 +6,42 @@
 import net.wbz.selectrix4java.api.device.Device;
 import net.wbz.selectrix4java.api.device.DeviceAccessException;
 import net.wbz.selectrix4java.api.device.DeviceConnectionListener;
+import net.wbz.selectrix4java.test.TestDevice;
+import org.reflections.Reflections;
 
+import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
- * TODO: refactor
+ * TODO: refactor for multiple device types
  *
  * @author Daniel Tuerk (daniel.tuerk@w-b-z.com)
  */
 public class DeviceManager {
 
     private final Map<String, Device> devices = Maps.newHashMap();
 
-    public enum DEVICE_TYPE {COM1}
+    private final List<DeviceConnectionListener> listeners = Lists.newArrayList();
+
+    public enum DEVICE_TYPE {SERIAL, TEST}
+
+
+
+//    public DeviceManager() {
+//
+//        Reflections reflections = new Reflections("net.wbz.selectrix4java");
+//        Set<Class<? extends Device>> subTypes = reflections.getSubTypesOf(Device.class);
+//
+//        for (Class<? extends Device> deviceClazz : subTypes) {
+//                if(!Modifier.isAbstract(deviceClazz.getModifiers())) {
+//
+//
+//                }
+//        }
+//
+//    }
 
     public Device registerDevice(DEVICE_TYPE type, String deviceId, int baudRate) {
         if (!devices.containsKey(deviceId)) {
@@ -34,8 +56,10 @@ public Device registerDevice(DEVICE_TYPE type, String deviceId, int baudRate) {
 
     private Device createDevice(DEVICE_TYPE type, String deviceId, int baudRate) {
         switch (type) {
-            case COM1:
+            case SERIAL:
                 return new SerialDevice(deviceId, baudRate);
+            case TEST:
+                return new TestDevice();
             default:
                 throw new RuntimeException("no device found for type " + type.name());
         }
@@ -83,7 +107,6 @@ public void removeDevice(Device device) {
         throw new RuntimeException("no device found to delete");
     }
 
-    private final List<DeviceConnectionListener> listeners = Lists.newArrayList();
 
     public void addDeviceConnectionListener(DeviceConnectionListener listener) {
         listeners.add(listener);

pom.xml

@@ -40,6 +40,31 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

serial/src/main/java/net/wbz/selectrix4java/SerialDevice.java

@@ -2,9 +2,7 @@
 
 import gnu.io.CommPortIdentifier;
 import gnu.io.SerialPort;
-import net.wbz.selectrix4java.api.bus.AllBusDataConsumer;
 import net.wbz.selectrix4java.api.bus.BusDataDispatcher;
-import net.wbz.selectrix4java.api.data.BusData;
 import net.wbz.selectrix4java.api.data.BusDataChannel;
 import net.wbz.selectrix4java.api.device.AbstractDevice;
 import net.wbz.selectrix4java.api.device.DeviceAccessException;
@@ -124,7 +122,11 @@ public boolean isConnected() {
         return outputStream != null && inputStream != null;
     }
 
-
+    /**
+     * Test main method to send commands by console and print the output.
+     *
+     * @param args ignored
+     */
     public static void main(String[] args) {
         SerialDevice serialDevice = new SerialDevice("/dev/tty.usbserial-145", SerialDevice.DEFAULT_BAUD_RATE_FCC);
         try {
@@ -157,9 +159,5 @@ public static void main(String[] args) {
         } catch (DeviceAccessException e) {
             e.printStackTrace();
         }
-
-
-
-
     }
 }