have the override for logevent

pid1 · Apr 17, 2015 · 64a0764 · 64a0764
1 parent f5a1f1d
commit 64a0764
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/bin/interface_xml_files/Thermocontroller.fxml b/bin/interface_xml_files/Thermocontroller.fxml
@@ -17,7 +17,7 @@
             <Font name="Helvetica Neue" size="13.0" />
          </font>
       </Label>
-      <Slider fx:id="slider" layoutX="128.0" layoutY="134.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="66.0" />
+      <Slider fx:id="slider" layoutX="112.0" layoutY="133.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="67.0" />
       <Separator layoutX="81.0" layoutY="181.0" prefWidth="200.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" />
       <Label layoutX="104.0" layoutY="184.0" text="System Mode: " AnchorPane.bottomAnchor="10.0">
          <font>
@@ -30,6 +30,5 @@
          </font>
       </Label>
       <Separator layoutX="21.0" layoutY="107.0" prefHeight="3.0" prefWidth="299.0" />
-      <ProgressIndicator fx:id="progressIndicator" layoutX="55.0" layoutY="119.0" progress="0.71" />
    </children>
 </AnchorPane>
diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
@@ -5,7 +5,7 @@
 //represents local methods for when the server structure calls this
 
 public class Database extends DataStructure implements Thermostatable{
-d
+
 	public Database(){
 		this.updateTable("UserTable", null, null, null);
 
@@ -58,5 +58,13 @@ public String getDevicesFromEmail(String email){
 		return null;
 	}
 
+
+
+	@Override
+	public String datastructureLogEvent() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
 
diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java
@@ -0,0 +1,24 @@
+package testing;
+import InputOutput.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+public class DatabaseTest {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		Database testbase =new Database();
+		testbase.set
+
+
+
+	}
+
+}