Skip to content
This repository has been archived by the owner on Mar 5, 2023. It is now read-only.

Commit

Permalink
[#604] Upgrade Checkstyle to version 8.1 (#614)
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhiyuan-Amos authored Aug 7, 2017
2 parents e2b5e35 + 78aaac4 commit e38f155
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ allprojects {
junitVersion = '4.12'
testFxVersion = '4.0.5-alpha'
monocleVersion = '1.8.0_20'
checkstyleVersion = '7.2'
checkstyleVersion = '8.1'

libDir = 'lib'
}
Expand Down
15 changes: 7 additions & 8 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@
<property name="message" value='TODO is preferred to FIXME."' />
</module>


<!-- Required to allow exceptions in code style -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>

<!-- All Java AST specific tests live under TreeWalker module. -->
<module name="TreeWalker">

<!-- Required for SuppressionCommentFilter to work -->
<module name="FileContentsHolder"/>

<!-- Required to allow exceptions in code style -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>

<!--
IMPORT CHECKS
-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.logic.commands;


import seedu.address.commons.core.EventsCenter;
import seedu.address.commons.events.ui.ShowHelpRequestEvent;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/seedu/address/model/ReadOnlyAddressBook.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.model;


import javafx.collections.ObservableList;
import seedu.address.model.person.ReadOnlyPerson;
import seedu.address.model.tag.Tag;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/seedu/address/model/person/Address.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.model.person;


import static java.util.Objects.requireNonNull;

import seedu.address.commons.exceptions.IllegalValueException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package guitests.guihandles;


import java.util.List;
import java.util.Optional;

Expand Down
1 change: 0 additions & 1 deletion src/test/java/seedu/address/commons/util/FileUtilTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.commons.util;


import static org.junit.Assert.assertEquals;

import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.storage;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.storage;


import static junit.framework.TestCase.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package seedu.address.storage;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static seedu.address.testutil.TypicalPersons.ALICE;
Expand Down

0 comments on commit e38f155

Please sign in to comment.