svn commit: r1808536 - in /jmeter/trunk/src: core/org/apache/jmeter/gui/tree/JMeterTreeNode.java jorphan/org/apache/jorphan/gui/JTreeTable.java

[fschumacher]

Author: fschumacher
Date: Sat Sep 16 12:39:18 2017
New Revision: 1808536

URL: http://svn.apache.org/viewvc?rev=1808536&view=rev
Log:
Make JMeter compile with java 9.

Java 9 seems to be stricter with generics, so we have to specify them
explicitly by casting. Adapted the javadocs to be more specific, even
if the interface is not.

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1808536&r1=1808535&r2=1808536&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Sat 
Sep 16 12:39:18 2017
@@ -196,6 +196,6 @@ public class JMeterTreeNode extends Defa
     @Override
     @SuppressWarnings("unchecked")
     public Enumeration<JMeterTreeNode> children() {
-        return super.children();
+        return (Enumeration<JMeterTreeNode>) super.children();
     }
 }

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java?rev=1808536&r1=1808535&r2=1808536&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java Sat Sep 16 
12:39:18 2017
@@ -57,11 +57,12 @@ public class JTreeTable extends JTable {
     }
 
     /**
-     * @param rowData the data for the table
+     * @param rowData the data for the table. Has to be a {@link Vector} of 
{@link Vector}s.
      * @param columnNames the names for the columns
      */
+    @SuppressWarnings("unchecked")
     public JTreeTable(Vector<?> rowData, Vector<?> columnNames) {
-        super(rowData, columnNames);
+        super((Vector<? extends Vector<?>>) rowData, columnNames);
     }
 
 }