From c543ec6ea8fd61e6a43c43158e5d27f4ef6c27bd Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 3 Jan 2013 03:22:54 +0000 Subject: [PATCH] Fixes. --- .../src/main/java/com/gempukku/lotro/DateUtils.java | 6 ++++++ .../main/java/com/gempukku/lotro/db/DbTournamentDAO.java | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DateUtils.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DateUtils.java index 33a289cfa..be04f7ce2 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DateUtils.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/DateUtils.java @@ -30,6 +30,12 @@ public class DateUtils { return format.format(date); } + public static Date parseDateWithHour(String date) throws ParseException { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + return format.parse(date); + } + public static int offsetDate(int start, int dayOffset) { try { SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java index 2ae3a35fe..357b959c0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.db; +import com.gempukku.lotro.DateUtils; import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.tournament.Tournament; import com.gempukku.lotro.tournament.TournamentDAO; @@ -10,6 +11,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -236,7 +238,7 @@ public class DbTournamentDAO implements TournamentDAO { } } - public static void main(String[] args) { - System.out.println(System.currentTimeMillis()+2*60*1000); + public static void main(String[] args) throws ParseException { + System.out.println(DateUtils.parseDateWithHour("2013-01-05 17:30:00").getTime()); } }