Skip to content

Commit

Permalink
Merge pull request #45 from CS2103AUG2016-W10-C1/fix/access
Browse files Browse the repository at this point in the history
Restore access modifiers for EditCommand, TaskMan & Task files
  • Loading branch information
alexfjw committed Oct 19, 2016
2 parents 19dc846 + 683de70 commit b34c510
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public CommandResult execute() {
activityToComplete.getSchedule().get(),
activityToComplete.getFrequency().get());
try {
task.status = new Status(STATUS_COMPLETE);
task.setStatus(new Status(STATUS_COMPLETE));
} catch (IllegalValueException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/seedu/taskman/logic/commands/EditCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class EditCommand extends Command {
public static final String MESSAGE_SUCCESS = "Task updated: %1$s";
public static final String MESSAGE_DUPLICATE_TASK = "A task with the same name already exists in TaskMan";

protected final ArgumentContainer argsContainer;
private final ArgumentContainer argsContainer;
private Activity beforeEdit;
private Activity afterEdit;
private Activity.ActivityType activityType;
Expand Down Expand Up @@ -123,7 +123,7 @@ private void initMembers(ArgumentContainer argsContainer) throws IllegalValueExc
}
}

protected static class ArgumentContainer {
private static class ArgumentContainer {
public final int targetIndex;
public String title;
public String deadline;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/taskman/model/TaskMan.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public boolean completeActivity(Activity key) throws UniqueActivityList.Activity
key.getSchedule().get(),
key.getFrequency().get()
);
task.status = new Status("complete");
task.setStatus(new Status("complete"));
this.addActivity(new Activity(task));
return true;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/taskman/model/event/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
public class Task extends Event implements ReadOnlyTask, MutableTagsEvent {

private Deadline deadline;
public Status status;
private Status status;

public Task(@Nonnull Title title, @Nonnull UniqueTagList tags,
@Nullable Deadline deadline,
Expand Down

0 comments on commit b34c510

Please sign in to comment.