{"action":"created","comment":{"url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/comments/58371990","id":58371990,"diff_hunk":"@@ -44,87 +32,62 @@ public void setComment(String newComment) {\n     }\n \n     @Override\n-    public List<List<String>> getEventList() {\n+    public List<LogicEvent> getEventList() {\n         return eventList;\n     }\n \n     @Override\n-    public List<List<String>> getTaskList() {\n-        return taskList;\n+    public List<LogicDeadline> getDeadlineList() {\n+        return deadlineList;\n     }\n \n     @Override\n-    public void addTaskLine(int id, String name, boolean isActive, LocalDateTime deadline, TemporalAmount period) {\n-        List<String> record = new ArrayList<>();\n-        record.add(String.valueOf(id));\n-        record.add(name);\n-        record.add(Boolean.toString(isActive));\n-\n-        if (deadline == null) {\n-            record.add(\"\");\n-            record.add(\"\");\n-        } else {\n-            record.add(deadline.format(DateTimeFormatter.ofLocalizedDateTime(DATE_STYLE, TIME_STYLE)));\n-\n-            if (period == null) {\n-                record.add(\"\");\n-            } else {\n-                record.add(convert(period));\n-            }\n-        }\n-        \n-        taskList.add(record);\n+    public List<LogicFloating> getFloatingList() {\n+        return floatingList;\n     }\n \n     @Override\n-    public void addEventLine(int id, String name, boolean isActive, LocalDateTime start, LocalDateTime end,\n+    public void addTaskLine(int id, String name, LocalDateTime deadline, boolean isOverdue, boolean isDone,\n             TemporalAmount period) {\n-        List<String> record = new ArrayList<>();\n-        record.add(String.valueOf(id));\n-        record.add(name);\n-        record.add(Boolean.toString(isActive));\n-        record.add(start.format(DateTimeFormatter.ofLocalizedDateTime(DATE_STYLE, TIME_STYLE)));\n-        record.add(end.format(DateTimeFormatter.ofLocalizedDateTime(DATE_STYLE, TIME_STYLE)));\n-\n-        if (period == null) {\n-            record.add(\"\");\n+        if (deadline == null) {\n+            addFloatingLine(id, name, isDone);\n         } else {\n-            record.add(convert(period));\n+            addDeadlineLine(id, name, deadline, isOverdue, isDone, period);\n         }\n-\n-        eventList.add(record);\n     }\n \n-    public String convert(TemporalAmount temporalAmount) {\n-        if (temporalAmount != null) {\n-            if (temporalAmount.equals(Period.ZERO) || temporalAmount.equals(Duration.ZERO)) {\n-                return \"\";\n-            } else if (temporalAmount instanceof Period) {\n-                return convertPeriodToString(((Period) temporalAmount).normalized());\n-            } else {\n-                return convertDurationToString((Duration) temporalAmount);\n-            }\n-        }\n-        return \"\";\n-    }\n-\n-    private String convertPeriodToString(Period period) {\n-        int years = period.getYears();\n-        int months = period.getMonths();\n-        int days = period.getDays();\n-\n-        return formatDuration(years, YEAR_FIELD) + formatDuration(months, MONTH_FIELD) + formatDuration(days, DAY_FIELD);\n+    private void addDeadlineLine(int id, String name, LocalDateTime deadline, boolean isOverdue, boolean isDone,\n+            TemporalAmount period) {\n+        LogicDeadline record = new LogicDeadlineImpl();\n+        record.setId(id);\n+        record.setName(name);\n+        record.setDeadline(deadline);\n+        record.setOverdue(isOverdue);\n+        record.setDone(isDone);\n+        record.setPeriod(period);\n+        deadlineList.add(record);\n     }\n \n-    private String convertDurationToString(Duration duration) {\n-        long hours = duration.toHours();\n-        long minutes = duration.toMinutes() % 60;\n-\n-        return formatDuration(hours, HOUR_FIELD) + formatDuration(minutes, MINUTE_FIELD);\n+    private void addFloatingLine(int id, String name, boolean isDone) {","path":"src/lifetracker/logic/CommandLineResult.java","position":140,"original_position":140,"commit_id":"04a2a84a1c17bcd0178b07bac8bd6ce347a93242","original_commit_id":"04a2a84a1c17bcd0178b07bac8bd6ce347a93242","user":{"login":"sshang0309","id":17054505,"avatar_url":"https://avatars.githubusercontent.com/u/17054505?v=3","gravatar_id":"","url":"https://api.github.com/users/sshang0309","html_url":"https://github.com/sshang0309","followers_url":"https://api.github.com/users/sshang0309/followers","following_url":"https://api.github.com/users/sshang0309/following{/other_user}","gists_url":"https://api.github.com/users/sshang0309/gists{/gist_id}","starred_url":"https://api.github.com/users/sshang0309/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sshang0309/subscriptions","organizations_url":"https://api.github.com/users/sshang0309/orgs","repos_url":"https://api.github.com/users/sshang0309/repos","events_url":"https://api.github.com/users/sshang0309/events{/privacy}","received_events_url":"https://api.github.com/users/sshang0309/received_events","type":"User","site_admin":false},"body":"Er……actually bank told me to return a list of floating task to him. You can see line50 for the method: add a taskLine, I made a decision. If the deadline is null, then I will call the function: add a floatingLine, if the deadline makes sense, the function: add a deadlineLine will be executed.","created_at":"2016-04-04T13:06:27Z","updated_at":"2016-04-04T13:06:27Z","html_url":"https://github.com/cs2103jan2016-t15-1j/main/pull/128#discussion_r58371990","pull_request_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128","_links":{"self":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/comments/58371990"},"html":{"href":"https://github.com/cs2103jan2016-t15-1j/main/pull/128#discussion_r58371990"},"pull_request":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128"}}},"pull_request":{"url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128","id":65039645,"html_url":"https://github.com/cs2103jan2016-t15-1j/main/pull/128","diff_url":"https://github.com/cs2103jan2016-t15-1j/main/pull/128.diff","patch_url":"https://github.com/cs2103jan2016-t15-1j/main/pull/128.patch","issue_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/128","number":128,"state":"open","locked":false,"title":"Dave logic","user":{"login":"sshang0309","id":17054505,"avatar_url":"https://avatars.githubusercontent.com/u/17054505?v=3","gravatar_id":"","url":"https://api.github.com/users/sshang0309","html_url":"https://github.com/sshang0309","followers_url":"https://api.github.com/users/sshang0309/followers","following_url":"https://api.github.com/users/sshang0309/following{/other_user}","gists_url":"https://api.github.com/users/sshang0309/gists{/gist_id}","starred_url":"https://api.github.com/users/sshang0309/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sshang0309/subscriptions","organizations_url":"https://api.github.com/users/sshang0309/orgs","repos_url":"https://api.github.com/users/sshang0309/repos","events_url":"https://api.github.com/users/sshang0309/events{/privacy}","received_events_url":"https://api.github.com/users/sshang0309/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-04-02T14:38:03Z","updated_at":"2016-04-04T13:06:27Z","closed_at":null,"merged_at":null,"merge_commit_sha":"d6abe889c0d227a1cdaf1333ed656d8c1dbab1f9","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128/commits","review_comments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128/comments","review_comment_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/comments{/number}","comments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/128/comments","statuses_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/statuses/04a2a84a1c17bcd0178b07bac8bd6ce347a93242","head":{"label":"cs2103jan2016-t15-1j:dave-configure-file","ref":"dave-configure-file","sha":"04a2a84a1c17bcd0178b07bac8bd6ce347a93242","user":{"login":"cs2103jan2016-t15-1j","id":17060676,"avatar_url":"https://avatars.githubusercontent.com/u/17060676?v=3","gravatar_id":"","url":"https://api.github.com/users/cs2103jan2016-t15-1j","html_url":"https://github.com/cs2103jan2016-t15-1j","followers_url":"https://api.github.com/users/cs2103jan2016-t15-1j/followers","following_url":"https://api.github.com/users/cs2103jan2016-t15-1j/following{/other_user}","gists_url":"https://api.github.com/users/cs2103jan2016-t15-1j/gists{/gist_id}","starred_url":"https://api.github.com/users/cs2103jan2016-t15-1j/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cs2103jan2016-t15-1j/subscriptions","organizations_url":"https://api.github.com/users/cs2103jan2016-t15-1j/orgs","repos_url":"https://api.github.com/users/cs2103jan2016-t15-1j/repos","events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/events{/privacy}","received_events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/received_events","type":"Organization","site_admin":false},"repo":{"id":51058867,"name":"main","full_name":"cs2103jan2016-t15-1j/main","owner":{"login":"cs2103jan2016-t15-1j","id":17060676,"avatar_url":"https://avatars.githubusercontent.com/u/17060676?v=3","gravatar_id":"","url":"https://api.github.com/users/cs2103jan2016-t15-1j","html_url":"https://github.com/cs2103jan2016-t15-1j","followers_url":"https://api.github.com/users/cs2103jan2016-t15-1j/followers","following_url":"https://api.github.com/users/cs2103jan2016-t15-1j/following{/other_user}","gists_url":"https://api.github.com/users/cs2103jan2016-t15-1j/gists{/gist_id}","starred_url":"https://api.github.com/users/cs2103jan2016-t15-1j/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cs2103jan2016-t15-1j/subscriptions","organizations_url":"https://api.github.com/users/cs2103jan2016-t15-1j/orgs","repos_url":"https://api.github.com/users/cs2103jan2016-t15-1j/repos","events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/events{/privacy}","received_events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cs2103jan2016-t15-1j/main","description":"cs2103jan2016-t15-1j","fork":false,"url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main","forks_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/forks","keys_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/teams","hooks_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/hooks","issue_events_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/events{/number}","events_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/events","assignees_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/assignees{/user}","branches_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/branches{/branch}","tags_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/tags","blobs_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/refs{/sha}","trees_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/statuses/{sha}","languages_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/languages","stargazers_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/stargazers","contributors_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/contributors","subscribers_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/subscribers","subscription_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/subscription","commits_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/commits{/sha}","git_commits_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/commits{/sha}","comments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/comments{/number}","issue_comment_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/comments{/number}","contents_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/contents/{+path}","compare_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/merges","archive_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/downloads","issues_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues{/number}","pulls_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls{/number}","milestones_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/milestones{/number}","notifications_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/labels{/name}","releases_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/releases{/id}","deployments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/deployments","created_at":"2016-02-04T07:12:48Z","updated_at":"2016-02-27T04:48:19Z","pushed_at":"2016-04-02T15:24:27Z","git_url":"git://github.com/cs2103jan2016-t15-1j/main.git","ssh_url":"git@github.com:cs2103jan2016-t15-1j/main.git","clone_url":"https://github.com/cs2103jan2016-t15-1j/main.git","svn_url":"https://github.com/cs2103jan2016-t15-1j/main","homepage":null,"size":6280,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":11,"forks":0,"open_issues":11,"watchers":0,"default_branch":"master"}},"base":{"label":"cs2103jan2016-t15-1j:master","ref":"master","sha":"840c6550493f3804abfe59749ed581c4a71e136f","user":{"login":"cs2103jan2016-t15-1j","id":17060676,"avatar_url":"https://avatars.githubusercontent.com/u/17060676?v=3","gravatar_id":"","url":"https://api.github.com/users/cs2103jan2016-t15-1j","html_url":"https://github.com/cs2103jan2016-t15-1j","followers_url":"https://api.github.com/users/cs2103jan2016-t15-1j/followers","following_url":"https://api.github.com/users/cs2103jan2016-t15-1j/following{/other_user}","gists_url":"https://api.github.com/users/cs2103jan2016-t15-1j/gists{/gist_id}","starred_url":"https://api.github.com/users/cs2103jan2016-t15-1j/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cs2103jan2016-t15-1j/subscriptions","organizations_url":"https://api.github.com/users/cs2103jan2016-t15-1j/orgs","repos_url":"https://api.github.com/users/cs2103jan2016-t15-1j/repos","events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/events{/privacy}","received_events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/received_events","type":"Organization","site_admin":false},"repo":{"id":51058867,"name":"main","full_name":"cs2103jan2016-t15-1j/main","owner":{"login":"cs2103jan2016-t15-1j","id":17060676,"avatar_url":"https://avatars.githubusercontent.com/u/17060676?v=3","gravatar_id":"","url":"https://api.github.com/users/cs2103jan2016-t15-1j","html_url":"https://github.com/cs2103jan2016-t15-1j","followers_url":"https://api.github.com/users/cs2103jan2016-t15-1j/followers","following_url":"https://api.github.com/users/cs2103jan2016-t15-1j/following{/other_user}","gists_url":"https://api.github.com/users/cs2103jan2016-t15-1j/gists{/gist_id}","starred_url":"https://api.github.com/users/cs2103jan2016-t15-1j/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cs2103jan2016-t15-1j/subscriptions","organizations_url":"https://api.github.com/users/cs2103jan2016-t15-1j/orgs","repos_url":"https://api.github.com/users/cs2103jan2016-t15-1j/repos","events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/events{/privacy}","received_events_url":"https://api.github.com/users/cs2103jan2016-t15-1j/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cs2103jan2016-t15-1j/main","description":"cs2103jan2016-t15-1j","fork":false,"url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main","forks_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/forks","keys_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/teams","hooks_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/hooks","issue_events_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/events{/number}","events_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/events","assignees_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/assignees{/user}","branches_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/branches{/branch}","tags_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/tags","blobs_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/refs{/sha}","trees_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/statuses/{sha}","languages_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/languages","stargazers_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/stargazers","contributors_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/contributors","subscribers_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/subscribers","subscription_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/subscription","commits_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/commits{/sha}","git_commits_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/git/commits{/sha}","comments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/comments{/number}","issue_comment_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/comments{/number}","contents_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/contents/{+path}","compare_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/merges","archive_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/downloads","issues_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues{/number}","pulls_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls{/number}","milestones_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/milestones{/number}","notifications_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/labels{/name}","releases_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/releases{/id}","deployments_url":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/deployments","created_at":"2016-02-04T07:12:48Z","updated_at":"2016-02-27T04:48:19Z","pushed_at":"2016-04-02T15:24:27Z","git_url":"git://github.com/cs2103jan2016-t15-1j/main.git","ssh_url":"git@github.com:cs2103jan2016-t15-1j/main.git","clone_url":"https://github.com/cs2103jan2016-t15-1j/main.git","svn_url":"https://github.com/cs2103jan2016-t15-1j/main","homepage":null,"size":6280,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":11,"forks":0,"open_issues":11,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128"},"html":{"href":"https://github.com/cs2103jan2016-t15-1j/main/pull/128"},"issue":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/128"},"comments":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/issues/128/comments"},"review_comments":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128/comments"},"review_comment":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/pulls/128/commits"},"statuses":{"href":"https://api.github.com/repos/cs2103jan2016-t15-1j/main/statuses/04a2a84a1c17bcd0178b07bac8bd6ce347a93242"}}}}