Fix javac warnings in core and plugins

Author: 8Keep

common.gradle

@@ -21,8 +21,9 @@ java {
 }
 
 tasks.withType(JavaCompile) { // compile-time options:
-    //options.compilerArgs << '-Xlint:deprecation' // to show deprecation warnings
+    options.compilerArgs << '-Xlint:deprecation'
     options.compilerArgs << '-Xlint:unchecked'
+    options.compilerArgs << '-Xlint:-options'
     options.encoding = 'UTF-8'
     if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_10)) {
         options.release = 8
@@ -227,4 +228,4 @@ tasks.withType(Checkstyle) {
         html.required.set(true)
     }
     include("**/com/jme3/renderer/**/*.java")
-}
+}

jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java

@@ -187,6 +187,7 @@ public ParticleEmitter clone(boolean cloneMaterial) {
      *  The old clone() method that did not use the new Cloner utility.
      */
     @Override
+    @Deprecated
     public ParticleEmitter oldClone(boolean cloneMaterial) {
         ParticleEmitter clone = (ParticleEmitter) super.clone(cloneMaterial);
         clone.shape = shape.deepClone();

jme3-core/src/main/java/com/jme3/environment/EnvironmentCamera.java

@@ -306,7 +306,7 @@ protected void initialize(Application app) {
             viewports[i] = createOffViewPort("EnvView" + i, cameras[i]);
             framebuffers[i] = createOffScreenFrameBuffer(size, viewports[i]);
             textures[i] = new Texture2D(size, size, imageFormat);
-            framebuffers[i].setColorTexture(textures[i]);
+            framebuffers[i].addColorTarget(FrameBuffer.FrameBufferTarget.newTarget(textures[i]));
         }
     }
 
@@ -386,7 +386,7 @@ protected ViewPort createOffViewPort(final String name, final Camera offCamera)
     protected FrameBuffer createOffScreenFrameBuffer(int mapSize, ViewPort offView) {
         // create offscreen framebuffer
         final FrameBuffer offBuffer = new FrameBuffer(mapSize, mapSize, 1);
-        offBuffer.setDepthBuffer(Image.Format.Depth);
+        offBuffer.setDepthTarget(FrameBuffer.FrameBufferTarget.newTarget(Image.Format.Depth));
         offView.setOutputFrameBuffer(offBuffer);
         return offBuffer;
     }

jme3-core/src/main/java/com/jme3/environment/EnvironmentProbeControl.java

@@ -186,6 +186,7 @@ public static void untagGlobal(Spatial s) {
     }
 
     @Override
+    @Deprecated
     public Control cloneForSpatial(Spatial spatial) {
         throw new UnsupportedOperationException();
     }

jme3-core/src/main/java/com/jme3/renderer/Caps.java

@@ -550,7 +550,7 @@ public static boolean supports(Collection<Caps> caps, FrameBuffer fb) {
             return false;
         }
 
-        RenderBuffer depthBuf = fb.getDepthBuffer();
+        RenderBuffer depthBuf = fb.getDepthTarget();
         if (depthBuf != null) {
             Format depthFmt = depthBuf.getFormat();
             if (!depthFmt.isDepthFormat()) {
@@ -567,8 +567,8 @@ public static boolean supports(Collection<Caps> caps, FrameBuffer fb) {
                 }
             }
         }
-        for (int i = 0; i < fb.getNumColorBuffers(); i++) {
-            if (!supportsColorBuffer(caps, fb.getColorBuffer(i))) {
+        for (int i = 0; i < fb.getNumColorTargets(); i++) {
+            if (!supportsColorBuffer(caps, fb.getColorTarget(i))) {
                 return false;
             }
         }

jme3-core/src/main/java/com/jme3/renderer/RenderContext.java

@@ -45,6 +45,11 @@
  * internally to reduce state changes. NOTE: This class is specific to OpenGL.
  */
 public class RenderContext {
+    private static <T> WeakReference<T>[] newWeakReferenceArray(int size) {
+        WeakReference<T>[] refs = (WeakReference<T>[]) new WeakReference<?>[size];
+        return refs;
+    }
+
     /**
      * Number of texture units that JME supports.
      */
@@ -260,7 +265,7 @@ public class RenderContext {
      * @see Renderer#setTexture(int, com.jme3.texture.Texture)
      */
     public final WeakReference<Image> boundTextures[]
-            = new WeakReference[maxTextureUnits];
+            = newWeakReferenceArray(maxTextureUnits);
 
 
     /**
@@ -269,7 +274,7 @@ public class RenderContext {
      * @see Renderer#setUniformBufferObject(int, com.jme3.shader.BufferObject)
      * @see Renderer#setShaderStorageBufferObject(int, com.jme3.shader.BufferObject)
      */
-    public final WeakReference<BufferObject>[] boundBO = new WeakReference[maxBufferObjectUnits];
+    public final WeakReference<BufferObject>[] boundBO = newWeakReferenceArray(maxBufferObjectUnits);
 
     /**
      * IDList for texture units.
@@ -326,7 +331,7 @@ public class RenderContext {
      * Vertex attribs currently bound and enabled. If a slot is null, then
      * it is disabled.
      */
-    public final WeakReference<VertexBuffer>[] boundAttribs = new WeakReference[16];
+    public final WeakReference<VertexBuffer>[] boundAttribs = newWeakReferenceArray(16);
 
     /**
      * IDList for vertex attributes.

jme3-core/src/main/java/com/jme3/renderer/RenderManager.java

@@ -111,7 +111,7 @@ public class RenderManager {
     private final HashMap<Class<? extends PipelineContext>, PipelineContext> contexts = new HashMap<>();
     private final LinkedList<PipelineContext> usedContexts = new LinkedList<>();
     private final LinkedList<RenderPipeline<? extends PipelineContext>> usedPipelines = new LinkedList<>();
-    private RenderPipeline<? extends PipelineContext> defaultPipeline = new ForwardPipeline();
+    private RenderPipeline<? extends PipelineContext> defaultPipeline = new ForwardPipeline();
     private Camera prevCam = null;
     private Material forcedMaterial = null;
     private String forcedTechnique = null;
@@ -1382,19 +1382,22 @@ public void applyViewPort(ViewPort vp) {
      * @param vp View port to render
      * @param tpf Time per frame value
      */
-    public void renderViewPort(ViewPort vp, float tpf) {
-        if (!vp.isEnabled()) {
-            return;
-        }
-        RenderPipeline pipeline = vp.getPipeline();
-        if (pipeline == null) {
-            pipeline = defaultPipeline;
-        }
-
-        PipelineContext context = pipeline.fetchPipelineContext(this);
-        if (context == null) {
-            throw new NullPointerException("Failed to fetch pipeline context.");
-        }
+    public void renderViewPort(ViewPort vp, float tpf) {
+        if (!vp.isEnabled()) {
+            return;
+        }
+        RenderPipeline<? extends PipelineContext> pipeline = vp.getPipeline();
+        if (pipeline == null) {
+            pipeline = defaultPipeline;
+        }
+        renderViewPort(vp, tpf, pipeline);
+    }
+
+    private <T extends PipelineContext> void renderViewPort(ViewPort vp, float tpf, RenderPipeline<T> pipeline) {
+        T context = pipeline.fetchPipelineContext(this);
+        if (context == null) {
+            throw new NullPointerException("Failed to fetch pipeline context.");
+        }
         if (!context.startViewPortRender(this, vp)) {
             usedContexts.add(context);
         }

jme3-core/src/main/java/com/jme3/renderer/ViewPort.java

@@ -32,6 +32,7 @@
 package com.jme3.renderer;
 
 import com.jme3.renderer.pipeline.RenderPipeline;
+import com.jme3.renderer.pipeline.PipelineContext;
 import com.jme3.math.ColorRGBA;
 import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.queue.RenderQueue;
@@ -88,7 +89,7 @@ public class ViewPort {
     /**
      * Dedicated pipeline.
      */
-    protected RenderPipeline pipeline;
+    protected RenderPipeline<? extends PipelineContext> pipeline;
     /**
      * FrameBuffer for output.
      */
@@ -440,7 +441,7 @@ public boolean isEnabled() {
      * 
      * @param pipeline pipeline, or null to use render manager's pipeline
      */
-    public void setPipeline(RenderPipeline pipeline) {
+    public void setPipeline(RenderPipeline<? extends PipelineContext> pipeline) {
         this.pipeline = pipeline;
     }
 
@@ -449,7 +450,7 @@ public void setPipeline(RenderPipeline pipeline) {
      * 
      * @return 
      */
-    public RenderPipeline getPipeline() {
+    public RenderPipeline<? extends PipelineContext> getPipeline() {
         return pipeline;
     }
 

jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

@@ -1811,6 +1811,7 @@ public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst) {
     }
 
     @Override
+    @Deprecated
     public void copyFrameBuffer(FrameBuffer src, FrameBuffer dst, boolean copyDepth) {
         copyFrameBuffer(src, dst, true, copyDepth);
     }
@@ -2047,7 +2048,7 @@ private void bindFrameBuffer(FrameBuffer fb) {
     }
 
     public void updateFrameBuffer(FrameBuffer fb) {
-        if (fb.getNumColorBuffers() == 0 && fb.getDepthBuffer() == null) {
+        if (fb.getNumColorTargets() == 0 && fb.getDepthTarget() == null) {
             throw new IllegalArgumentException("The framebuffer: " + fb
                     + "\nDoesn't have any color/depth buffers");
         }
@@ -2063,13 +2064,13 @@ public void updateFrameBuffer(FrameBuffer fb) {
 
         bindFrameBuffer(fb);
 
-        FrameBuffer.RenderBuffer depthBuf = fb.getDepthBuffer();
+        FrameBuffer.RenderBuffer depthBuf = fb.getDepthTarget();
         if (depthBuf != null) {
             updateFrameBufferAttachment(fb, depthBuf);
         }
 
-        for (int i = 0; i < fb.getNumColorBuffers(); i++) {
-            FrameBuffer.RenderBuffer colorBuf = fb.getColorBuffer(i);
+        for (int i = 0; i < fb.getNumColorTargets(); i++) {
+            FrameBuffer.RenderBuffer colorBuf = fb.getColorTarget(i);
             updateFrameBufferAttachment(fb, colorBuf);
         }
 
@@ -2130,13 +2131,13 @@ public void setReadDrawBuffers(FrameBuffer fb) {
 
         if (fb != null) {
 
-            if (fb.getNumColorBuffers() == 0) {
+            if (fb.getNumColorTargets() == 0) {
                 // make sure to select NONE as draw buf
                 // no color buffer attached.                
                 gl2.glDrawBuffer(GL.GL_NONE);             
                 gl2.glReadBuffer(GL.GL_NONE);                 
             } else {
-                if (fb.getNumColorBuffers() > limits.get(Limits.FrameBufferAttachments)) {
+                if (fb.getNumColorTargets() > limits.get(Limits.FrameBufferAttachments)) {
                     throw new RendererException("Framebuffer has more color "
                             + "attachments than are supported"
                             + " by the video hardware!");
@@ -2146,21 +2147,21 @@ public void setReadDrawBuffers(FrameBuffer fb) {
                         throw new RendererException("Multiple render targets "
                                 + " are not supported by the video hardware");
                     }
-                    if (fb.getNumColorBuffers() > limits.get(Limits.FrameBufferMrtAttachments)) {
+                    if (fb.getNumColorTargets() > limits.get(Limits.FrameBufferMrtAttachments)) {
                         throw new RendererException("Framebuffer has more"
                                 + " multi targets than are supported"
                                 + " by the video hardware!");
                     }
 
                     intBuf16.clear();
-                    for (int i = 0; i < fb.getNumColorBuffers(); i++) {
+                    for (int i = 0; i < fb.getNumColorTargets(); i++) {
                         intBuf16.put(GLFbo.GL_COLOR_ATTACHMENT0_EXT + i);
                     }
 
                     intBuf16.flip();
                     glext.glDrawBuffers(intBuf16);
                 } else {
-                    RenderBuffer rb = fb.getColorBuffer(fb.getTargetIndex());
+                    RenderBuffer rb = fb.getColorTarget(fb.getTargetIndex());
                     // select this draw buffer
                     gl2.glDrawBuffer(GLFbo.GL_COLOR_ATTACHMENT0_EXT + rb.getSlot());
                     // select this read buffer
@@ -2190,8 +2191,8 @@ public void setFrameBuffer(FrameBuffer fb) {
 
         // generate mipmaps for last FB if needed
         if (context.boundFB != null && (context.boundFB.getMipMapsGenerationHint()!=null?context.boundFB.getMipMapsGenerationHint():generateMipmapsForFramebuffers)) {
-            for (int i = 0; i < context.boundFB.getNumColorBuffers(); i++) {
-                RenderBuffer rb = context.boundFB.getColorBuffer(i);
+            for (int i = 0; i < context.boundFB.getNumColorTargets(); i++) {
+                RenderBuffer rb = context.boundFB.getColorTarget(i);
                 Texture tex = rb.getTexture();
                 if (tex != null && tex.getMinFilter().usesMipMapLevels()) {
                     try {
@@ -2239,7 +2240,7 @@ public void readFrameBuffer(FrameBuffer fb, ByteBuffer byteBuf) {
 
     private void readFrameBufferWithGLFormat(FrameBuffer fb, ByteBuffer byteBuf, int glFormat, int dataType) {
         if (fb != null) {
-            RenderBuffer rb = fb.getColorBuffer();
+            RenderBuffer rb = fb.getColorTarget();
             if (rb == null) {
                 throw new IllegalArgumentException("Specified framebuffer"
                         + " does not have a colorbuffer");
@@ -2274,11 +2275,11 @@ public void deleteFrameBuffer(FrameBuffer fb) {
                 context.boundFBO = 0;
             }
 
-            if (fb.getDepthBuffer() != null) {
-                deleteRenderBuffer(fb, fb.getDepthBuffer());
+            if (fb.getDepthTarget() != null) {
+                deleteRenderBuffer(fb, fb.getDepthTarget());
             }
-            if (fb.getColorBuffer() != null) {
-                deleteRenderBuffer(fb, fb.getColorBuffer());
+            if (fb.getColorTarget() != null) {
+                deleteRenderBuffer(fb, fb.getColorTarget());
             }
 
             intBuf1.put(0, fb.getId());

jme3-core/src/main/java/com/jme3/renderer/pipeline/ForwardPipeline.java

@@ -46,7 +46,7 @@
  * 
  * @author codex
  */
-public class ForwardPipeline implements RenderPipeline {
+public class ForwardPipeline implements RenderPipeline<PipelineContext> {
 
     private boolean rendered = false;