Add soft deadline support for exercises

Author: Redande

build.xml

@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.24.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.25.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

maven-wrapper/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.24</version>
+    <version>1.25</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.10.7-SNAPSHOT</version>
+            <version>0.10.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

tmc-plugin/manifest.mf

@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
   org.openide.windows.IOProvider,
   org.openide.windows.WindowManager
 OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
-OpenIDE-Module-Specification-Version: 1.1.17
+OpenIDE-Module-Specification-Version: 1.1.18

tmc-plugin/src/fi/helsinki/cs/tmc/ui/DownloadOrUpdateExercisesDialog.java

@@ -68,7 +68,9 @@ private DownloadOrUpdateExercisesDialog(List<Exercise> unlockable, List<Exercise
         unlockableCheckboxes = new ArrayList<JCheckBox>();
         for (Exercise ex : unlockable) {
             String desc;
-            if (ex.getDeadlineDescription() != null) {
+            if (ex.getSoftDeadlineDescription() != null) {
+                desc = "unlockable; deadline: " + ex.getSoftDeadlineDescription();
+            } else if (ex.getDeadlineDescription() != null) {
                 desc = "unlockable; deadline: " + ex.getDeadlineDescription();
             } else {
                 desc = "unlockable";

tmc-plugin/src/fi/helsinki/cs/tmc/ui/ExerciseIconAnnotator.java

@@ -102,6 +102,8 @@ private Image annotationIconForExericse(Exercise exercise) throws IOException {
     private String annotationIconNameForExercise(Exercise exercise) {
         if (exercise.isAttempted() && exercise.isCompleted() && exercise.isAllReviewPointsGiven()) {
             return "green-project-dot.png";
+        } else if (exercise.hasSoftDeadlinePassed()) {
+            return "soft-deadline-passed-project-dot.png";
         } else if (exercise.hasDeadlinePassed()) {
             return "expired-project-dot.png";
         } else if (exercise.isAttempted() && exercise.isCompleted()) {
@@ -136,15 +138,23 @@ private String tooltipForExercise(Exercise exercise) {
             parts.add("exercise not yet submitted");
         }
 
-        final Date deadlineDate = exercise.getDeadlineDate();
-        if (!exercise.isCompleted() && deadlineDate != null) {
-            parts.add("deadline: " + deadlineDate);
+        final Date softDeadlineDate = exercise.getSoftDeadlineDate();
+        if (!exercise.isCompleted() && softDeadlineDate != null) {
+            parts.add("Soft deadline: " + softDeadlineDate);
+            if (exercise.hasSoftDeadlinePassed()) {
+                parts.add("expired");
+            }
+        }
+
+        final Date hardDeadlineDate = exercise.getDeadlineDate();
+        if (!exercise.isCompleted() && hardDeadlineDate != null) {
+            parts.add("Hard deadline: " + hardDeadlineDate);
             if (exercise.hasDeadlinePassed()) {
                 parts.add("expired");
             }
         }
 
-        return StringUtils.capitalize(StringUtils.join(parts, " - "));
+        return StringUtils.capitalize(StringUtils.join(parts, "<br>"));
     }
 
     public void updateAllIcons() {

tmc-plugin/src/fi/helsinki/cs/tmc/ui/OpenClosedExercisesDialog.java

@@ -67,7 +67,11 @@ private OpenClosedExercisesDialog(List<Exercise> closed) {
             if (ex.isCompleted()) {
                 text += " (completed)";
             } else {
-                text += " (expired at " + ex.getDeadline() + ")";
+                if (ex.getSoftDeadline() != null) {
+                    text += " (expired at " + ex.getSoftDeadline() + ")";
+                } else {
+                    text += " (expired at " + ex.getDeadline() + ")";
+                }
             }
             JCheckBox cb = new JCheckBox(text, false);
             checkBoxToExercise.put(cb, ex);