Merge remote-tracking branch 'upstream/master' into findbugs

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	build.gradle
#	core/src/main/java/edu/wpi/grip/core/OperationDescription.java

Author: AustinShalit

.pullapprove.yml

@@ -0,0 +1,10 @@
+approve_by_comment: true
+approve_regex: ^(Approved|LGTM)
+reject_regex: ^Rejected
+reset_on_push: true
+reviewers:
+  -
+    name: "GRIP Merge Approvers"
+    required: 1
+    teams:
+      - grip-merge-approvers

.travis-scripts/before-deploy.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-ls -R ui/build/distributions | awk '
+ls -R ui/build/jfx/native | awk '
 /:$/&&f{s=$0;f=0}
 /:$/&&!f{sub(/:$/,"");s=$0;f=1;next}
 NF&&f{ print s"/"$0 }'

.travis.yml

@@ -27,10 +27,10 @@ before_install:
 
 # Only do an assemble when we aren't building a pull request
 install:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:assemble --stacktrace || ./gradlew --stacktrace '
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:jfxNative --stacktrace || ./gradlew --stacktrace '
 
 script:
-  - ./gradlew checkstyleMain checkstyleTest findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
+  - ./gradlew checkstyleMain checkstyleTest pmdMain findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov         ; fi
@@ -56,7 +56,7 @@ deploy:
   api_key:
     secure: bdjiFXG3VBcM1iyxeputsWA9vHxgLNcxRB1i0REDNAnIEvDWpAdVr1jPBejeiOEw9s+k6EItATvQ2I7Xp5iKnYaXn0NuHzM3OSY8WNVCc+gBTaQwkijPBqi/vEXaO502CscW+H2U26QZGS/jJiUuieeErtzCNcWmCv8SRc5NFOVYdSlhAmp+aPeu2YwuweiMZNVquYM2hx7murghOYSF5hQTKq4/zrziENVi78XZS8rJFmxwOGqNj1GBLul2F9poIPjzDbPVJLeXTJEY+N3aYGJ4GyZYf6p8ynDO/v043/GuOAyNfkgSwhCcTQlmLG/mm6P9CUMoDQR9klh2eDswgrIP4rGLwILg3035nqHqwgTIKVXfspni3P/65siS6lXV0M5flEkRysMBr1GQhaIEUM32ArreMzAtC2Vn2CviKG0TwLmxyd/7W3JdoX4KrHAcKBwbqFDImWw43S6N63oTUEw6GjrI+CndwgF9RNgr5SAyS28LFXViOJe7JlGVUNU33kMNpEJxzVREzkJsO8aicaZTrvDniFOfg2WhrAyhjxmh4/IOHDE6qgtxw+2+TUzMlwdzdxb90BeXg2XfMichmKfQYQFEmZntCZcoHHDG5jbCTyAvFuOv6tdPjpr69QjiEJhEbohw8CEwoGhy1kxxQcCDCfABrOTivJ39Ui8MC6k=
   file_glob: true
-  file: "ui/build/distributions/*.{deb,pkg,dmg}"
+  file: "ui/build/jfx/native/*.{deb,pkg,dmg}"
   skip_cleanup: true
   on:
     repo: WPIRoboticsProjects/GRIP

CONTRIBUTING.md

@@ -69,4 +69,4 @@ Include details about your configuration and environment:</br>
 
 ### Code Formatting
 
-* GRIP uses standard Java formatting rules, although we don't care if your line length is over 80 characters. You can probably use your IDE's built-in formatter. This helps keep the code more consistent and readable.
+* GRIP follows the [Google Java Styleguide](https://google.github.io/styleguide/javaguide.html) with a few modifications regarding import order. We use the gradle [checkstyle](http://checkstyle.sourceforge.net/) plugin to ensure that code conforms to this styleguide. There are plugins for most major IDE's that support importing the `checkstyle.xml` file.

appveyor.yml

@@ -2,17 +2,17 @@ install:
   - choco install -y InnoSetup
 
 build_script:
-  - gradlew.bat :ui:assemble --stacktrace
+  - gradlew.bat :ui:jfxNative --stacktrace
 
 # to run your custom scripts instead of automatic tests
 test_script:
-  - gradlew.bat checkstyleMain checkstyleTest findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
+  - gradlew.bat checkstyleMain checkstyleTest pmdMain findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
 
 platform:
   - x64
 
 artifacts:
-  - path: ui\build\distributions\*.exe
+  - path: ui\build\jfx\native\*.exe
 
 
 deploy:

build.gradle

@@ -7,6 +7,7 @@ buildscript {
     }
 
     dependencies {
+        classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.5.2'
         classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
     }
@@ -84,12 +85,13 @@ def getVersionSimple = { ->
     }
 }
 
