refactor

Author: monkstone

pom.rb

@@ -23,7 +23,7 @@
   'maven.compiler.target' => '1.8',
   'janino.version' => '3.0.12',
   'jogl.version' => '2.3.2',
-  'processing.version' => '3.3.5'
+  'processing.version' => '3.3.7'
   )
 
   jar 'org.processing:core:${processing.version}'
@@ -53,7 +53,7 @@
       )
     end
 
-    plugin( :compiler, '3.6.0',
+    plugin( :compiler, '3.8.0',
     source: '${maven.compiler.source}',
     target: '${maven.compiler.target}'
     )

pom.xml

@@ -65,7 +65,7 @@ DO NOT MODIFIY - GENERATED CODE
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <processing.version>3.3.5</processing.version>
+    <processing.version>3.3.7</processing.version>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <source.directory>src</source.directory>
   </properties>
@@ -135,7 +135,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.8.0</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>

src/main/java/SunflowGUI.java

@@ -6,7 +6,6 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.beans.PropertyVetoException;
 import java.io.BufferedReader;
 import java.io.File;
@@ -346,14 +345,20 @@ public static void main(String[] args) {
                         if (i > args.length - 2) {
                             usage(false);
                         }   String baketype = args[i + 1];
-                        if (baketype.equals("view")) {
+                    switch (baketype) {
+                        case "view":
                             bakeViewdep = true;
-                        } else if (baketype.equals("ortho")) {
+                            break;
+                        case "ortho":
                             bakeViewdep = false;
-                        } else {
+                            break;
+                        default:
                             usage(false);
-                        }   i += 2;
+                            break;
+                    }
+i += 2;
                         break;
+
                     case "-filter":
                         if (i > args.length - 2) {
                             usage(false);

src/main/java/org/sunflow/AsciiFileSunflowAPI.java

@@ -12,7 +12,7 @@
 
 class AsciiFileSunflowAPI extends FileSunflowAPI {
 
-    private OutputStream stream;
+    private final OutputStream stream;
 
     AsciiFileSunflowAPI(String filename) throws IOException {
         stream = new BufferedOutputStream(new FileOutputStream(filename));

src/main/java/org/sunflow/BinaryFileSunflowAPI.java

@@ -12,7 +12,7 @@
 
 class BinaryFileSunflowAPI extends FileSunflowAPI {
 
-    private DataOutputStream stream;
+    private final DataOutputStream stream;
 
     BinaryFileSunflowAPI(String filename) throws FileNotFoundException {
         stream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(filename)));

src/main/java/org/sunflow/SunflowAPI.java

@@ -639,7 +639,7 @@ public static SunflowAPI create(String filename, int frameNumber) {
         if (filename == null) {
             return new SunflowAPI();
         }
-        SunflowAPI api = null;
+        SunflowAPI api;
         if (filename.endsWith(".java")) {
             Timer t = new Timer();
             UI.printInfo(Module.API, "Compiling \"" + filename + "\" ...");
@@ -684,7 +684,7 @@ public static SunflowAPI create(String filename, int frameNumber) {
      * @return <code>true</code> upon success, <code>false</code> otherwise
      */
     public static boolean translate(String filename, String outputFilename) {
-        FileSunflowAPI api = null;
+        FileSunflowAPI api;
         try {
             if (outputFilename.endsWith(".sca")) {
                 api = new AsciiFileSunflowAPI(outputFilename);

src/main/java/org/sunflow/core/GIEngine.java

@@ -21,8 +21,10 @@ public interface GIEngine {
     public Color getGlobalRadiance(ShadingState state);
 
     /**
-     * Initialize the engine. This is called before rendering begins.
+     * Initialize the engine.This is called before rendering begins.
      *
+     * @param options
+     * @param scene
      * @return <code>true</code> if the init phase succeeded, <code>false</code>
      * otherwise
      */

src/main/java/org/sunflow/core/ImageSampler.java

@@ -10,8 +10,11 @@ public interface ImageSampler {
     /**
      * Prepare the sampler for rendering an image of w x h pixels
      *
+     * @param options
+     * @param scene
      * @param w width of the image
      * @param h height of the image
+     * @return 
      */
     public boolean prepare(Options options, Scene scene, int w, int h);
 

src/main/java/org/sunflow/core/InstanceList.java

@@ -6,7 +6,7 @@
 
 final class InstanceList implements PrimitiveList {
 
-    private Instance[] instances;
+    private final Instance[] instances;
     private Instance[] lights;
 
     InstanceList() {

src/main/java/org/sunflow/core/IntersectionState.java

@@ -36,9 +36,9 @@ public static final class StackNode {
      * Initializes all traversal stacks.
      */
     public IntersectionState() {
-        for (int i = 0; i < stacks.length; i++) {
-            for (int j = 0; j < stacks[i].length; j++) {
-                stacks[i][j] = new StackNode();
+        for (StackNode[] stack : stacks) {
+            for (int j = 0; j < stack.length; j++) {
+                stack[j] = new StackNode();
             }
         }
     }
@@ -102,13 +102,14 @@ public final void setIntersection(int id, float u, float v) {
     }
 
     /**
-     * Record an intersection with the specified primitive id. The parent object
-     * is assumed to be the current instance. The u and v parameters are used to
-     * pinpoint the location on the surface if needed.
+     * Record an intersection with the specified primitive id.The parent object
+ is assumed to be the current instance. The u and v parameters are used to
+ pinpoint the location on the surface if needed.
      *
      * @param id primitive id of the intersected object
      * @param u u surface paramater of the intersection point
      * @param v v surface parameter of the intersection point
+     * @param w
      */
     public final void setIntersection(int id, float u, float v, float w) {
         instance = current;