Skip to content

Commit

Permalink
improve codacy
Browse files Browse the repository at this point in the history
  • Loading branch information
rickyyx committed Nov 5, 2016
1 parent 87d88bd commit af8acd3
Show file tree
Hide file tree
Showing 26 changed files with 54 additions and 92 deletions.
11 changes: 2 additions & 9 deletions src/main/java/seedu/task/MainApp.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.task;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Map;
import java.util.Optional;
Expand All @@ -11,12 +10,14 @@
import javafx.application.Application;
import javafx.application.Platform;
import javafx.stage.Stage;
import seedu.task.commons.events.storage.StorageLocationChangedEvent;
import seedu.task.commons.events.ui.ExitAppRequestEvent;
import seedu.task.commons.exceptions.DataConversionException;
import seedu.task.commons.util.ConfigUtil;
import seedu.task.commons.util.StringUtil;
import seedu.task.logic.Logic;
import seedu.task.logic.LogicManager;
import seedu.task.logic.commands.SaveCommand;
import seedu.task.model.Model;
import seedu.task.model.ModelManager;
import seedu.task.model.ReadOnlyTaskBook;
Expand All @@ -30,14 +31,6 @@
import seedu.taskcommons.core.EventsCenter;
import seedu.taskcommons.core.LogsCenter;
import seedu.taskcommons.core.Version;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Map;
import java.util.Optional;
import java.util.logging.Logger;
import seedu.task.commons.events.storage.StorageLocationChangedEvent;
import seedu.task.logic.commands.SaveCommand;
/**
* The main entry point to the application.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package seedu.task.commons.exceptions;

//@@author A0144702N
@SuppressWarnings("serial")
public class CalendarUnsyncException extends Exception{
public CalendarUnsyncException(String message) {
super(message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/**
* Represents an error during conversion of data from one format to another
*/
@SuppressWarnings("serial")
public class DataConversionException extends Exception {
public DataConversionException(Exception cause) {
super(cause);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/**
* Signals an error caused by duplicate data where there should be none.
*/
@SuppressWarnings("serial")
public abstract class DuplicateDataException extends IllegalValueException {
public DuplicateDataException(String message) {
super(message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Signals that some given data is empty.
*/

@SuppressWarnings("serial")
public class EmptyValueException extends Exception{

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/**
* Signals that some given data does not fulfill some constraints.
*/
@SuppressWarnings("serial")
public class IllegalValueException extends Exception {
/**
* @param message should contain relevant information on the failed constraint(s)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*
*/
//@@author A0144702N
@SuppressWarnings("serial")
public class UndoableException extends Exception {

public UndoableException() {
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/seedu/task/logic/parser/FindParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
import static seedu.taskcommons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import seedu.task.commons.exceptions.EmptyValueException;
import seedu.task.logic.commands.Command;
Expand All @@ -24,10 +21,7 @@
*
*/
public class FindParser implements Parser {
private static final Pattern KEYWORDS_ARGS_FORMAT =
Pattern.compile("(?<keywords>[^/]+(?:/+[^/]+)*)"); // one or more keywords separated by '/'

/**
/**
* Parses arguments in the context of the find person command.
*
* @param args full command args string
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/seedu/task/logic/parser/ParserManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ public class ParserManager {
*/
private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");

private static final Pattern ITEM_INDEX_ARGS_FORMAT = Pattern.compile("(?<targetIndex>.+)");



public ParserManager() {}

/**
* Parses user input into command for execution.
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/seedu/task/model/ModelManager.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package seedu.task.model;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;

Expand All @@ -19,12 +23,6 @@
import seedu.taskcommons.core.ComponentManager;
import seedu.taskcommons.core.LogsCenter;
import seedu.taskcommons.core.UnmodifiableObservableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;


/**
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/seedu/task/model/item/UniqueEventList.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public class UniqueEventList implements Iterable<Event> {
/**
* Signals that an operation would have violated the 'no duplicates' property of the list.
*/
public static class DuplicateEventException extends DuplicateDataException {
@SuppressWarnings("serial")
public static class DuplicateEventException extends DuplicateDataException {
protected DuplicateEventException() {
super("Operation would result in duplicate tasks");
}
Expand All @@ -31,7 +32,8 @@ protected DuplicateEventException() {
* Signals that an operation targeting a specified task in the list would fail because
* there is no such matching task in the list.
*/
public static class EventNotFoundException extends Exception {}
@SuppressWarnings("serial")
public static class EventNotFoundException extends Exception {}

private final ObservableList<Event> internalList = FXCollections.observableArrayList();

Expand Down
6 changes: 4 additions & 2 deletions src/main/java/seedu/task/model/item/UniqueTaskList.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public class UniqueTaskList implements Iterable<Task> {
/**
* Signals that an operation would have violated the 'no duplicates' property of the list.
*/
public static class DuplicateTaskException extends DuplicateDataException {
@SuppressWarnings("serial")
public static class DuplicateTaskException extends DuplicateDataException {
protected DuplicateTaskException() {
super("Operation would result in duplicate tasks");
}
Expand All @@ -31,7 +32,8 @@ protected DuplicateTaskException() {
* Signals that an operation targeting a specified task in the list would fail because
* there is no such matching task in the list.
*/
public static class TaskNotFoundException extends Exception {}
@SuppressWarnings("serial")
public static class TaskNotFoundException extends Exception {}

private final ObservableList<Task> internalList = FXCollections.observableArrayList();

Expand Down
4 changes: 0 additions & 4 deletions src/main/java/seedu/task/storage/Storage.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.task.storage;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Optional;

Expand All @@ -9,9 +8,6 @@
import seedu.task.commons.exceptions.DataConversionException;
import seedu.task.model.ReadOnlyTaskBook;
import seedu.task.model.UserPrefs;

import java.io.IOException;
import java.util.Optional;
/**
* API of the Storage component
*/
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/seedu/task/storage/StorageManager.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.task.storage;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Optional;
import java.util.logging.Logger;
Expand All @@ -14,10 +13,6 @@
import seedu.task.model.UserPrefs;
import seedu.taskcommons.core.ComponentManager;
import seedu.taskcommons.core.LogsCenter;

import java.io.IOException;
import java.util.Optional;
import java.util.logging.Logger;
/**
* Manages storage of TaskBook data in local storage.
*
Expand Down
1 change: 0 additions & 1 deletion src/main/java/seedu/task/ui/CalendarPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.util.function.Predicate;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javafx.collections.ObservableList;
import javafx.scene.Node;
import javafx.scene.control.Slider;
import javafx.scene.control.SplitPane;
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/seedu/task/ui/MainWindow.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package seedu.task.ui;

import java.time.LocalDateTime;
import com.aquafx_project.AquaFx;
import com.sun.javafx.scene.traversal.TraversalEngine;

import java.util.ArrayList;
import java.util.List;

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/seedu/task/ui/StatusBarFooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@
import javafx.scene.layout.GridPane;
import javafx.stage.Stage;
import seedu.task.commons.events.model.TaskBookChangedEvent;
import seedu.task.commons.events.storage.StorageLocationChangedEvent;
import seedu.task.commons.util.FxViewUtil;
import seedu.taskcommons.core.LogsCenter;

import java.util.Date;
import java.util.logging.Logger;
import seedu.task.commons.events.storage.StorageLocationChangedEvent;

/**
* A ui for the status bar that is displayed at the footer of the application.
*/
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/seedu/task/ui/TaskCard.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
package seedu.task.ui;

import javafx.fxml.FXML;
import java.time.LocalDateTime;

import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import seedu.task.model.item.Deadline;
import seedu.task.model.item.ReadOnlyTask;

import java.time.LocalDateTime;
import java.util.Optional;

import com.guigarage.flatterfx.emoji.EmojiFactory;


public class TaskCard extends UiPart{

Expand Down
12 changes: 7 additions & 5 deletions src/test/java/guitests/AddCommandTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import seedu.task.testutil.TestEvent;
import seedu.task.testutil.TestTask;
import seedu.task.testutil.TestUtil;
import seedu.task.testutil.TypicalTestEvents;
import seedu.task.testutil.TypicalTestTasks;
import seedu.taskcommons.core.Messages;

//@@author A0127570H
Expand All @@ -23,17 +25,17 @@ public class AddCommandTest extends TaskBookGuiTest {
public void addTask() {
//add one task
TestTask[] currentList = td.getTypicalTasks();
TestTask taskToAdd = td.arts;
TestTask taskToAdd = TypicalTestTasks.arts;
currentList = TestUtil.addTasksToListAtIndex(currentList, 0,taskToAdd);
assertAddTaskSuccess(taskToAdd, currentList);

//add another task
taskToAdd = td.socSciences;
taskToAdd = TypicalTestTasks.socSciences;
currentList = TestUtil.addTasksToList(currentList, taskToAdd);
assertAddTaskSuccess(taskToAdd, currentList);

//add duplicate task
commandBox.runCommand(td.arts.getFullAddCommand());
commandBox.runCommand(TypicalTestTasks.arts.getFullAddCommand());
assertResultMessage(AddTaskCommand.MESSAGE_DUPLICATE_TASK);
assertTrue(taskListPanel.isListMatching(currentList));

Expand All @@ -46,13 +48,13 @@ public void addTask() {
public void addEvent() {
//add one event
TestEvent[] currentList = te.getTypicalNotCompletedEvents();
TestEvent eventToAdd = te.addedEvent;
TestEvent eventToAdd = TypicalTestEvents.addedEvent;
currentList = TestUtil.addEventsToListAtIndex(currentList, 0,eventToAdd);

assertAddEventSuccess(eventToAdd, currentList);

//add duplicate event
commandBox.runCommand(te.addedEvent.getAddCommand());
commandBox.runCommand(TypicalTestEvents.addedEvent.getAddCommand());
assertResultMessage(AddEventCommand.MESSAGE_DUPLICATE_EVENT);
assertTrue(eventListPanel.isListMatching(currentList));

Expand Down
4 changes: 0 additions & 4 deletions src/test/java/guitests/CalendarTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import java.time.LocalDateTime;

import org.junit.Before;
import org.junit.Test;
import org.testfx.api.FxToolkit;

Expand All @@ -20,8 +19,6 @@
import seedu.task.testutil.TestTask;
import seedu.task.testutil.TestUtil;
import seedu.task.testutil.TypicalTestEvents;
import seedu.task.testutil.TypicalTestTasks;
import seedu.task.ui.CalendarHelper;

//@@author A0144702N
public class CalendarTest extends TaskBookGuiTest {
Expand Down Expand Up @@ -95,7 +92,6 @@ public void modifyEventsList_shouldSync() {
//set up
TestEvent[] currentEventList = te.getTypicalAllEvents();
TestTask[] currentTaskList = td.getTypicalTasks();
Agenda agenda = calendar.getAgenda();
calendarListMatch(currentEventList, currentTaskList);


Expand Down
17 changes: 9 additions & 8 deletions src/test/java/guitests/CommandBoxTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.junit.Test;

import javafx.scene.input.KeyCode;
import seedu.task.testutil.TypicalTestTasks;

/*
* GUI test for CommandBox
Expand All @@ -15,7 +16,7 @@ public class CommandBoxTest extends TaskBookGuiTest {
// test input for valid command
@Test
public void commandBox_commandSucceeds_textCleared() {
commandBox.runCommand(td.cs1020.getAddCommand());
commandBox.runCommand(TypicalTestTasks.cs1020.getAddCommand());
assertEquals(commandBox.getCommandInput(), "");
}

Expand All @@ -39,27 +40,27 @@ public void commandBox_del_keyPress(){
// test for UP key press
@Test
public void commandBox_UP_keyPress(){
commandBox.runCommand(td.cs1020.getAddCommand());
commandBox.runCommand(TypicalTestTasks.cs1020.getAddCommand());
assertEquals(commandBox.getCommandInput(), "");
commandBox.keyPress(KeyCode.UP);
assertEquals(commandBox.getCommandInput(), td.cs1020.getAddCommand());
assertEquals(commandBox.getCommandInput(), TypicalTestTasks.cs1020.getAddCommand());
}

// test for DOWN key press
@Test
public void commandBox_DOWN_keyPress(){
commandBox.runCommand(td.cs1020.getAddCommand());
commandBox.runCommand(td.engine.getAddCommand());
commandBox.runCommand(TypicalTestTasks.cs1020.getAddCommand());
commandBox.runCommand(TypicalTestTasks.engine.getAddCommand());
assertEquals(commandBox.getCommandInput(), "");
commandBox.keyPress(KeyCode.UP);
commandBox.keyPress(KeyCode.UP);
assertEquals(commandBox.getCommandInput(), td.cs1020.getAddCommand());
assertEquals(commandBox.getCommandInput(), TypicalTestTasks.cs1020.getAddCommand());
commandBox.keyPress(KeyCode.DOWN);
assertEquals(commandBox.getCommandInput(), td.engine.getAddCommand());
assertEquals(commandBox.getCommandInput(), TypicalTestTasks.engine.getAddCommand());
commandBox.keyPress(KeyCode.DOWN);
commandBox.keyPress(KeyCode.DOWN);
commandBox.keyPress(KeyCode.DOWN);
assertEquals(commandBox.getCommandInput(), td.engine.getAddCommand());
assertEquals(commandBox.getCommandInput(), TypicalTestTasks.engine.getAddCommand());
}
//@@author
}
Loading

0 comments on commit af8acd3

Please sign in to comment.