v1.1.0

.gitignore

@@ -34,6 +34,7 @@ tmp
 
 # Generated files
 .idea/**/contentModel.xml
+.idea/**/Project_Default.xml
 
 # Sensitive or high-churn files
 .idea/**/dataSources/

README.md

@@ -69,11 +69,11 @@ In either case, please reference the [config file documentation](src/main/resour
 
 The Tabulator includes several example contest configuration files and associated CVR files.
 
-1. Click "Load..." at the top of the window and navigate to the `sample_input` folder (if you used Method 2 to install the Tabulator, navigate to the `test_data` folder).
+1. Click "File > Load..." in the menu and navigate to the `sample_input` folder (if you used Method 2 to install the Tabulator, navigate to the `test_data` folder).
 2. Open one of the folders listed here and select the config file (it will have the `_config.json` suffix).
-3. Click on the configuration tabs (Output, CVR Files, Candidates, Rules) to see how this contest is configured.
-4. Click "Validate" to check if this configuration is valid. You will see the results in the console at the bottom of the main window.
-5. Click "Tabulate" to tabulate the election. You will see the results in the console, including the location of the output files.
+3. Click on the configuration tabs (Output, CVR Files, Candidates, Required Rules, Optional Rules) to see how this contest is configured.
+4. Click "Tabulation > Validate" in the menu to check if this configuration is valid. You will see the results in the console at the bottom of the main window.
+5. Click "Tabulation > Tabulate" in the menu to tabulate the election. You will see the results in the console, including the location of the output files.
 
 ## Command-Line Interface
 
@@ -85,14 +85,22 @@ Or, if you're compiling and running using Gradle:
 
 `$ gradlew run --args="-cli path/to/config"`
 
-Finally, you can activate a special `convert-to-cdf` function via the command line to export the CVR as a NIST common data format (CDF) .json instead of tabulating the results, e.g.:
+You can also activate a special `convert-to-cdf` function via the command line to export the CVR as a NIST common data format (CDF) .json instead of tabulating the results, e.g.:
 
 `$ rcv -cli path/to/config convert-to-cdf`
 
+This option is available in the GUI by selecting the "Conversion > Convert CVRs in Current Config to CDF" menu option.
+
 Or, again, if you're compiling and running using Gradle:
 
 `$ gradlew run --args="-cli path/to/config  convert-to-cdf"`
 
+Finally, there's a `convert-dominion-to-generic-csv` option as well for converting Dominion JSON CVRs into a standardized, generic .csv format:
+
+`$ rcv -cli path/to/folder/containing/jsons convert-dominion-to-generic-csv`
+
+This option is available in the GUI by selecting the "Conversion > Convert Dominion to Generic Format..." menu option.
+
 ## Viewing Tabulator Output
 
 Tabulator output file names automatically include the current date and time, e.g. `2019-06-25_17-19-28_summary.csv`. This keeps them separate if you tabulate the same contest multiple times.

build.gradle

@@ -3,20 +3,20 @@ plugins {
     id "checkstyle"
     id "idea"
     id "java"
-    id "org.openjfx.javafxplugin" version "0.0.7"
-    id "org.beryx.jlink" version "2.10.4"
+    id "org.openjfx.javafxplugin" version "0.0.8"
+    id "org.beryx.jlink" version "2.17.2"
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile "org.apache.commons:commons-csv:1.6"
-    compile "org.apache.poi:poi-ooxml:4.1.0"
-    compile "com.fasterxml.jackson.core:jackson-core:2.9.9"
-    compile "com.fasterxml.jackson.core:jackson-annotations:2.9.9"
-    compile "com.fasterxml.jackson.core:jackson-databind:2.9.9"
+    compile "org.apache.commons:commons-csv:1.8"
+    compile "org.apache.poi:poi-ooxml:4.1.2"
+    compile "com.fasterxml.jackson.core:jackson-core:2.10.2"
+    compile "com.fasterxml.jackson.core:jackson-annotations:2.10.2"
+    compile "com.fasterxml.jackson.core:jackson-databind:2.10.2"
     testCompile "org.junit.jupiter:junit-jupiter-api:5.5.0-M1"
     testRuntime "org.junit.jupiter:junit-jupiter-engine:5.5.0-M1"
 }
@@ -34,7 +34,7 @@ application {
 
 // ### Checkstyle plugin settings
 checkstyle {
-    toolVersion = "8.23"
+    toolVersion = "8.30"
     // Keep the below file updated along with subsequent versions of Checkstyle (make sure to choose
     // the tag matching the toolVersion above):
     // https://github.com/checkstyle/checkstyle/blob/checkstyle-8.23/src/main/resources/google_checks.xml
@@ -64,7 +64,7 @@ test {
 
 // ### JavaFX plugin settings
 javafx {
-    version = "12.0.1"
+    version = "13.0.2"
     modules = ["javafx.controls", "javafx.fxml"]
 }
 
@@ -99,6 +99,7 @@ def sampleInputToCopy = copySpec {
         include "sample_interactive_tiebreak/sample_interactive_tiebreak_cvr.xlsx"
         include "precinct_example/precinct_example_config.json"
         include "precinct_example/precinct_example_cvr.xlsx"
+        include "dominion_cvr_conversion_alaska/*.json"
         exclude "output"
         exclude "**/*expected*"
     }