Skip to content

Commit

Permalink
update collate name
Browse files Browse the repository at this point in the history
  • Loading branch information
WoodySIN committed Apr 16, 2018
1 parent d1f5838 commit aa64d13
Show file tree
Hide file tree
Showing 46 changed files with 57 additions and 68 deletions.
13 changes: 1 addition & 12 deletions collated/functional/WoodySIN.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wu
# WoodySIN
###### \java\seedu\address\commons\events\model\TaskBookChangedEvent.java
``` java
/** Indicates the AddressBook in the model has changed*/
Expand Down Expand Up @@ -627,17 +627,6 @@ public class ImportCommandParser implements Parser<ImportCommand> {
return compareDate(yearDiff, monthDiff, dayDiff);
}

```
###### \java\seedu\address\model\task\Task.java
``` java
@Override
public int compareTo(Task task) {
int yearDiff = this.getDeadlineYear() - task.getDeadlineYear();
int monthDiff = this.getDeadlineMonth() - task.getDeadlineMonth();
int dayDiff = this.getDeadlineDay() - task.getDeadlineDay();

return compareDate(yearDiff, monthDiff, dayDiff);
}
/**
* Compares the dates
* @param yearDiff difference in year
Expand Down
2 changes: 1 addition & 1 deletion collated/test/WoodySIN.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wu
# WoodySIN
###### \java\guitests\guihandles\TodoCardHandle.java
``` java
public class TodoCardHandle extends NodeHandle<Node> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import seedu.address.commons.events.BaseEvent;
import seedu.address.model.ReadOnlyAddressBook;

//@@author Wu Di
//@@author WoodySIN
/** Indicates the AddressBook in the model has changed*/
public class TaskBookChangedEvent extends BaseEvent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import seedu.address.commons.events.BaseEvent;
import seedu.address.ui.TodoCard;

//@@author Wu Di
//@@author WoodySIN
/**
* Represents a selection change in the TodoList Panel
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/logic/LogicManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public ListElementPointer getHistorySnapshot() {
return new ListElementPointer(history.getHistory());
}

//@@author Wu Di
//@@author WoodySIN
@Override
public void setTabPane(TabPane tabPane) {
addressBookParser.setTabPane(tabPane);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import seedu.address.model.task.Task;
import seedu.address.model.task.exceptions.TaskNotFoundException;

//@@author Wu Di
//@@author WoodySIN
/**
* Deletes a task identified using it's last displayed index from the address book.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import seedu.address.model.task.Title;
import seedu.address.model.task.exceptions.TaskNotFoundException;

//@@author Wu Di
//@@author WoodySIN
/**
* Edits the details of an existing person in the address book.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.storage.XmlFileStorage;

//@@author Wu Di
//@@author WoodySIN
/**
* Imports data from a xml file and overwrites the current data stored
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CURRENT_TASKS;

//@@author Wu Di
//@@author WoodySIN
/**
* Lists all tasks due by the current month stored in the address book.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static seedu.address.model.Model.PREDICATE_SHOW_ALL_TASKS;

//@@author Wu Di
//@@author WoodySIN
/**
* Lists all tasks stored in the address book.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package seedu.address.logic.commands;

//@@author Wu Di
//@@author WoodySIN
/**
* Lists all tasks stored in the address book in date order.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* Switches between the tabs of Person List and TodoList
*/
//@@author Wu Di
//@@author WoodySIN
public class SwitchTabCommand extends Command {

public static final String COMMAND_WORD = "switchTab";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public Command parseCommand(String userInput) throws ParseException {
}
}

