fix codacy issues

xSAVIKx · xSAVIKx · commit 41e717187d38 · 2017-02-09T18:54:03.000+02:00
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/command/exception/CommandExecutionException.java b/src/main/java/com/github/xsavikx/androidscreencast/api/command/exception/CommandExecutionException.java
@@ -1,6 +1,8 @@
 package com.github.xsavikx.androidscreencast.api.command.exception;
 
-public class CommandExecutionException extends RuntimeException {
+import com.github.xsavikx.androidscreencast.exception.AndroidScreenCastRuntimeException;
+
+public class CommandExecutionException extends AndroidScreenCastRuntimeException {
 
     private static final long serialVersionUID = 8676432388325401069L;
 
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/image/AbstractRawImageColorModel.java b/src/main/java/com/github/xsavikx/androidscreencast/api/image/AbstractRawImageColorModel.java
@@ -25,11 +25,11 @@ public AbstractRawImageColorModel() {
 
     protected abstract int getPixel(byte[] data);
 
-    int getPixel(Object inData) {
+    protected int getPixel(Object inData) {
         return getPixel((byte[]) inData);
     }
 
-    int getMask(int length) {
+    protected int getMask(int length) {
         int res = 0;
         for (int i = 0; i < length; i++) {
             res = (res << 1) + 1;
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/image/ImageUtils.java b/src/main/java/com/github/xsavikx/androidscreencast/api/image/ImageUtils.java
@@ -32,8 +32,9 @@ public static BufferedImage convertImage(RawImage rawImage) {
                 return rawImage16toARGB(rawImage);
             case THIRTY_TWO_BIT_IMAGE:
                 return rawImage32toARGB(rawImage);
+            default:
+                throw new IllegalStateException("Raw image contain wrong bpp: " + rawImage.bpp);
         }
-        throw new IllegalArgumentException("Raw image contain wrong bpp: " + rawImage.bpp);
     }
 
     private static BufferedImage rawImage32toARGB(RawImage rawImage) {
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/injector/Injector.java b/src/main/java/com/github/xsavikx/androidscreencast/api/injector/Injector.java
@@ -19,17 +19,11 @@ public Injector(ScreenCaptureRunnable screenCaptureRunnable) {
     }
 
     public void stop() {
-        LOGGER.debug("stop() - start");
         screenCaptureRunnable.stop();
-        LOGGER.debug("stop() - end");
     }
 
     public void start() {
-        LOGGER.debug("start() - start");
-
         screenCaptureThread.start();
-
-        LOGGER.debug("start() - end");
     }
 
     public void setScreenCaptureListener(ScreenCaptureRunnable.ScreenCaptureListener listener) {
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/injector/KeyCodeConverter.java b/src/main/java/com/github/xsavikx/androidscreencast/api/injector/KeyCodeConverter.java
@@ -16,7 +16,7 @@ public static int getKeyCode(KeyEvent e) {
         if (inputKeyEvent != null) {
             code = inputKeyEvent.getCode();
         }
-        LOGGER.debug("getKeyCode(KeyEvent e=" + e + ") - end");
+        LOGGER.debug(String.format("Received KeyEvent=%s. Produced KeyCode=%d", String.valueOf(e), code));
         return code;
     }
 
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/injector/OutputStreamShellOutputReceiver.java b/src/main/java/com/github/xsavikx/androidscreencast/api/injector/OutputStreamShellOutputReceiver.java
@@ -1,6 +1,7 @@
 package com.github.xsavikx.androidscreencast.api.injector;
 
 import com.android.ddmlib.IShellOutputReceiver;
+import com.github.xsavikx.androidscreencast.exception.IORuntimeException;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -17,8 +18,8 @@ public OutputStreamShellOutputReceiver(OutputStream os) {
     public void addOutput(byte[] buf, int off, int len) {
         try {
             os.write(buf, off, len);
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
         }
     }
 
@@ -27,7 +28,7 @@ public void flush() {
         try {
             os.flush();
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new IORuntimeException(e);
         }
     }
 
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/injector/ScreenCaptureRunnable.java b/src/main/java/com/github/xsavikx/androidscreencast/api/injector/ScreenCaptureRunnable.java
@@ -6,6 +6,7 @@
 import com.android.ddmlib.TimeoutException;
 import com.github.xsavikx.androidscreencast.api.image.ImageUtils;
 import com.github.xsavikx.androidscreencast.api.recording.QuickTimeOutputStream;
+import com.github.xsavikx.androidscreencast.exception.IORuntimeException;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -22,6 +23,10 @@
 @Component
 public class ScreenCaptureRunnable implements Runnable {
     private static final Logger LOGGER = Logger.getLogger(ScreenCaptureRunnable.class);
+    private static final String MOV_FILE_TYPE = ".mov";
+    private static final int MOV_FPS = 30;
+    private static final float MOV_COMPRESSION_RATE = 1f;
+    private static final int FRAME_DURATION = 10;
     private final IDevice device;
     private Dimension size;
     private QuickTimeOutputStream qos = null;
@@ -93,7 +98,7 @@ private void display(RawImage rawImage) {
         if (qos != null) {
             SwingUtilities.invokeLater(() -> {
                 try {
-                    qos.writeFrame(image, 10);
+                    qos.writeFrame(image, FRAME_DURATION);
                 } catch (IOException e) {
                     LOGGER.error(e);
                 }
@@ -106,16 +111,17 @@ public void setListener(ScreenCaptureListener listener) {
     }
 
 
-    public void startRecording(File f) {
+    public void startRecording(File file) {
         try {
-            if (!f.getName().toLowerCase().endsWith(".mov"))
-                f = new File(f.getAbsolutePath() + ".mov");
-            qos = new QuickTimeOutputStream(f, QuickTimeOutputStream.VideoFormat.JPG);
+            File outputFile = file;
+            if (!outputFile.getName().toLowerCase().endsWith(MOV_FILE_TYPE))
+                outputFile = new File(file.getAbsolutePath() + MOV_FILE_TYPE);
+            qos = new QuickTimeOutputStream(outputFile, QuickTimeOutputStream.VideoFormat.JPG);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new IORuntimeException(e);
         }
-        qos.setVideoCompressionQuality(1f);
-        qos.setTimeScale(30); // 30 fps
+        qos.setVideoCompressionQuality(MOV_COMPRESSION_RATE);
+        qos.setTimeScale(MOV_FPS);
     }
 
     public void stopRecording() {
@@ -124,7 +130,7 @@ public void stopRecording() {
             qos = null;
             o.close();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new IORuntimeException(e);
         }
     }
 
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/api/recording/QuickTimeOutputStream.java b/src/main/java/com/github/xsavikx/androidscreencast/api/recording/QuickTimeOutputStream.java
@@ -949,6 +949,8 @@ private void writeEpilog() throws IOException {
 
                 break;
             }
+            default:
+                throw new IllegalStateException("Such video format is not supported: " + videoFormat);
         }
 
     /* Time to Sample atom ---- */
@@ -1202,9 +1204,10 @@ public void writeFrame(BufferedImage image, int duration) throws IOException {
                 byte[] bytes = new byte[imgWidth * 3]; // holds a scanline of raw
                 // image data with 3
                 // channels of 8 bit data
+                int n = imgWidth * 3;
                 for (int y = 0; y < imgHeight; y++) {
                     raster.getPixels(0, y, imgWidth, 1, raw);
-                    for (int k = 0, n = imgWidth * 3; k < n; k++) {
+                    for (int k = 0; k < n; k++) {
                         bytes[k] = (byte) raw[k];
                     }
                     mdatAtom.getOutputStream().write(bytes);
@@ -1336,15 +1339,15 @@ private static class Sample {
         /**
          * Offset of the sample relative to the start of the QuickTime file.
          */
-        long offset;
+        private long offset;
         /**
          * Data length of the sample.
          */
-        long length;
+        private long length;
         /**
          * The duration of the sample in time scale units.
          */
-        int duration;
+        private int duration;
 
         /**
          * Creates a new sample.
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/app/SwingApplication.java b/src/main/java/com/github/xsavikx/androidscreencast/app/SwingApplication.java
@@ -1,5 +1,6 @@
 package com.github.xsavikx.androidscreencast.app;
 
+import com.github.xsavikx.androidscreencast.exception.AndroidScreenCastRuntimeException;
 import com.github.xsavikx.androidscreencast.ui.JDialogError;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -22,7 +23,7 @@ public void init() {
             if (useNativeLook())
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (Exception ex) {
-            throw new RuntimeException(ex);
+            throw new AndroidScreenCastRuntimeException(ex);
         }
     }
 
@@ -38,7 +39,7 @@ public void handleException(Thread thread, Throwable ex) {
                 return;
             jd = new JDialogError(ex);
             SwingUtilities.invokeLater(() -> jd.setVisible(true));
-        } catch (Exception ex2) {
+        } catch (Exception ignored) {
             // ignored
         }
     }
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/exception/IORuntimeException.java b/src/main/java/com/github/xsavikx/androidscreencast/exception/IORuntimeException.java
@@ -0,0 +1,21 @@
+package com.github.xsavikx.androidscreencast.exception;
+
+import java.io.IOException;
+
+/**
+ * Runtime Exception wrapper for {@link IOException}
+ */
+public class IORuntimeException extends AndroidScreenCastRuntimeException {
+
+    public IORuntimeException(String message, IOException cause) {
+        super(message, cause);
+    }
+
+    public IORuntimeException(IOException cause) {
+        super(cause);
+    }
+
+    public IORuntimeException(String message, IOException cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/ui/JDialogError.java b/src/main/java/com/github/xsavikx/androidscreencast/ui/JDialogError.java
@@ -1,6 +1,7 @@
 package com.github.xsavikx.androidscreencast.ui;
 
 import com.github.xsavikx.androidscreencast.exception.AndroidScreenCastRuntimeException;
+import com.github.xsavikx.androidscreencast.exception.IORuntimeException;
 
 import javax.swing.*;
 import java.awt.*;
@@ -11,7 +12,6 @@
 public class JDialogError extends JDialog {
 
     private JLabel errorDialogLabel;
-    private JScrollPane scrollPane;
     private JTextArea errorDescription;
 
     public JDialogError(Throwable ex) {
@@ -21,7 +21,7 @@ public JDialogError(Throwable ex) {
 
     private void initComponents(Throwable ex) {
         errorDialogLabel = new JLabel();
-        scrollPane = new JScrollPane();
+        JScrollPane scrollPane = new JScrollPane();
         errorDescription = new JTextArea();
         errorDescription.setLineWrap(true);
         errorDescription.setWrapStyleWord(true);
@@ -46,10 +46,9 @@ private void initComponents(Throwable ex) {
         setAlwaysOnTop(true);
     }
 
-    private void setErrorDetails(Throwable ex) {
+    private void setErrorDetails(Throwable e) {
+        Throwable ex = getRealException(e);
         errorDialogLabel.setText(ex.getClass().getSimpleName());
-        if (ex.getClass() == RuntimeException.class && ex.getCause() != null)
-            ex = ex.getCause();
         try (StringWriter stringWriter = new StringWriter()) {
             AndroidScreenCastRuntimeException realCause = getCause(ex);
             if (realCause != null) {
@@ -61,11 +60,17 @@ private void setErrorDetails(Throwable ex) {
                 ex.printStackTrace(new PrintWriter(stringWriter));
             }
             errorDescription.setText(stringWriter.toString());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        } catch (IOException ioe) {
+            throw new IORuntimeException(ioe);
         }
     }
 
+    private Throwable getRealException(Throwable e) {
+        if (e.getClass() == RuntimeException.class && e.getCause() != null)
+            return e.getCause();
+        return e;
+    }
+
     private AndroidScreenCastRuntimeException getCause(Throwable ex) {
         Throwable cause = ex.getCause();
         while (cause != null) {
diff --git a/src/main/java/com/github/xsavikx/androidscreencast/ui/explorer/JFrameExplorer.java b/src/main/java/com/github/xsavikx/androidscreencast/ui/explorer/JFrameExplorer.java
@@ -2,6 +2,7 @@
 
 import com.github.xsavikx.androidscreencast.api.AndroidDevice;
 import com.github.xsavikx.androidscreencast.api.file.FileInfo;
+import com.github.xsavikx.androidscreencast.exception.AndroidScreenCastRuntimeException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,7 +25,6 @@ public class JFrameExplorer extends JFrame {
     private static final long serialVersionUID = -5209265873286028854L;
     private final AndroidDevice androidDevice;
     private JTree jt;
-    private JSplitPane jSplitPane;
     private JList<Object> jListFichiers;
     private Map<String, List<FileInfo>> cache = new LinkedHashMap<>();
 
@@ -57,7 +57,7 @@ public void launch() {
         jListFichiers = new JList<>();
         jListFichiers.setListData(new Object[]{});
 
-        jSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jsp, new JScrollPane(jListFichiers));
+        JSplitPane jSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jsp, new JScrollPane(jListFichiers));
 
         add(jSplitPane, BorderLayout.CENTER);
         setSize(640, 480);
@@ -98,14 +98,14 @@ private void launchFile(FileInfo node) {
             File tempFile = node.downloadTemporary();
             Desktop.getDesktop().open(tempFile);
         } catch (Exception ex) {
-            throw new RuntimeException(ex);
+            throw new AndroidScreenCastRuntimeException(ex);
         }
     }
 
     private class FolderTreeNode extends LazyMutableTreeNode {
         private static final long serialVersionUID = 9131974430354670263L;
-        String name;
-        String path;
+        private final String name;
+        private final String path;
 
         public FolderTreeNode(String name, String path) {
             this.name = name;

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ public static BufferedImage convertImage(RawImage rawImage) {`
`32`	`32`	`return rawImage16toARGB(rawImage);`
`33`	`33`	`case THIRTY_TWO_BIT_IMAGE:`
`34`	`34`	`return rawImage32toARGB(rawImage);`
	`35`	`+ default:`
	`36`	`+ throw new IllegalStateException("Raw image contain wrong bpp: " + rawImage.bpp);`
`35`	`37`	`}`
`36`		`- throw new IllegalArgumentException("Raw image contain wrong bpp: " + rawImage.bpp);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`private static BufferedImage rawImage32toARGB(RawImage rawImage) {`
Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,11 @@ public Injector(ScreenCaptureRunnable screenCaptureRunnable) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public void stop() {`
`22`		`- LOGGER.debug("stop() - start");`
`23`	`22`	`screenCaptureRunnable.stop();`
`24`		`- LOGGER.debug("stop() - end");`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`public void start() {`
`28`		`- LOGGER.debug("start() - start");`
`29`		`-`
`30`	`26`	`screenCaptureThread.start();`
`31`		`-`
`32`		`- LOGGER.debug("start() - end");`
`33`	`27`	`}`
`34`	`28`
`35`	`29`	`public void setScreenCaptureListener(ScreenCaptureRunnable.ScreenCaptureListener listener) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static int getKeyCode(KeyEvent e) {`
`16`	`16`	`if (inputKeyEvent != null) {`
`17`	`17`	`code = inputKeyEvent.getCode();`
`18`	`18`	`}`
`19`		`- LOGGER.debug("getKeyCode(KeyEvent e=" + e + ") - end");`
	`19`	`+ LOGGER.debug(String.format("Received KeyEvent=%s. Produced KeyCode=%d", String.valueOf(e), code));`
`20`	`20`	`return code;`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.github.xsavikx.androidscreencast.api.injector;`
`2`	`2`
`3`	`3`	`import com.android.ddmlib.IShellOutputReceiver;`
	`4`	`+import com.github.xsavikx.androidscreencast.exception.IORuntimeException;`
`4`	`5`
`5`	`6`	`import java.io.IOException;`
`6`	`7`	`import java.io.OutputStream;`
`@@ -17,8 +18,8 @@ public OutputStreamShellOutputReceiver(OutputStream os) {`
`17`	`18`	`public void addOutput(byte[] buf, int off, int len) {`
`18`	`19`	`try {`
`19`	`20`	`os.write(buf, off, len);`
`20`		`- } catch (IOException ex) {`
`21`		`- throw new RuntimeException(ex);`
	`21`	`+ } catch (IOException e) {`
	`22`	`+ throw new IORuntimeException(e);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`
`@@ -27,7 +28,7 @@ public void flush() {`
`27`	`28`	`try {`
`28`	`29`	`os.flush();`
`29`	`30`	`} catch (IOException e) {`
`30`		`- e.printStackTrace();`
	`31`	`+ throw new IORuntimeException(e);`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.github.xsavikx.androidscreencast.app;`
`2`	`2`
	`3`	`+import com.github.xsavikx.androidscreencast.exception.AndroidScreenCastRuntimeException;`
`3`	`4`	`import com.github.xsavikx.androidscreencast.ui.JDialogError;`
`4`	`5`	`import org.springframework.beans.factory.annotation.Value;`
`5`	`6`
`@@ -22,7 +23,7 @@ public void init() {`
`22`	`23`	`if (useNativeLook())`
`23`	`24`	`UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());`
`24`	`25`	`} catch (Exception ex) {`
`25`		`- throw new RuntimeException(ex);`
	`26`	`+ throw new AndroidScreenCastRuntimeException(ex);`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
`@@ -38,7 +39,7 @@ public void handleException(Thread thread, Throwable ex) {`
`38`	`39`	`return;`
`39`	`40`	`jd = new JDialogError(ex);`
`40`	`41`	`SwingUtilities.invokeLater(() -> jd.setVisible(true));`
`41`		`- } catch (Exception ex2) {`
	`42`	`+ } catch (Exception ignored) {`
`42`	`43`	`// ignored`
`43`	`44`	`}`
`44`	`45`	`}`