Use java concurrent api to handle ProgressBarRunnable, fix some warnings

Author: replydev

src/main/java/me/replydev/mcping/PingOptions.java

@@ -22,11 +22,6 @@ public PingOptions setTimeout(int timeout) {
         return this;
     }
 
-    /*public PingOptions setCharset(String charset) {
-        this.charset = charset;
-        return this;
-    }*/
-
     String getHostname() {
         return this.hostname;
     }
@@ -39,8 +34,4 @@ public int getTimeout() {
         return this.timeout;
     }
 
-    /*public String getCharset() {
-        return this.charset;
-    }*/
-
 }

src/main/java/me/replydev/mcping/net/TCPPinger.java

@@ -32,8 +32,6 @@ public boolean ping(InetAddress address, int count)
             // cycle through different ports until a working one is found
             int probePort = PROBE_TCP_PORTS[i % PROBE_TCP_PORTS.length];
             // change the first port to the requested one, if it is available
-            /*if (i == 0 && subject.isAnyPortRequested())
-                probePort = subject.requestedPortsIterator().next();*/
 
             //long startTime = System.currentTimeMillis();
             try 
@@ -74,10 +72,6 @@ public boolean ping(InetAddress address, int count)
                         // host is down
                         break;
                     }
-                    /*else {
-                        // something unknown
-                        //LOG.log(FINER, subject.toString(), e);
-                    }*/
                 }
             }
             finally 
@@ -90,17 +84,8 @@ public boolean ping(InetAddress address, int count)
     }
 
     //A socket is already a closeable, this method is redundant
-    /*
-    private static void closeQuietly(Socket socket) {
-        if (socket != null) try {
-            socket.close();
-        }
-        catch (IOException ignore) {
-        }
-    }
-    */
-    
-    
+
+
     private static void closeQuietly(Closeable closeable) {
         if (closeable != null) try {
             closeable.close();

src/main/java/me/replydev/mcping/net/WindowsPinger.java

@@ -45,8 +45,6 @@ private boolean ping4(InetAddress address, int count) throws IOException {
                 int numReplies = dll.IcmpSendEcho(handle, ipaddr, sendData, (short) sendDataSize, null, replyData, replyDataSize, timeout);
                 WinIpHlpDll.IcmpEchoReply echoReply = new WinIpHlpDll.IcmpEchoReply(replyData);
                 if (numReplies > 0 && echoReply.status == 0 && Arrays.equals(echoReply.address.bytes, ipaddr.bytes)) {
-                    /*result.addReply(echoReply.roundTripTime);
-                    result.setTTL(echoReply.options.ttl & 0xFF);*/
                     return true;
                 }
             }

src/main/java/me/replydev/mcping/rawData/ExtraDescription.java

@@ -4,6 +4,7 @@
 
 public class ExtraDescription {
 
+    @SuppressWarnings("MismatchedReadAndWriteOfArray")
     @SerializedName("extra")
     private Extra[] extra;
 

src/main/java/me/replydev/qubo/CLI.java

@@ -83,7 +83,7 @@ private static void txtRun()
 	{
 		try 
 		{
-			BufferedReader reader = new BufferedReader(new FileReader(new File("ranges.txt")));
+			BufferedReader reader = new BufferedReader(new FileReader("ranges.txt"));
 			String s;
 			while ((s = reader.readLine()) != null) 
 			{

src/main/java/me/replydev/qubo/InputData.java

@@ -20,7 +20,7 @@ public class InputData{
     private boolean ping;
     private final String filename;
 
-    private Options options;
+    private final Options options;
 
     private Options buildOptions()
     {

src/main/java/me/replydev/qubo/gui/MainWindow.java

@@ -25,26 +25,23 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Locale;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 public class MainWindow extends JFrame {
 
     /**
      *
      */
     private static final long serialVersionUID = 1L;
-
     public static DefaultTableModel dtm;
-
     private QuboInstance quboInstance;
-
     private Thread instanceThread;
     private InstanceRunnable instanceRunnable;
-
-    private Thread progressBarThread;
-    private ProgressBarRunnable progressBarRunnable;
     private Point initialClick;
-
     private final JFrame meMyselfAndI;
+    private ScheduledExecutorService schedulerProgressBarService;
 
     public MainWindow() {
         setUndecorated(true);
@@ -141,8 +138,7 @@ public void mouseDragged(MouseEvent e) {
     public void idle() {
         instanceRunnable.stop();
         instanceThread = null;
-        progressBarRunnable.stop();
-        progressBarThread = null;
+        schedulerProgressBarService.shutdown();
         quboInstance = null;
         progressBar1.setString("100%");
         progressBar1.setValue(100);
@@ -171,11 +167,11 @@ private void running(InputData i) {
         instanceRunnable = new InstanceRunnable(quboInstance, this);
         instanceThread = new Thread(instanceRunnable);
         instanceThread.start();
-
-        progressBarRunnable = new ProgressBarRunnable(progressBar1, quboInstance);
-        progressBarThread = new Thread(progressBarRunnable);
-        progressBarThread.start();
-
+        schedulerProgressBarService = Executors.newScheduledThreadPool(1);
+        schedulerProgressBarService.scheduleAtFixedRate(new ProgressBarRunnable(progressBar1, quboInstance),
+                0,
+                TimeUnit.SECONDS.toSeconds(1),
+                TimeUnit.SECONDS);
         ipRangeTextField.setEnabled(false);
         portRangeTextField.setEnabled(false);
         threadTextField.setEnabled(false);

src/main/java/me/replydev/qubo/gui/ProgressBarRunnable.java

@@ -5,34 +5,29 @@
 import me.replydev.utils.Log;
 
 import javax.swing.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
 class ProgressBarRunnable implements Runnable {
 
     private final JProgressBar progressBar;
     private final QuboInstance quboInstance;
-    private boolean stop = false;
     public ProgressBarRunnable(JProgressBar progressBar, QuboInstance quboInstance){
         this.progressBar = progressBar;
         this.quboInstance = quboInstance;
     }
 
     @Override
     public void run() {
-        while(true){
-            if(stop) return;
-            int percentage = (int)quboInstance.getPercentage();
-            progressBar.setString(percentage + "%");
-            progressBar.setValue(percentage);
-            if(progressBar.getValue() == 100) return;
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                Log.log_to_file(e.toString(),"log.txt");
-            }
+        int percentage = (int)quboInstance.getPercentage();
+        progressBar.setString(percentage + "%");
+        progressBar.setValue(percentage);
+        if(progressBar.getValue() == 100) return;
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            Log.log_to_file(e.toString(),"log.txt");
         }
     }
 
-    public void stop(){
-        stop = true;
-    }
 }

src/main/java/me/replydev/versionChecker/GithubResponse.java

@@ -1,5 +1,6 @@
 package me.replydev.versionChecker;
 
+@SuppressWarnings("MismatchedReadAndWriteOfArray")
 public class GithubResponse {
 
     private String tag_name;

src/main/java/me/replydev/versionChecker/Version.java

@@ -2,7 +2,7 @@
 
 public class Version implements Comparable<Version> {
 
-    private String version;
+    private final String version;
     public final String get() {
         return this.version;
     }