//@@author Wu Di
//@@author WoodySIN
public void setTabPane(TabPane tabPane) {
this.tabPane = tabPane;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import seedu.address.logic.commands.DeleteTaskCommand;
import seedu.address.logic.parser.exceptions.ParseException;

//@@author Wu Di
//@@author WoodySIN
/**
* Parses input arguments and creates a new DeleteCommand object
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import seedu.address.logic.commands.EditTaskCommand.EditTaskDescriptor;
import seedu.address.logic.parser.exceptions.ParseException;

//@@author Wu Di
//@@author WoodySIN
/**
* Parses input arguments and creates a new EditTaskCommand object
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import seedu.address.logic.commands.ImportCommand;
import seedu.address.logic.parser.exceptions.ParseException;

//@@author Wu Di
//@@author WoodySIN
/**
* Parses input arguments and creates a new ImportCommandParser object
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/logic/parser/ParserUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public static Set<Tag> parseTags(Collection<String> tags) throws IllegalValueExc
return tagSet;
}

//@@author Wu Di
//@@author WoodySIN
/**
* Parses a {@code String taskTitle} into a {@code TaskTitle}.
* Leading and trailing whitespaces will be trimmed.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/AddressBook.java
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public boolean removePerson(Person key) throws PersonNotFoundException {
}

////tag-level operation
//@@author Wu Di
//@@author WoodySIN
/**
* Removes {@code key} from this {@code AddressBook}.
* @throws TaskNotFoundException if the {@code key} is not in this {@code AddressBook}.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/seedu/address/model/ModelManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public synchronized void addPerson(Person person) throws DuplicatePersonExceptio
indicateAddressBookChanged();
}

//@@author Wu Di
//@@author WoodySIN
@Override
public void deleteTask(Task target) throws TaskNotFoundException {
addressBook.removeTask(target);
Expand Down Expand Up @@ -134,7 +134,7 @@ public void updatePerson(Person target, Person editedPerson)
indicateAddressBookChanged();
}

//@@author Wu Di
//@@author WoodySIN
@Override
public void updateTask(Task target, Task editedTask)
throws TaskNotFoundException {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/task/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public String toString() {
return builder.toString();
}

//@@author Wu Di
//@@author WoodySIN
@Override
public int compareTo(Task task) {
int yearDiff = this.getDeadlineYear() - task.getDeadlineYear();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/task/Title.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static java.util.Objects.requireNonNull;
import static seedu.address.commons.util.AppUtil.checkArgument;

//@@author Wu Di
//@@author WoodySIN
/**
* Represents a task's title in the TodoList.
* Guarantees: immutable; is valid as declared in {@link #isValidTitle(String)}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/seedu/address/model/task/UniqueTaskList.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void add(Task toAdd) {
Collections.sort(calendarList[diff][toAdd.getDeadlineDay()]);
}

//@@author Wu Di
//@@author WoodySIN
/**
* Replaces the task {@code target} in the list with {@code editedTask}.
*
Expand Down Expand Up @@ -115,7 +115,7 @@ public void setTasks(UniqueTaskList replacement) {
}
}

//@@author Wu Di
//@@author WoodySIN
//@@author JoonKai1995
public void setTasks(List<Task> tasks) {
requireAllNonNull(tasks);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/util/SampleDataUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static Person[] getSamplePersons() {
};
}

//@@author Wu Di
//@@author WoodySIN
/**
* Contains utility methods for populating {@code AddressBook} with sample data tasks.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/ui/TodoCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javafx.scene.layout.Region;
import seedu.address.model.task.Task;

//@@author Wu Di
//@@author WoodySIN
/**
* A UI component that displays information of a {@code task} in TodoList.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/ui/TodoListPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import seedu.address.commons.events.ui.TodoPanelSelectionChangedEvent;
import seedu.address.model.task.Task;

//@@author Wu Di
//@@author WoodySIN
/**
* Panel containing the list of tasks shown in TodoList.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/DarkTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
-fx-background-color: grey;
}

/*@@author Wu Di */
/*@@author WoodySIN */
.tab-pane {
-fx-padding: 0 0 0 1;
-fx-background-color: #232A34;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/todoListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<?import javafx.scene.layout.FlowPane?>

<!-- @@author Wu Di -->
<!-- @@author WoodySIN -->
<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<GridPane HBox.hgrow="ALWAYS">
<columnConstraints>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/todoListPanel.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.VBox?>

<!-- @@author Wu Di -->
<!-- @@author WoodySIN -->
<VBox xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1">
<ListView fx:id="todoListView" VBox.vgrow="ALWAYS" />
</VBox>
2 changes: 1 addition & 1 deletion src/test/java/guitests/guihandles/TodoCardHandle.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/**
* Provides a handle to a TodoCard in the TodoList panel.
*/
//@@author Wu Di
//@@author WoodySIN
public class TodoCardHandle extends NodeHandle<Node> {
private static final String ID_FIELD_ID = "#id";
private static final String TITLE_FIELD_ID = "#title";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/guitests/guihandles/TodoListPanelHandle.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Provides a handle to a TodoCard in the TodoList panel.
*/
//@@author Wu Di
//@@author WoodySIN
public class TodoListPanelHandle extends NodeHandle<ListView<TodoCard>> {
public static final String TODO_LIST_VIEW_ID = "#todoListView";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import seedu.address.model.task.exceptions.TaskNotFoundException;
import seedu.address.testutil.TaskBuilder;

//@@author Wu Di
//@@author WoodySIN
public class AddTaskCommandTest {

@Rule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Contains helper methods for testing Task Commands
*/
//@@author Wu Di
//@@author WoodySIN
public class CommandTaskTestUtil {

public static final String VALID_TITLE_EXAM = "Test Preparation";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
* {@code DeleteCommand}.
*/
//@@author Wu Di
//@@author WoodySIN
public class DeleteCommandTest {

private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
* {@code DeleteTaskCommand}.
*/
//@@author Wu Di
//@@author WoodySIN
public class DeleteTaskCommandTest {
private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Contains integration tests (interaction with the Model, UndoCommand and RedoCommand)
* and unit tests for EditTaskCommand.
*/
//@@author Wu Di
//@@author WoodySIN
public class EditTaskCommandTest {
private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import seedu.address.storage.XmlAddressBookStorage;
import seedu.address.ui.testutil.EventsCollectorRule;

//@@author Wu Di
//@@author WoodySIN
/**
* Contains integration tests (interaction with the Model) and unit tests for
* {@code ImportCommand}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;

//@@author Wu Di
//@@author WoodySIN
/**
* Contains integration tests (interaction with the Model) and unit tests for ListCurrentTaskCommand.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;

//@@author Wu Di
//@@author WoodySIN
/**
* Contains integration tests (interaction with the Model) and unit tests for ListTaskCommand.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;

//@@author Wu Di
//@@author WoodySIN
/**
* Contains integration tests (interaction with the Model) and unit tests for ListTaskCommand.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import seedu.address.model.task.Title;
import seedu.address.testutil.TaskBuilder;

//@@author Wu Di
//@@author WoodySIN
public class AddTaskCommandParserTest {
private AddTaskCommandParser parser = new AddTaskCommandParser();

Expand Down
Loading

0 comments on commit aa64d13

Please sign in to comment.