refactor

src/main/java/hello/agh/edu/bazy/dbApi/sensors/SensorsDbApi.java

@@ -161,13 +161,13 @@ public class SensorsDbApi {
         List<speedFamily> speed=getSpeedById(id);
         List<temperatureFamily> temperature=getTemperatureById(id);
 
-        if(clock.size()>0)sensorDetailed.setClock(clock.get(0));
-        if(counter.size()>0)sensorDetailed.setCounter(counter.get(0));
+        if(clock.size()>0)sensorDetailed.setClockFamily(clock.get(0));
+        if(counter.size()>0)sensorDetailed.setCounterFamily(counter.get(0));
         if(light.size()>0)sensorDetailed.setLightIntensityFamily(light.get(0));
         if(manual.size()>0)sensorDetailed.setManualFamily(manual.get(0));
-        if(queue.size()>0)sensorDetailed.setQueue(queue.get(0));
-        if(speed.size()>0)sensorDetailed.setSpeed(speed.get(0));
-        if(temperature.size()>0)sensorDetailed.setTemperature(temperature.get(0));
+        if(queue.size()>0)sensorDetailed.setQueueFamily(queue.get(0));
+        if(speed.size()>0)sensorDetailed.setSpeedFamily(speed.get(0));
+        if(temperature.size()>0)sensorDetailed.setTemperatureFamily(temperature.get(0));
         return sensorDetailed;
     }
 }

src/main/java/hello/agh/edu/bazy/row/sensors/ManualFamily.java

@@ -105,7 +105,6 @@ public class ManualFamily {
                 ", reactiontime=" + reactiontime +
                 ", reactiontimeunit='" + reactiontimeunit + '\'' +
                 ", numberofbuttons=" + numberofbuttons +
-                ", counter=" + counter +
                 ", frequencycounter=" + frequencycounter +
                 ", frequencyunits='" + frequencyunits + '\'' +
                 '}';

src/main/java/hello/agh/edu/bazy/row/sensors/SensorDetailed.java

@@ -6,11 +6,11 @@ package hello.agh.edu.bazy.row.sensors;
 public class SensorDetailed {
     ManualFamily manualFamily;
     lightIntensityFamily lightIntensityFamily;
-    clockFamily clock;
-    temperatureFamily temperature;
-    speedFamily speed;
-    queueFamily queue;
-    counterFamily counter;
+    clockFamily clockFamily;
+    temperatureFamily temperatureFamily;
+    speedFamily speedFamily;
+    queueFamily queueFamily;
+    counterFamily counterFamily;
 
     public ManualFamily getManualFamily() {
         return manualFamily;
@@ -28,43 +28,43 @@ public class SensorDetailed {
         this.lightIntensityFamily = lightIntensityFamily;
     }
 
-    public clockFamily getClock() {
-        return clock;
+    public clockFamily getClockFamily() {
+        return clockFamily;
     }
 
-    public void setClock(clockFamily clock) {
-        this.clock = clock;
+    public void setClockFamily(clockFamily clockFamily) {
+        this.clockFamily = clockFamily;
     }
 
-    public temperatureFamily getTemperature() {
-        return temperature;
+    public temperatureFamily getTemperatureFamily() {
+        return temperatureFamily;
     }
 
-    public void setTemperature(temperatureFamily temperature) {
-        this.temperature = temperature;
+    public void setTemperatureFamily(temperatureFamily temperatureFamily) {
+        this.temperatureFamily = temperatureFamily;
     }
 
-    public speedFamily getSpeed() {
-        return speed;
+    public speedFamily getSpeedFamily() {
+        return speedFamily;
     }
 
-    public void setSpeed(speedFamily speed) {
-        this.speed = speed;
+    public void setSpeedFamily(speedFamily speedFamily) {
+        this.speedFamily = speedFamily;
     }
 
-    public queueFamily getQueue() {
-        return queue;
+    public queueFamily getQueueFamily() {
+        return queueFamily;
     }
 
-    public void setQueue(queueFamily queue) {
-        this.queue = queue;
+    public void setQueueFamily(queueFamily queueFamily) {
+        this.queueFamily = queueFamily;
     }
 
-    public counterFamily getCounter() {
-        return counter;
+    public counterFamily getCounterFamily() {
+        return counterFamily;
     }
 
-    public void setCounter(counterFamily counter) {
-        this.counter = counter;
+    public void setCounterFamily(counterFamily counterFamily) {
+        this.counterFamily = counterFamily;
     }
 }