From 33ea2a1f43def93cb67863413f9424edd6f2fec7 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 2 Jan 2009 10:44:32 +0000 Subject: [PATCH] Fixed NPE in task sorting algorithm. --- .../astrid/data/task/TaskModelForList.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/com/timsu/astrid/data/task/TaskModelForList.java b/src/com/timsu/astrid/data/task/TaskModelForList.java index 347d07d78..a8def359d 100644 --- a/src/com/timsu/astrid/data/task/TaskModelForList.java +++ b/src/com/timsu/astrid/data/task/TaskModelForList.java @@ -78,13 +78,6 @@ public class TaskModelForList extends AbstractTaskModel { private int getWeight() { int weight = 0; - // bubble completed tasks to the bottom - if(isTaskCompleted()) { - weight += Math.max(5e6 - (System.currentTimeMillis() - - getCompletionDate().getTime()) / 1000, 5000); - return weight; - } - // importance weight += getImportance().ordinal() * 60; @@ -109,6 +102,16 @@ public class TaskModelForList extends AbstractTaskModel { weight += (hoursLeft - 5*24)/2; } + // bubble completed tasks to the bottom + if(isTaskCompleted()) { + if(getCompletionDate() == null) + weight += 5e6; + else + weight = (int)Math.max(5e6 - (System.currentTimeMillis() - + getCompletionDate().getTime()) / 1000, 5000); + return weight; + } + return weight; }