wip

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11.0.3" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11.0.5" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java

@@ -11,7 +11,7 @@ import javax.persistence.OneToMany;
  */
 @Entity
 public class ButtonDimmer extends Dimmer {
-    @OneToMany(mappedBy = "")
+    @OneToMany(mappedBy = "button_dimmer")
     private Set<DimmableLight> lights = new HashSet<DimmableLight>();
 
     public ButtonDimmer() {

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java

@@ -11,7 +11,7 @@ import javax.persistence.OneToMany;
  */
 @Entity
 public class KnobDimmer extends Dimmer {
-    @OneToMany(mappedBy = "")
+    @OneToMany(mappedBy = "knob_dimmer")
     private Set<DimmableLight> lights = new HashSet<DimmableLight>();
 
     public KnobDimmer() {

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java

@@ -1,11 +1,29 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 /** A switch input device TODO: define switch behaviour (push button vs on/off state) */
 @Entity
 public class Switch extends InputDevice {
+
+    /** The state of this switch */
+    @Column private boolean switchState = false;
+
     public Switch() {
         super("switch");
     }
+
+    /**
+     * Setter method for Switch
+     *
+     * @param state The state to be set
+     */
+    void setState(boolean state) {
+        switchState = state;
+    }
+
+    boolean getState() {
+        return switchState;
+    }
 }