2 files changed, 0 insertions, 136 deletions
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java
deleted file mode 100644
index 8bb0deea8..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import com.twine.tango.dal.TangoDB;
-
-
-    @Table(name = "CARTRIDGES", database = TangoDB.class)
-    public class Cartridge extends Entity 
-    {
-    
-            @Column(name = "SERIAL_NUMBER")
-            private String serialNumber;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private CartridgeType cartridgeType;
-
-    
-
-     
-         /**
-         * Gets the SerialNumber.
-         *
-         * return the SerialNumber
-         */
-         public String getSerialNumber()
-         {
-            return serialNumber;
-         }
-
-         /**
-         * Sets the SerialNumber.
-         *
-         * @param serialNumber the SerialNumber
-         */
-         public void setSerialNumber(String serialNumber)
-         {
-            this.serialNumber = serialNumber;
-         }
-     
-     
-         /**
-         * Gets the CartridgeType.
-         *
-         * return the CartridgeType
-         */
-         public CartridgeType getCartridgeType()
-         {
-            return cartridgeType;
-         }
-
-         /**
-         * Sets the CartridgeType.
-         *
-         * @param cartridgeType the CartridgeType
-         */
-         public void setCartridgeType(CartridgeType cartridgeType)
-         {
-            this.cartridgeType = cartridgeType;
-         }
-     
-    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java
deleted file mode 100644
index a00ae780e..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.twine.tango.dal.entities;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
-import com.twine.tango.dal.TangoDB;
-
-
-    @Table(name = "DISPENSERS", database = TangoDB.class)
-    public class Dispenser extends Entity 
-    {
-    
-            @Column(name = "SERIAL_NUMBER")
-            private String serialNumber;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPE_GUID", foreignKeyColumnName = "GUID")})
-            private DispenserType dispenserType;
-
-    
-
-     
-         /**
-         * Gets the SerialNumber.
-         *
-         * return the SerialNumber
-         */
-         public String getSerialNumber()
-         {
-            return serialNumber;
-         }
-
-         /**
-         * Sets the SerialNumber.
-         *
-         * @param serialNumber the SerialNumber
-         */
-         public void setSerialNumber(String serialNumber)
-         {
-            this.serialNumber = serialNumber;
-         }
-     
-     
-         /**
-         * Gets the DispenserType.
-         *
-         * return the DispenserType
-         */
-         public DispenserType getDispenserType()
-         {
-            return dispenserType;
-         }
-
-         /**
-         * Sets the DispenserType.
-         *
-         * @param dispenserType the DispenserType
-         */
-         public void setDispenserType(DispenserType dispenserType)
-         {
-            this.dispenserType = dispenserType;
-         }
-     
-    }