Changeset 15 for trunk/de.ugoe.cs.swe.exercises/src

Timestamp:

10/19/09 17:28:16 (15 years ago)

Author:

zeiss

Message:

beautification of the semester string

Location:

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises

Files:

• exercisesheet/PdfGenerator.java (modified) (4 diffs)
• lectureevent/LectureEvent.java (modified) (1 diff)

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java

@@ -61 +61 @@
                         filename += ".tex";
 
+                        // read template file
                         File templateFile = new File(filename);
                         String template = "";
@@ -72 +73 @@
                         dstream.close();
 
+                        // initialize strings                   
                         LectureEvent event = exercisesheet.getLectureEvent();
                         ArrayList<Lecturer> lecturers = event.getLecturers();
@@ -120 +122 @@
                         dueDate.setTimeInMillis(dueDateTimeStamp);
                         DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMANY);
-                        String deliveryDate = dateFormat.format(dueDate.getTime());
+                        String dueDateString = dateFormat.format(dueDate.getTime());
                         
                         template = template.replaceAll("(\\W)LECTURE(\\W)", "$1"
@@ -135 +137 @@
                         template = template.replaceAll("(\\W)TEMPLATEPATH(\\W)", "$1"
                                         + Matcher.quoteReplacement(templatePath) + "$2");
-                        template = template.replaceAll("(\\W)DELIVERYDATE(\\W)", "$1"
-                                        + Matcher.quoteReplacement(deliveryDate) + "$2");
+                        template = template.replaceAll("(\\W)DUEDATE(\\W)", "$1"
+                                        + Matcher.quoteReplacement(dueDateString) + "$2");
 
                         // write temporary .tex file to temp directory

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/lectureevent/LectureEvent.java

@@ -46 +46 @@
         @Override
         public String toString() {
-                return (getLecture().getName() + " " + getSemesterString() + getSemester());
+                if (!isSummerSemester) {
+                        int nextYear = getSemester()+1;
+                        return (getLecture().getName() + " (" + getSemesterString() + " " + getSemester() + "/" + nextYear + ")");
+                } else {
+                        return (getLecture().getName() + " (" + getSemesterString() + " " + getSemester() + ")");
+                }
         }