-allprojects {
+configure(allprojects - project(':ui:linuxLauncher')) {
     apply plugin: 'java'
     apply plugin: 'application'
     apply plugin: 'jacoco'
     apply plugin: 'net.ltgt.errorprone'
     apply plugin: 'checkstyle'
+    apply plugin: 'pmd'
     apply plugin: 'findbugs'
 
     configurations.errorprone {
@@ -99,6 +101,9 @@ allprojects {
     checkstyle {
         configFile = new File(rootDir, "checkstyle.xml")
         toolVersion = '6.19'
+        if (project.hasProperty("ignoreCheckstyle")) {
+            ignoreFailures = true
+        }
     }
 
     tasks.withType(Checkstyle) {
@@ -107,6 +112,14 @@ allprojects {
         it.dependsOn = []
     }
 
+    pmd {
+        consoleOutput = true
+        sourceSets = [sourceSets.main]
+        reportsDir = file("$project.buildDir/reports/pmd")
+        ruleSetFiles = files(new File(rootDir, "pmd-ruleset.xml"))
+        ruleSets = []
+    }
+
     findbugs {
         sourceSets = [sourceSets.main]
         excludeFilter = new File(rootDir, "findBugsSuppressions.xml")
@@ -311,21 +324,59 @@ project(":core") {
     }
 }
 
+project (":ui:linuxLauncher") {
+    apply plugin: 'cpp'
+
+    model {
+        binaries {
+            all {
+                cppCompiler.args '-pthread', '-ldl'
+                linker.args '-pthread', '-ldl'
+            }
+        }
+        components {
+            linuxLauncher(NativeExecutableSpec) {
+                sources {
+                    cpp {
+                        source {
+                            srcDir "src/cpp"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+project (":ui:preloader") {
+    apply plugin: 'java'
+    apply plugin: 'idea'
+    apply plugin: 'jacoco'
+    apply plugin: 'application'
+
+    task run(overwrite: true, type: JavaExec) {
+        classpath = sourceSets.main.runtimeClasspath
+        main = 'edu.wpi.grip.preloader.GripPreloader'
+        args 'windowed'
+    }
+}
+
 project(":ui") {
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'jacoco'
     apply plugin: 'application'
-    apply from: 'http://dl.bintray.com/shemnon/javafx-gradle/8.1.1/javafx.plugin'
+    apply plugin: 'javafx-gradle-plugin'
 
     configurations {
         ideProvider
     }
 
     dependencies {
         compile project(path: ':core', configuration: 'shadow')
+        compile project(path: ':ui:preloader')
         ideProvider project(path: ':core', configuration: 'compile')
-        compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.10'
+        compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
         compile group: 'com.hierynomus', name: 'sshj', version: '0.16.0'
         testCompile files(project(':core').sourceSets.test.output.classesDir)
         testCompile files(project(':core').sourceSets.test.output.resourcesDir)
@@ -335,6 +386,10 @@ project(":ui") {
     }
 
     evaluationDependsOn(':core')
+    evaluationDependsOn(':ui:preloader')
+    if (System.getProperty("os.name").toLowerCase().contains("linux")) {
+        jfxNative.dependsOn tasks.getByPath(':ui:linuxLauncher:linuxLauncherExecutable')
+    }
     compileTestJava.dependsOn tasks.getByPath(':core:testClasses')
 
     idea.module {
@@ -352,39 +407,29 @@ project(":ui") {
     }
 
 
-    javafx {
-        profiles {
-            linux {
-                category = 'Development'
-                bundleArguments = [
-                        // for DEB bundles
-                        'email': '[email protected]', // This is the email used for the deb maintainer field.
-                ]
-            }
-        }
-        appID = 'GRIP'
-        appName = 'GRIP'
+    jfx {
         mainClass = "edu.wpi.grip.ui.Main"
-        version = getVersionSimple()
+        preLoader = "edu.wpi.grip.preloader.GripPreloader"
+
+        identifier = "GRIP"
+        appName = "GRIP"
+        vendor = "Worcester Polytechnic Institute"
+        nativeReleaseVersion = "${getVersionSimple()}-${arch}"
+
+        jfxMainAppJarName = "${jfx.appName}-${jfx.nativeReleaseVersion}.jar"
 
         // This prevents the JIT from eating stack traces that get thrown a lot
         // This is slower but means we actually get the stack traces instead of
         // having them become one line like `java.lang.ArrayIndexOutOfBoundsException`
         // and as such, would be useless.
         // See: https://plumbr.eu/blog/java/on-a-quest-for-missing-stacktraces
         jvmArgs = ["-XX:-OmitStackTraceInFastThrow"]
-    }
-    mainClassName = javafx.mainClass
 
-    // The JavaFX plugin does not provide a way to change the installer artifact's name without changing the appName or appID,
-    // so instead, we simply rename the artifact to append the architecture (x86 or x64)
-    jfxDeploy.doLast {
-        def filet = fileTree(dir: 'build/distributions', include: "${javafx.appName}-${getVersionSimple()}.*")
-        filet.each { File f ->
-            def f2 = new File(f.getParentFile(), "${f.getName().replace("${getVersionSimple()}", "${getVersionSimple()}-${arch}")}")
-            f.renameTo(f2)
-        }
+        bundleArguments = [
+                "linux.launcher.url": file('linuxLauncher/build/exe/linuxLauncher/linuxLauncher').toURI().toURL()
+        ]
     }
+    mainClassName = jfx.mainClass
 }
 
 /*
@@ -393,23 +438,25 @@ project(":ui") {
  */
 task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
     description = 'Generates an aggregate report from all subprojects'
-    dependsOn(subprojects.test)
+    configure(subprojects - project(':ui:linuxLauncher')) {
+        dependsOn(test)
 
-    additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
-    sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
-    classDirectories = files(subprojects.sourceSets.main.output)
-    executionData = files(subprojects.jacocoTestReport.executionData)
+        additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
+        sourceDirectories = files(sourceSets.main.allSource.srcDirs)
+        classDirectories = files(sourceSets.main.output)
+        executionData = files(jacocoTestReport.executionData)
 
-    reports {
-        html.enabled = true
-        xml.enabled = true
-    }
+        reports {
+            html.enabled = true
+            xml.enabled = true
+        }
 
-    doFirst {
-        executionData = files(executionData.findAll { it.exists() })
+        doFirst {
+            executionData = files(executionData.findAll { it.exists() })
+        }
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
+    gradleVersion = '2.14.1'
 }

checkstyle.xml

@@ -235,5 +235,9 @@
             <property name="commentFormat" value=".*"/>
         </module>
         <module name="CommentsIndentation"/>
+        <module name="Regexp">
+            <property name="format" value="\(non\-Javadoc\)|System\..*\.print"/>
+            <property name="illegalPattern" value="true"/>
+        </module>
     </module>
 </module>

core/src/main/java/edu/wpi/grip/core/ConnectionValidator.java

@@ -19,14 +19,13 @@ public interface ConnectionValidator {
    * @return The return value of {@link #canConnect(OutputSocket, InputSocket)}
    */
   default boolean canConnect(Socket socket1, Socket socket2) {
-    final OutputSocket<?> outputSocket;
-    final InputSocket<?> inputSocket;
-
     // One socket must be an input and one must be an output
     if (socket1.getDirection() == socket2.getDirection()) {
       return false;
     }
 
+    final OutputSocket<?> outputSocket;
+    final InputSocket<?> inputSocket;
     if (socket1.getDirection().equals(Socket.Direction.OUTPUT)) {
       outputSocket = (OutputSocket) socket1;
       inputSocket = (InputSocket) socket2;

core/src/main/java/edu/wpi/grip/core/GripCoreModule.java

@@ -42,6 +42,9 @@
  */
 @SuppressWarnings("PMD.MoreThanOneLogger")
 public class GripCoreModule extends AbstractModule {
+
+  private final EventBus eventBus;
+
   private static final Logger logger = Logger.getLogger(GripCoreModule.class.getName());
 
   // This is in a static initialization block so that we don't create a ton of
@@ -93,8 +96,6 @@ public synchronized void publish(final LogRecord record) {
     }
   }
 
-  private final EventBus eventBus;
-
   /*
    * This class should not be used in tests. Use GRIPCoreTestModule for tests.
    */

core/src/main/java/edu/wpi/grip/core/Main.java

@@ -28,6 +28,8 @@
  */
 public class Main {
 
+  private static final Logger logger = Logger.getLogger(Main.class.getName());
+
   @Inject
   private Project project;
   @Inject
@@ -39,20 +41,18 @@ public class Main {
   @Inject
   private CVOperations cvOperations;
   @Inject
-  private Logger logger;
-  @Inject
   private GripServer gripServer;
   @Inject
   private HttpPipelineSwitcher pipelineSwitcher;
 
-  @SuppressWarnings({"PMD.SystemPrintln", "JavadocMethod"})
+  @SuppressWarnings("JavadocMethod")
   public static void main(String[] args) throws IOException, InterruptedException {
-    final Injector injector = Guice.createInjector(Modules.override(
-        new GripCoreModule(), new GripSourcesHardwareModule()).with(new GripNetworkModule()));
+    final Injector injector = Guice.createInjector(Modules.override(new GripCoreModule(),
+        new GripFileModule(), new GripSourcesHardwareModule()).with(new GripNetworkModule()));
     injector.getInstance(Main.class).start(args);
   }
 
-  @SuppressWarnings({"PMD.SystemPrintln", "JavadocMethod"})
+  @SuppressWarnings("JavadocMethod")
   public void start(String[] args) throws IOException, InterruptedException {
     String projectPath = null;
     if (args.length == 1) {