michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Story28_GetCorrectTimeZone' into develop

Browse Source 
# Conflicts:
#	src/main/java/seng302/controllers/Controller.java
This commit is contained in:
Alistair McIntyre
2017-05-04 14:15:05 +12:00
parent 9b063190ce 59809c39ea
commit 3080c1bf27
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/Controller.java
+6 -1
View File
@@ -24,6 +24,9 @@ import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ResourceBundle;
import java.util.Timer;
import java.util.TimerTask;
public class Controller implements Initializable {
@FXML
@@ -65,7 +68,9 @@ public class Controller implements Initializable {
@Override
public void initialize(URL location, ResourceBundle resources) {
//DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
//format.setTimeZone(TimeZone.getTimeZone("GMT-8"));
//realTime.setText(format.format(new Date()));
}
/**