Merge topic 'fix_var_redefinition'

daa75aa7 Fix duplicate var definition vtkPanel.java

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6926

Wrapping/Java/vtk/vtkPanel.java

@@ -24,7 +24,7 @@ import javax.swing.SwingUtilities;
  */
 public class vtkPanel extends Canvas implements MouseListener, MouseMotionListener, MouseWheelListener, KeyListener {
   private static final long serialVersionUID = 1L;
-  protected vtkRenderWindow rw = new vtkRenderWindow();
+  protected vtkRenderWindow rw = new vtkOpenGLRenderWindow();
   protected vtkRenderer ren = new vtkRenderer();
   protected vtkCamera cam = null;
   protected vtkLight lgt = new vtkLight();
@@ -35,7 +35,6 @@ public class vtkPanel extends Canvas implements MouseListener, MouseMotionListen
   protected int LightFollowCamera = 1;
   protected int InteractionMode = 1;
   protected boolean rendering = false;
-  protected vtkRenderWindow rw = new vtkOpenGLRenderWindow(); //vtkRenderWindow();
 
   // Allow access to display lock() and unlock().
   // Call these whenever you call something that causes