summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2015-09-07 14:42:23 +0200
committerJonathan Bauer2015-09-07 14:42:23 +0200
commit8ec286b6a168a0efd0ebf5c4d02d672420ec661a (patch)
tree2c8de70578acda9790de3a2c9c83f7d597955163
parent[client] fallback nullcheck for getters (diff)
downloadtutor-module-8ec286b6a168a0efd0ebf5c4d02d672420ec661a.tar.gz
tutor-module-8ec286b6a168a0efd0ebf5c4d02d672420ec661a.tar.xz
tutor-module-8ec286b6a168a0efd0ebf5c4d02d672420ec661a.zip
[client] use QDateTimeImpl in LectureCreationPage
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java9
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java2
2 files changed, 6 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
index 056b75d5..bf7de813 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
@@ -15,6 +15,7 @@ import javax.swing.text.DateFormatter;
import org.jdatepicker.impl.JDatePanelImpl;
import org.jdatepicker.impl.JDatePickerImpl;
import org.jdatepicker.impl.UtilDateModel;
+import org.openslx.dozmod.gui.control.QDatePickerImpl;
import org.openslx.dozmod.gui.control.QLabel;
import org.openslx.dozmod.gui.helper.GridManager;
import org.openslx.dozmod.gui.wizard.Wizard;
@@ -26,8 +27,8 @@ public abstract class LectureCreationPageLayout extends WizardPage {
protected final JTextField lectureNameTextField;
protected final JTextArea descriptionText;
- protected final JDatePickerImpl startDate;
- protected final JDatePickerImpl endDate;
+ protected final QDatePickerImpl startDate;
+ protected final QDatePickerImpl endDate;
protected final JSpinner startTime;
protected final JSpinner endTime;
@@ -68,7 +69,7 @@ public abstract class LectureCreationPageLayout extends WizardPage {
grid.nextRow();
// Start date/time
- startDate = new JDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+ startDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
new DateLabelFormatter());
startTime = makeTimeSpinner(0, 0);
grid.add(new QLabel("Startdatum"));
@@ -76,7 +77,7 @@ public abstract class LectureCreationPageLayout extends WizardPage {
grid.add(startTime);
grid.nextRow();
- endDate = new JDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+ endDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
new DateLabelFormatter());
endTime = makeTimeSpinner(23, 59);
grid.add(new QLabel("Enddatum"));
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 f3744db3..40762b50 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
@@ -127,7 +127,7 @@ public class LectureCreationPage extends LectureCreationPageLayout {
}
String nextText;
nextText = state.image == null ? ", um ein Image auszuwählen" : " für Berechtigung oder 'Fertigstellen'";
- setDescription("Klicken Sie auf 'Weiter' " + nextText);
+ setDescription("Klicken Sie jetzt auf 'Weiter' " + nextText);
return true;
}
}