Merge pull request #110 from Noars/master

Add spotbugs

Author: Noars

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Continuous Integration
+
+# Trigger the workflow on push or pull request
+on: [push, pull_request]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Run tests with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew --stacktrace --info spotbugsMain
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: 'Spotbugs Reports'
+          path: ./build/reports/

build.gradle

@@ -14,6 +14,7 @@ plugins {
     id 'de.undercouch.download' version '3.2.0'
     id 'org.openjfx.javafxplugin' version '0.0.8'
     id 'io.freefair.lombok' version '4.1.4'
+    id 'com.github.spotbugs' version '2.0.0'
 }
 
 ext.javafxVersion = "11.0.2"
@@ -34,6 +35,7 @@ apply plugin: 'distribution'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'jacoco'
+apply plugin: 'com.github.spotbugs'
 apply plugin: 'distribution'
 
 apply from: "${rootDir}/gradle/package.gradle"
@@ -48,6 +50,14 @@ sourceSets {
     }
 }
 
+spotbugs {
+    toolVersion = '4.0.0-beta3'
+
+    //ignoreFailures = false
+    //effort = "max"
+    //reportLevel = "high"
+}
+
 jar {
     manifest {
         attributes 'Main-Class': 'main.Main'

lombok.config

@@ -1,3 +1,4 @@
 # This file is generated by the 'io.freefair.lombok' Gradle plugin
 config.stopBubbling = true
 lombok.addLombokGeneratedAnnotation = true
+lombok.extern.findbugs.addSuppressFBWarnings = true

src/main/java/main/ConfigurationBuilder.java

@@ -41,7 +41,8 @@ public static ConfigurationBuilder createFromPropertiesResource() {
             if(!Files.exists(path)){
                 Files.createDirectories(path);
                 File f = new File(CONFIGPATH);
-                f.createNewFile();
+                boolean createFile = f.createNewFile();
+                log.info("File created, path = " + createFile);
             }
             properties = loadProperties();
         } catch (FileNotFoundException e) {

src/main/java/main/Main.java

@@ -66,7 +66,6 @@ public void start(Stage primaryStage) {
             public void handle(KeyEvent t) {
                 if (t.getCode() == KeyCode.E) {
                     Platform.exit();
-                    System.exit(0);
                 }
             }
         });

src/main/java/main/UI/I18NButton.java

@@ -19,10 +19,10 @@ public I18NButton(Translator translator, String... textKeys) {
         translator.registerLanguageChangeListener(this);
     }
 
-    public void setTextKeys(String[] value) {
+    /*public void setTextKeys(String[] value) {
         this.textKeys = value;
         languageChanged();
-    }
+    }*/
 
     @Override
     public void languageChanged() {

src/main/java/main/UI/menu/HomeScreen.java

@@ -60,7 +60,7 @@ public HomeScreen(GraphicalMenus graphicalMenus, UpdateManager updateManager, Ma
 
         this.getChildren().add(UtilsUI.createBackground(graphicalMenus));
 
-        String tobiiNotConnected = Arrays.toString(Tobii.gazePosition());
+        //String tobiiNotConnected = Arrays.toString(Tobii.gazePosition());
 
         centerMenu = new VBox();
 

src/main/java/main/UI/menu/UpdateMenu.java

@@ -28,6 +28,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 @Slf4j
 public class UpdateMenu extends BorderPane {
@@ -482,11 +483,13 @@ void startUpdateOnlyInterAACtionInterface(){
     }
 
     void progressPercent(Process p, int index) {
+
         Thread t = new Thread(() -> {
             String s;
+            BufferedReader stdout = null;
             try {
-                BufferedReader stdout = new BufferedReader(
-                        new InputStreamReader(p.getInputStream()));
+                stdout = new BufferedReader(
+                        new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8));
                 while ((s = stdout.readLine()) != null) {
                     int indexPercent = s.indexOf('%');
                     if (indexPercent != -1) {
@@ -505,6 +508,14 @@ void progressPercent(Process p, int index) {
                 }
             } catch (IOException e) {
                 //DO NOTHING
+            } finally {
+                try {
+                    if (stdout != null){
+                        stdout.close();
+                    }
+                }catch (IOException e2){
+                    e2.printStackTrace();
+                }
             }
         });
         t.setDaemon(true);

src/main/java/main/process/CloseGoogleChromeProcessCreator.java

@@ -1,8 +1,11 @@
 package main.process;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.File;
 import java.io.IOException;
 
+@Slf4j
 public class CloseGoogleChromeProcessCreator {
 
     ProcessBuilder processBuilder;
@@ -18,10 +21,12 @@ Process waitForCloseRequest() {
             File fileFR = new File("~/Téléchargements/close161918.txt");
             File fileEN = new File("~/Downloads/close161918.txt");
             if(fileFR.exists()) {
-                fileFR.delete();
+                boolean deleteFrFile = fileFR.delete();
+                log.info("File delete = " + deleteFrFile);
             }
             if(fileEN.exists()) {
-                fileEN.delete();
+                boolean deleteEnFile = fileEN.delete();
+                log.info("File delete = " + deleteEnFile);
             }
             return this.processBuilder.inheritIO().start();
         } catch (IOException e) {

src/main/java/main/process/xdotoolProcess/XdotoolProcessCreator.java

@@ -18,7 +18,8 @@ static void startWindowIdSearcher(GraphicalMenus graphicalMenus, String name) {
                     err.printStackTrace();
                 }
             }
-            file.delete();
+            boolean deleteFile = file.delete();
+            System.out.println(deleteFile);
             Platform.runLater(
                     () -> {
                         graphicalMenus.primaryStage.hide();
@@ -33,7 +34,8 @@ static void startWindowIdSearcher(GraphicalMenus graphicalMenus, String name) {
     static Process getStartingProcess(ProcessBuilder processBuilder, GraphicalMenus graphicalMenus, String name) {
         try {
             File file = new File(name + "_windowId.txt");
-            file.delete();
+            boolean deleteFile = file.delete();
+            System.out.println(deleteFile);
             XdotoolProcessCreator.startWindowIdSearcher(graphicalMenus, name);
             return processBuilder.inheritIO().start();
         } catch (IOException e) {