Rename SKDataInterface to SKSensorData

Author: minoskt

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ### 0.2.0
   - Added support for Bluetooth sensor module.
-  - DataInterface Method getDataInString() has been renamed to getDataInCSV()
-  - Add SK prefix in all source files
+  - DataInterface method getDataInString() has been renamed to getDataInCSV()
+  - SKDataInterface has been renamed to SKSensorData
+  - Added SK prefix to all source files
 
 ### 0.1.0
   - Initial Release

README.md

@@ -5,7 +5,7 @@ An Android library that provides Continuous Sensing functionality to your applic
 
 ## Supported Sensors
 
-The following sensor modules are currently supported in SensingKit-Android, (listed in [SensorModuleType](SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SensorModuleType.java) enum):
+The following sensor modules are currently supported in SensingKit-Android, (listed in [SKSensorModuleType](SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SKSensorModuleType.java) enum):
 
 - Accelerometer
 - Gravity
@@ -82,8 +82,8 @@ mSensingKitLib.registerSensorModule(SKSensorModuleType.LIGHT);
 ```java
 mSensingKitLib.subscribeSensorDataListener(SKSensorModuleType.LIGHT, new SKSensorDataListener() {
     @Override
-    public void onDataReceived(final SKSensorModuleType moduleType, final SKDataInterface moduleData) {
-        System.out.println(moduleData.getDataInCSV());  // Print data in CSV format
+    public void onDataReceived(final SKSensorModuleType moduleType, final SKSensorData sensorData) {
+        System.out.println(sensorData.getDataInCSV());  // Print data in CSV format
     }
 });
 ```
@@ -92,7 +92,7 @@ mSensingKitLib.subscribeSensorDataListener(SKSensorModuleType.LIGHT, new SKSenso
 - You can cast the data object into the actual sensor data object in order to access all the sensor data properties:
 
 ```java
-SKLightData lightData = (SKLightData)moduleData;
+SKLightData lightData = (SKLightData)sensorData;
 ```
 
 

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SKSensorDataListener.java

@@ -21,10 +21,10 @@
 
 package org.sensingkit.sensingkitlib;
 
-import org.sensingkit.sensingkitlib.data.SKDataInterface;
+import org.sensingkit.sensingkitlib.data.SKSensorData;
 
 public interface SKSensorDataListener {
 
-    void onDataReceived(final SKSensorModuleType moduleType, final SKDataInterface moduleData);
+    void onDataReceived(final SKSensorModuleType moduleType, final SKSensorData sensorData);
 
 }

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SKSensorModuleManager.java

@@ -25,7 +25,7 @@
 import android.util.Log;
 import android.util.SparseArray;
 
-import org.sensingkit.sensingkitlib.data.SKDataInterface;
+import org.sensingkit.sensingkitlib.data.SKSensorData;
 import org.sensingkit.sensingkitlib.modules.*;
 
 public class SKSensorModuleManager {
@@ -203,7 +203,7 @@ protected SKAbstractSensorModule createSensorModule(SKSensorModuleType moduleTyp
         return sensorModule;
     }
 
-    public SKDataInterface getDataFromSensor(SKSensorModuleType moduleType) throws SKException {
+    public SKSensorData getDataFromSensor(SKSensorModuleType moduleType) throws SKException {
 
         Log.i(TAG, "Get data from sensor: " + SKSensorModuleUtilities.getSensorModuleInString(moduleType) + ".");
 

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SensingKitLib.java

@@ -24,7 +24,7 @@
 import android.content.Context;
 import android.os.PowerManager;
 
-import org.sensingkit.sensingkitlib.data.SKDataInterface;
+import org.sensingkit.sensingkitlib.data.SKSensorData;
 
 
 public class SensingKitLib implements SensingKitLibInterface {
@@ -74,7 +74,7 @@ public boolean isSensorModuleRegistered(SKSensorModuleType moduleType) throws SK
     }
 
     @Override
-    public SKDataInterface getDataFromSensor(SKSensorModuleType moduleType) throws SKException {
+    public SKSensorData getDataFromSensor(SKSensorModuleType moduleType) throws SKException {
         return mSensorModuleManager.getDataFromSensor(moduleType);
     }
 

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SensingKitLibInterface.java

@@ -21,7 +21,7 @@
 
 package org.sensingkit.sensingkitlib;
 
-import org.sensingkit.sensingkitlib.data.SKDataInterface;
+import org.sensingkit.sensingkitlib.data.SKSensorData;
 
 @SuppressWarnings("unused")
 public interface SensingKitLibInterface {
@@ -40,7 +40,7 @@ public interface SensingKitLibInterface {
 
     /** One Shot Sensing */
 
-    SKDataInterface getDataFromSensor(SKSensorModuleType moduleType) throws SKException;
+    SKSensorData getDataFromSensor(SKSensorModuleType moduleType) throws SKException;
 
 
     /** Continuous Sensing */

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAbstractData.java

@@ -21,7 +21,7 @@
 
 package org.sensingkit.sensingkitlib.data;
 
-public abstract class SKAbstractData implements SKDataInterface
+public abstract class SKAbstractData implements SKSensorData
 {
     @SuppressWarnings("unused")
     private static final String TAG = "SKAbstractData";

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKDataInterface.java renamed to SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKSensorData.java

@@ -21,7 +21,7 @@
 
 package org.sensingkit.sensingkitlib.data;
 
-public interface SKDataInterface {
+public interface SKSensorData {
 
     String getDataInCSV();