Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dummy PR to check codacy #157

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4b99eb5
[183] UiParts should not store a reference to the primaryStage
pyokagan Dec 2, 2016
6c99bdb
build.gradle: add `run` and `runShadow` tasks (#178)
pyokagan Dec 8, 2016
7ff3ad8
checkstyle: check for trailing whitespace #179 (#180)
pyokagan Dec 8, 2016
8d9ff22
Correct typos and grammatical errors in DG (#198)
jia1 Dec 9, 2016
ba0900e
[188] Construct StatusBarFooter in FXML fully
pyokagan Dec 10, 2016
e088d3d
checkstyle: accept LF, CR or CRLF as line endings (#194)
pyokagan Dec 10, 2016
e68f452
checkstyle: ensure curly brackets have whitespace around them #181 (#…
pyokagan Dec 10, 2016
845249d
[#186] Construct BrowserPanel in FXML (#208)
pyokagan Dec 12, 2016
38a52f5
Move page title to the top of README
damithc Dec 14, 2016
d1d17d8
[#173] Add background color to tags (#200)
edmundmok Dec 18, 2016
d2d6c55
[#149] Support F1 accelerator even when the focus is not in the list …
chao1995 Dec 18, 2016
0c529e6
Set theme jekyll-theme-cayman
damithc Dec 18, 2016
ce4104b
Set theme jekyll-theme-tactile
damithc Dec 18, 2016
6cab4c4
Set theme jekyll-theme-minimal
damithc Dec 18, 2016
979e680
Add tip about using pptx files to create diagrams
damithc Dec 18, 2016
c557d20
[161] Include test code in coverage analysis
m133225 Dec 18, 2016
311ab3c
Add additional info to LO-CodeCoverage
damithc Dec 18, 2016
04f0810
[#192] Set Up AppVeyor CI (#218)
pyokagan Dec 20, 2016
bd02cb8
Add AppVeyor badge
damithc Dec 20, 2016
d43d6cf
[#219] Make `GuiHandle::getNode()` return a `<T extends Node> T` (#225)
MightyCupcakes Dec 20, 2016
a8198d5
Add section numbers to dev guide
damithc Dec 22, 2016
eaf2f21
Add captions for Dev Guide diagrams
damithc Dec 22, 2016
7195389
Add section numbers to the user guide
damithc Dec 22, 2016
4bc4689
Rephrase method header comments to follow the coding style
damithc Dec 22, 2016
cbf763b
Add authors to Dev Guide sections to be written individually
damithc Dec 22, 2016
ee34067
Add template for Dev Guide: Product Survey
damithc Dec 22, 2016
7b1fc01
Refine NFRs in Dev Guide
damithc Dec 22, 2016
2f970fa
Add team ID to Dev Guide
damithc Dec 22, 2016
aeb1590
Set theme jekyll-theme-cayman
damithc Dec 22, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Address Book (Level 4)

[![Build Status](https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master)](https://travis-ci.org/se-edu/addressbook-level4)
[![Build status](https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true)](https://ci.appveyor.com/project/damithc/addressbook-level4)
[![Coverage Status](https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master)](https://coveralls.io/github/se-edu/addressbook-level4?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a)](https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=se-edu/addressbook-level4&amp;utm_campaign=Badge_Grade)

# Address Book (Level 4)

<img src="docs/images/Ui.png" width="600"><br>

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
18 changes: 18 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# AppVeyor configuration file
# For more details see https://www.appveyor.com/docs/build-configuration/

# Call on gradle to build and run tests
# --no-daemon: Prevent the daemon from launching to prevent file-in-use errors
# when we cache the ~/.gradle directory
build_script:
- gradlew.bat --no-daemon assemble checkstyleMain checkstyleTest

test_script:
- appveyor-retry gradlew.bat --no-daemon headless allTests

environment:
JAVA_HOME: C:\Program Files\Java\jdk1.8.0 # Use 64-bit Java

# Files/folders to preserve between builds to speed them up
cache:
- C:\Users\appveyor\.gradle
22 changes: 15 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
plugins {
id "com.github.kt3k.coveralls" version "2.4.0"
id "com.github.johnrengelman.shadow" version '1.2.3'
id 'application'
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.MainApp'

allprojects {
apply plugin: 'idea'
apply plugin: 'java'
Expand Down Expand Up @@ -78,15 +82,19 @@ allprojects {
srcDir 'src/main/resources'
}
}
test {
java {
srcDir 'src/test/java'
}
resources {
srcDir 'src/test/resources'
}
}
}

shadowJar {
archiveName = "addressbook.jar"

manifest {
attributes "Main-Class": "seedu.address.MainApp"
}

destinationDir = file("${buildDir}/jar/")
}
}
Expand All @@ -96,8 +104,8 @@ task wrapper(type: Wrapper) {
}

task coverage(type: JacocoReport) {
sourceDirectories = files(allprojects.sourceSets.main.allSource.srcDirs)
classDirectories = files(allprojects.sourceSets.main.output)
sourceDirectories = files(allprojects.sourceSets.main.allSource.srcDirs, allprojects.sourceSets.test.allSource.srcDirs)
classDirectories = files(allprojects.sourceSets.main.output, allprojects.sourceSets.test.output)
executionData = files(allprojects.jacocoTestReport.executionData)
afterEvaluate {
classDirectories = files(classDirectories.files.collect {
Expand All @@ -111,7 +119,7 @@ task coverage(type: JacocoReport) {
}

coveralls {
sourceDirs = allprojects.sourceSets.main.allSource.srcDirs.flatten()
sourceDirs = files(allprojects.sourceSets.main.allSource.srcDirs, allprojects.sourceSets.test.allSource.srcDirs).flatten()
jacocoReportPath = "${buildDir}/reports/jacoco/coverage/coverage.xml"
}

Expand Down
26 changes: 23 additions & 3 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
<!-- Checks that there are no tab characters in the file. -->
</module>

<module name="NewlineAtEndOfFile"/>
<module name="NewlineAtEndOfFile">
<!-- Accept LF, CR or CRLF to accomodate devs who prefer different line endings -->
<property name="lineSeparator" value="lf_cr_crlf"/>
</module>

<module name="RegexpSingleline">
<!-- Checks that FIXME is not used in comments. TODO is preferred. -->
Expand Down Expand Up @@ -215,11 +218,21 @@
-->
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
EQUAL, GE, GT, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
RCURLY, SL, SLIST, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
<!-- Allow empty constructors e.g. MyClass() {} -->
<property name="allowEmptyConstructors" value="true" />
<!-- Allow empty methods e.g. void func() {} -->
<property name="allowEmptyMethods" value="true" />
<!-- Allow empty types e.g. class Foo {}, enum Foo {} -->
<property name="allowEmptyTypes" value="true" />
<!-- Allow empty loops e.g. for (int i = 1; i > 1; i++) {} -->
<property name="allowEmptyLoops" value="true" />
<!-- Allow empty lambdas e.g. () -> {} -->
<property name="allowEmptyLambdas" value="true" />
<property name="severity" value="error"/>
</module>

Expand All @@ -236,6 +249,13 @@
<property name="severity" value="error"/>
</module>

<!-- No trailing whitespace -->
<module name="Regexp">
<property name="format" value="[ \t]+$"/>
<property name="illegalPattern" value="true"/>
<property name="message" value="Trailing whitespace"/>
</module>

<module name="Indentation">
<property name="caseIndent" value="0" />
</module>
Expand Down
Loading