[client] helper for DateTime widget reading, and use it in LectureCreationPage

2 files changed, 37 insertions, 29 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java
new file mode 100644
index 00000000..6c404f9b
--- /dev/null
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DateTimeHelper.java
@@ -0,0 +1,34 @@
+package org.openslx.dozmod.gui.helper;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import javax.swing.JSpinner;
+
+import org.jdatepicker.impl.JDatePickerImpl;
+
+public class DateTimeHelper {
+	/**
+	 * Returns the Date composed of the given datePicker's date and the given timeSpinner's time
+	 * 
+	 * @param datePicker to extract the date from
+	 * @param timeSpinner to extract the time from
+	 * @return Date represented by datePicker's day and timeSpinner's time
+	 */
+	public static Date getDateFrom(JDatePickerImpl datePicker, JSpinner timeSpinner) {
+		// start date from the DatePicker
+		int years = datePicker.getModel().getYear();
+		int months = datePicker.getModel().getMonth();
+		int days = datePicker.getModel().getDay();
+		// start time from the Spinner
+		Date time = (Date) timeSpinner.getValue();
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(time);
+		int hours = cal.get(Calendar.HOUR_OF_DAY);
+		int minutes = cal.get(Calendar.MINUTE);
+		// build the time from the single values
+		cal.set(years, months, days, hours, minutes);
+		Date date = cal.getTime();
+		return date;
+	}
+}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
index 7a655c24..5adff7ba 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
@@ -2,17 +2,15 @@ package org.openslx.dozmod.gui.wizard.page;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Calendar;
 import java.util.Date;
 
-import javax.swing.JSpinner;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import org.apache.log4j.Logger;
-import org.jdatepicker.impl.JDatePickerImpl;
+import org.openslx.dozmod.gui.helper.DateTimeHelper;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.LectureCreationPageLayout;
 import org.openslx.dozmod.state.LectureWizardState;
@@ -101,8 +99,8 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 		}
 		// TODO max <sat config> months checks
 		final Date now = new Date();
-		final Date start = getDateFrom(startDate, startTime);
-		final Date end = getDateFrom(endDate, endTime);
+		final Date start = DateTimeHelper.getDateFrom(startDate, startTime);
+		final Date end = DateTimeHelper.getDateFrom(endDate, endTime);
 
 		if (start.after(end)) {
 			setWarningMessage("Startzeit is nach Endzeit!");
@@ -117,28 +115,4 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 		setDescription("Klicken Sie auf 'Weiter' für Berechtigungen oder 'Fertigstellen'");
 		return true;
 	}
-
-	/**
-	 * TODO
-	 * 
-	 * @param datePicker
-	 * @param timeSpinner
-	 * @return
-	 */
-	private Date getDateFrom(JDatePickerImpl datePicker, JSpinner timeSpinner) {
-		// start date from the DatePicker
-		int years = datePicker.getModel().getYear();
-		int months = datePicker.getModel().getMonth();
-		int days = datePicker.getModel().getDay();
-		// start time from the Spinner
-		Date time = (Date) timeSpinner.getValue();
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(time);
-		int hours = cal.get(Calendar.HOUR_OF_DAY);
-		int minutes = cal.get(Calendar.MINUTE);
-		// build the time from the single values
-		cal.set(years, months, days, hours, minutes);
-		Date date = cal.getTime();
-		return date;
-	}
 }